openstack/swift
Code Issues Proposed changes

Merge "Fix gettext_ calls"

Browse Source
This commit is contained in:
Jenkins 2016-08-09 18:07:29 +00:00 committed by Gerrit Code Review
commit 499fe875af
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
swift/common/middleware/crypto/decrypter.py
View File

@ -72,12 +72,15 @@ class BaseDecrypterContext(CryptoWSGIContext):
return self.crypto.unwrap_key(wrapping_key, return self.crypto.unwrap_key(wrapping_key,
crypto_meta['body_key']) crypto_meta['body_key'])
except KeyError as err: except KeyError as err:
err = 'Missing %s' % err self.logger.error(
_('Error decrypting %(resp_type)s: Missing %(key)s'),
{'resp_type': self.server_type, 'key': err})
except ValueError as err: except ValueError as err:
pass self.logger.error(_('Error decrypting %(resp_type)s: %(reason)s'),
msg = 'Error decrypting %s' % self.server_type {'resp_type': self.server_type, 'reason': err})
self.logger.error(_('%(msg)s: %(err)s') % {'msg': msg, 'err': err}) raise HTTPInternalServerError(
raise HTTPInternalServerError(body=msg, content_type='text/plain') body='Error decrypting %s' % self.server_type,
content_type='text/plain')
def decrypt_value_with_meta(self, value, key, required=False): def decrypt_value_with_meta(self, value, key, required=False):
""" """
@ -162,11 +165,13 @@ class DecrypterObjContext(BaseDecrypterContext):
""" """
try: try:
return self.decrypt_value_with_meta(value, key, required) return self.decrypt_value_with_meta(value, key, required)
except EncryptionException as e: except EncryptionException as err:
msg = "Error decrypting header" self.logger.error(
self.logger.error(_("%(msg)s %(hdr)s: %(e)s") % _("Error decrypting header %(header)s: %(error)s"),
{'msg': msg, 'hdr': header, 'e': e}) {'header': header, 'error': err})
raise HTTPInternalServerError(body=msg, content_type='text/plain') raise HTTPInternalServerError(
body='Error decrypting header',
content_type='text/plain')
def decrypt_user_metadata(self, keys): def decrypt_user_metadata(self, keys):
prefix = get_object_transient_sysmeta('crypto-meta-') prefix = get_object_transient_sysmeta('crypto-meta-')
@ -286,11 +291,9 @@ class DecrypterObjContext(BaseDecrypterContext):
crypto_meta = self.get_crypto_meta( crypto_meta = self.get_crypto_meta(
'X-Object-Sysmeta-Crypto-Body-Meta') 'X-Object-Sysmeta-Crypto-Body-Meta')
except EncryptionException as err: except EncryptionException as err:
msg = 'Error decrypting object' self.logger.error(_('Error decrypting object: %s'), err)
self.logger.error(_('%(msg)s: %(err)s') %
{'msg': msg, 'err': err})
raise HTTPInternalServerError( raise HTTPInternalServerError(
body=msg, content_type='text/plain') body='Error decrypting object', content_type='text/plain')
if crypto_meta: if crypto_meta:
# 2xx response and encrypted body # 2xx response and encrypted body
@ -363,11 +366,12 @@ class DecrypterContContext(BaseDecrypterContext):
try: try:
app_resp = handler(keys['container'], app_resp) app_resp = handler(keys['container'], app_resp)
except EncryptionException as err: except EncryptionException as err:
msg = "Error decrypting container listing" self.logger.error(
self.logger.error(_('%(msg)s: %(err)s') % _("Error decrypting container listing: %s"),
{'msg': msg, 'err': err}) err)
raise HTTPInternalServerError( raise HTTPInternalServerError(
body=msg, content_type='text/plain') body='Error decrypting container listing',
content_type='text/plain')
start_response(self._response_status, start_response(self._response_status,
self._response_headers, self._response_headers,