Attachment 685413 Details for Bug 902964 – folsom-CVE-2013-0212.patch

[patch] folsom-CVE-2013-0212.patch

folsom-CVE-2013-0212.patch (text/plain), 3.50 KB, created by Kurt Seifried on 2013-01-22 20:06:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kurt Seifried

Created: 2013-01-22 20:06:13 UTC

Size: 3.50 KB

patch

obsolete

>diff --git a/glance/store/swift.py b/glance/store/swift.py
>index 59f0f57..64ef21b 100644
>--- a/glance/store/swift.py
>+++ b/glance/store/swift.py
>@@ -136,7 +136,7 @@ class StoreLocation(glance.store.location.StoreLocation):
>                     "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 @@ class StoreLocation(glance.store.location.StoreLocation):
>         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 @@ class StoreLocation(glance.store.location.StoreLocation):
>                 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 @@ class Store(glance.store.base.Store):
>         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 @@ class Store(glance.store.base.Store):
>         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 @@ class Store(glance.store.base.Store):
>         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 @@ class Store(glance.store.base.Store):
>             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
>

Actions: View | Diff

Attachments on bug 902964: 685412 | 685413 | 685414