Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Remove Swift location/password from messages.

Updates several exceptions and log messages in the Swift backend
so that they don't include Swift location URI's which may contain
passwords when used in Swift single tenant mode.

Fixes LP Bug #1098962 (for Folsom).

Change-Id: Ia97a95ce6ed5d98a76515eea8817e309bcf0889a
  • Loading branch information...
commit 96a470be64adcef97f235ca96ed3c59ed954a4c1 1 parent fd04efb
@dprince dprince authored
Showing with 10 additions and 11 deletions.
  1. +10 −11 glance/store/swift.py
View
21 glance/store/swift.py
@@ -136,7 +136,7 @@ def parse_uri(self, uri):
"like so: "
"swift+http://user:pass@authurl.com/v1/container/obj"
)
- LOG.error(_("Invalid store uri %(uri)s: %(reason)s") % locals())
+ LOG.error(_("Invalid store URI: %(reason)s") % locals())
raise exception.BadStoreUri(message=reason)
pieces = urlparse.urlparse(uri)
@@ -162,8 +162,7 @@ def parse_uri(self, uri):
if creds:
cred_parts = creds.split(':')
if len(cred_parts) != 2:
- reason = (_("Badly formed credentials '%(creds)s' in Swift "
- "URI") % locals())
+ reason = (_("Badly formed credentials in Swift URI."))
LOG.error(reason)
raise exception.BadStoreUri()
user, key = cred_parts
@@ -181,7 +180,7 @@ def parse_uri(self, uri):
path_parts.insert(0, netloc)
self.auth_or_store_url = '/'.join(path_parts)
except IndexError:
- reason = _("Badly formed Swift URI: %s") % uri
+ reason = _("Badly formed Swift URI.")
LOG.error(reason)
raise exception.BadStoreUri()
@@ -293,8 +292,8 @@ def get(self, location):
except swiftclient.ClientException, e:
if e.http_status == httplib.NOT_FOUND:
uri = location.get_store_uri()
- raise exception.NotFound(_("Swift could not find image at "
- "uri %(uri)s") % locals())
+ msg = _("Swift could not find image at URI.")
+ raise exception.NotFound(msg)
else:
raise
@@ -543,7 +542,7 @@ def add(self, image_id, image_file, image_size):
except swiftclient.ClientException, e:
if e.http_status == httplib.CONFLICT:
raise exception.Duplicate(_("Swift already has an image at "
- "location %s") % location.get_uri())
+ "this location."))
msg = (_("Failed to add object to Swift.\n"
"Got error from Swift: %(e)s") % locals())
LOG.error(msg)
@@ -596,8 +595,8 @@ def delete(self, location):
except swiftclient.ClientException, e:
if e.http_status == httplib.NOT_FOUND:
uri = location.get_store_uri()
- raise exception.NotFound(_("Swift could not find image at "
- "uri %(uri)s") % locals())
+ msg = _("Swift could not find image at URI.")
+ raise exception.NotFound(msg)
else:
raise
@@ -637,8 +636,8 @@ def set_acls(self, location, public=False, read_tenants=[],
except swiftclient.ClientException, e:
if e.http_status == httplib.NOT_FOUND:
uri = location.get_store_uri()
- raise exception.NotFound(_("Swift could not find image at "
- "uri %(uri)s") % locals())
+ msg = _("Swift could not find image at URI.")
+ raise exception.NotFound(msg)
else:
raise
Please sign in to comment.
Something went wrong with that request. Please try again.