PyPI - swift - Versions diffs - 2.32.0__py2.py3-none-any.whl → 2.34.0__py2.py3-none-any.whl - Mend

swift 2.32.0py2.py3-none-any.whl → 2.34.0py2.py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (127) hide show

swift/account/auditor.py +11 -0
swift/account/reaper.py +11 -1
swift/account/replicator.py +22 -0
swift/account/server.py +13 -12
swift-2.32.0.data/scripts/swift-account-audit → swift/cli/account_audit.py +6 -2
swift-2.32.0.data/scripts/swift-config → swift/cli/config.py +1 -1
swift-2.32.0.data/scripts/swift-dispersion-populate → swift/cli/dispersion_populate.py +6 -2
swift-2.32.0.data/scripts/swift-drive-audit → swift/cli/drive_audit.py +12 -3
swift-2.32.0.data/scripts/swift-get-nodes → swift/cli/get_nodes.py +6 -2
swift/cli/info.py +131 -3
swift-2.32.0.data/scripts/swift-oldies → swift/cli/oldies.py +6 -3
swift-2.32.0.data/scripts/swift-orphans → swift/cli/orphans.py +7 -2
swift-2.32.0.data/scripts/swift-recon-cron → swift/cli/recon_cron.py +9 -18
swift-2.32.0.data/scripts/swift-reconciler-enqueue → swift/cli/reconciler_enqueue.py +2 -3
swift/cli/relinker.py +1 -1
swift/cli/reload.py +141 -0
swift/cli/ringbuilder.py +24 -0
swift/common/daemon.py +12 -2
swift/common/db.py +14 -9
swift/common/db_auditor.py +2 -2
swift/common/db_replicator.py +6 -0
swift/common/exceptions.py +12 -0
swift/common/http_protocol.py +76 -3
swift/common/manager.py +120 -5
swift/common/memcached.py +24 -25
swift/common/middleware/account_quotas.py +144 -43
swift/common/middleware/backend_ratelimit.py +166 -24
swift/common/middleware/catch_errors.py +1 -3
swift/common/middleware/cname_lookup.py +3 -5
swift/common/middleware/container_sync.py +6 -10
swift/common/middleware/crypto/crypto_utils.py +4 -5
swift/common/middleware/crypto/decrypter.py +4 -5
swift/common/middleware/crypto/kms_keymaster.py +2 -1
swift/common/middleware/proxy_logging.py +57 -43
swift/common/middleware/ratelimit.py +6 -7
swift/common/middleware/recon.py +6 -7
swift/common/middleware/s3api/acl_handlers.py +10 -1
swift/common/middleware/s3api/controllers/__init__.py +3 -0
swift/common/middleware/s3api/controllers/acl.py +3 -2
swift/common/middleware/s3api/controllers/logging.py +2 -2
swift/common/middleware/s3api/controllers/multi_upload.py +31 -15
swift/common/middleware/s3api/controllers/obj.py +20 -1
swift/common/middleware/s3api/controllers/object_lock.py +44 -0
swift/common/middleware/s3api/s3api.py +6 -0
swift/common/middleware/s3api/s3request.py +190 -74
swift/common/middleware/s3api/s3response.py +48 -8
swift/common/middleware/s3api/s3token.py +2 -2
swift/common/middleware/s3api/utils.py +2 -1
swift/common/middleware/slo.py +508 -310
swift/common/middleware/staticweb.py +45 -14
swift/common/middleware/tempauth.py +6 -4
swift/common/middleware/tempurl.py +134 -93
swift/common/middleware/x_profile/exceptions.py +1 -4
swift/common/middleware/x_profile/html_viewer.py +9 -10
swift/common/middleware/x_profile/profile_model.py +1 -2
swift/common/middleware/xprofile.py +1 -2
swift/common/request_helpers.py +101 -8
swift/common/statsd_client.py +207 -0
swift/common/storage_policy.py +1 -1
swift/common/swob.py +5 -2
swift/common/utils/__init__.py +331 -1774
swift/common/utils/base.py +138 -0
swift/common/utils/config.py +443 -0
swift/common/utils/logs.py +999 -0
swift/common/utils/timestamp.py +23 -2
swift/common/wsgi.py +19 -3
swift/container/auditor.py +11 -0
swift/container/backend.py +136 -31
swift/container/reconciler.py +11 -2
swift/container/replicator.py +64 -7
swift/container/server.py +276 -146
swift/container/sharder.py +86 -42
swift/container/sync.py +11 -1
swift/container/updater.py +12 -2
swift/obj/auditor.py +20 -3
swift/obj/diskfile.py +63 -25
swift/obj/expirer.py +154 -47
swift/obj/mem_diskfile.py +2 -1
swift/obj/mem_server.py +1 -0
swift/obj/reconstructor.py +28 -4
swift/obj/replicator.py +63 -24
swift/obj/server.py +76 -59
swift/obj/updater.py +12 -2
swift/obj/watchers/dark_data.py +72 -34
swift/proxy/controllers/account.py +3 -2
swift/proxy/controllers/base.py +254 -148
swift/proxy/controllers/container.py +274 -289
swift/proxy/controllers/obj.py +120 -166
swift/proxy/server.py +17 -13
{swift-2.32.0.dist-info → swift-2.34.0.dist-info}/AUTHORS +14 -4
{swift-2.32.0.dist-info → swift-2.34.0.dist-info}/METADATA +9 -7
{swift-2.32.0.dist-info → swift-2.34.0.dist-info}/RECORD +97 -120
{swift-2.32.0.dist-info → swift-2.34.0.dist-info}/entry_points.txt +39 -0
swift-2.34.0.dist-info/pbr.json +1 -0
swift-2.32.0.data/scripts/swift-account-auditor +0 -23
swift-2.32.0.data/scripts/swift-account-info +0 -52
swift-2.32.0.data/scripts/swift-account-reaper +0 -23
swift-2.32.0.data/scripts/swift-account-replicator +0 -34
swift-2.32.0.data/scripts/swift-account-server +0 -23
swift-2.32.0.data/scripts/swift-container-auditor +0 -23
swift-2.32.0.data/scripts/swift-container-info +0 -56
swift-2.32.0.data/scripts/swift-container-reconciler +0 -21
swift-2.32.0.data/scripts/swift-container-replicator +0 -34
swift-2.32.0.data/scripts/swift-container-server +0 -23
swift-2.32.0.data/scripts/swift-container-sharder +0 -37
swift-2.32.0.data/scripts/swift-container-sync +0 -23
swift-2.32.0.data/scripts/swift-container-updater +0 -23
swift-2.32.0.data/scripts/swift-dispersion-report +0 -24
swift-2.32.0.data/scripts/swift-form-signature +0 -20
swift-2.32.0.data/scripts/swift-init +0 -119
swift-2.32.0.data/scripts/swift-object-auditor +0 -29
swift-2.32.0.data/scripts/swift-object-expirer +0 -33
swift-2.32.0.data/scripts/swift-object-info +0 -60
swift-2.32.0.data/scripts/swift-object-reconstructor +0 -33
swift-2.32.0.data/scripts/swift-object-relinker +0 -23
swift-2.32.0.data/scripts/swift-object-replicator +0 -37
swift-2.32.0.data/scripts/swift-object-server +0 -27
swift-2.32.0.data/scripts/swift-object-updater +0 -23
swift-2.32.0.data/scripts/swift-proxy-server +0 -23
swift-2.32.0.data/scripts/swift-recon +0 -24
swift-2.32.0.data/scripts/swift-ring-builder +0 -37
swift-2.32.0.data/scripts/swift-ring-builder-analyzer +0 -22
swift-2.32.0.data/scripts/swift-ring-composer +0 -22
swift-2.32.0.dist-info/pbr.json +0 -1
{swift-2.32.0.dist-info → swift-2.34.0.dist-info}/LICENSE +0 -0
{swift-2.32.0.dist-info → swift-2.34.0.dist-info}/WHEEL +0 -0
{swift-2.32.0.dist-info → swift-2.34.0.dist-info}/top_level.txt +0 -0

swift/common/middleware/staticweb.py CHANGED Viewed

@@ -59,7 +59,8 @@ requests for paths not found.
 For pseudo paths that have no <index.name>, this middleware can serve HTML file
 listings if you set the ``X-Container-Meta-Web-Listings: true`` metadata item
-on the container.
+on the container. Note that the listing must be authorized; you may want a
+container ACL like ``X-Container-Read: .r:*,.rlistings``.
 If listings are enabled, the listings can have a custom style sheet by setting
 the X-Container-Meta-Web-Listings-CSS header. For instance, setting
@@ -68,6 +69,17 @@ the .../listing.css style sheet. If you "view source" in your browser on a
 listing page, you will see the well defined document structure that can be
 styled.
+Additionally, prefix-based :ref:`tempurl` parameters may be used to authorize
+requests instead of making the whole container publicly readable. This gives
+clients dynamic discoverability of the objects available within that prefix.
+.. note::
+    ``temp_url_prefix`` values should typically end with a slash (``/``) when
+    used with StaticWeb. StaticWeb's redirects will not carry over any TempURL
+    parameters, as they likely indicate that the user created an overly-broad
+    TempURL.
 By default, the listings will be rendered with a label of
 "Listing of /v1/account/container/path".  This can be altered by
 setting a ``X-Container-Meta-Web-Listings-Label: <label>``.  For example,
@@ -137,6 +149,7 @@ from swift.common.wsgi import make_env, WSGIContext
 from swift.common.http import is_success, is_redirection, HTTP_NOT_FOUND
 from swift.common.swob import Response, HTTPMovedPermanently, HTTPNotFound, \
     Request, wsgi_quote, wsgi_to_str, str_to_wsgi
+from swift.common.middleware.tempurl import get_temp_url_info
 from swift.proxy.controllers.base import get_container_info
@@ -225,7 +238,7 @@ class _StaticWebContext(WSGIContext):
             self._dir_type = meta.get('web-directory-type', '').strip()
         return container_info
-    def _listing(self, env, start_response, prefix=None):
+    def _listing(self, env, start_response, prefix=''):
         """
         Sends an HTML object listing to the remote client.
@@ -240,8 +253,7 @@ class _StaticWebContext(WSGIContext):
                                      '/'.join(groups[4:]))
         if not config_true_value(self._listings):
-            body = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 ' \
-                'Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">\n' \
+            body = '<!DOCTYPE html>\n' \
                 '<html>\n' \
                 '<head>\n' \
                 '<title>Listing of %s</title>\n' % html_escape(label)
@@ -285,9 +297,28 @@ class _StaticWebContext(WSGIContext):
         if prefix and not listing:
             resp = HTTPNotFound()(env, self._start_response)
             return self._error_response(resp, env, start_response)
-        headers = {'Content-Type': 'text/html; charset=UTF-8'}
-        body = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 ' \
-               'Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">\n' \
+        tempurl_qs = tempurl_prefix = ''
+        if env.get('REMOTE_USER') == '.wsgi.tempurl':
+            sig, expires, tempurl_prefix, _filename, inline, ip_range = \
+                get_temp_url_info(env)
+            if tempurl_prefix is None:
+                tempurl_prefix = ''
+            else:
+                parts = [
+                    'temp_url_prefix=%s' % quote(tempurl_prefix),
+                    'temp_url_expires=%s' % quote(str(expires)),
+                    'temp_url_sig=%s' % sig,
+                ]
+                if ip_range:
+                    parts.append('temp_url_ip_range=%s' % quote(ip_range))
+                if inline:
+                    parts.append('inline')
+                tempurl_qs = '?' + '&amp;'.join(parts)
+        headers = {'Content-Type': 'text/html; charset=UTF-8',
+                   'X-Backend-Content-Generator': 'staticweb'}
+        body = '<!DOCTYPE html>\n' \
                '<html>\n' \
                ' <head>\n' \
                '  <title>Listing of %s</title>\n' % \
@@ -311,12 +342,12 @@ class _StaticWebContext(WSGIContext):
                 '    <th class="colsize">Size</th>\n' \
                 '    <th class="coldate">Date</th>\n' \
                 '   </tr>\n' % html_escape(label)
-        if prefix:
+        if len(prefix) > len(tempurl_prefix):
             body += '   <tr id="parent" class="item">\n' \
-                    '    <td class="colname"><a href="../">../</a></td>\n' \
+                    '    <td class="colname"><a href="../%s">../</a></td>\n' \
                     '    <td class="colsize">&nbsp;</td>\n' \
                     '    <td class="coldate">&nbsp;</td>\n' \
-                    '   </tr>\n'
+                    '   </tr>\n' % tempurl_qs
         for item in listing:
             if 'subdir' in item:
                 subdir = item['subdir'] if six.PY3 else  \
@@ -328,7 +359,7 @@ class _StaticWebContext(WSGIContext):
                         '    <td class="colsize">&nbsp;</td>\n' \
                         '    <td class="coldate">&nbsp;</td>\n' \
                         '   </tr>\n' % \
-                        (quote(subdir), html_escape(subdir))
+                        (quote(subdir) + tempurl_qs, html_escape(subdir))
         for item in listing:
             if 'name' in item:
                 name = item['name'] if six.PY3 else  \
@@ -349,7 +380,7 @@ class _StaticWebContext(WSGIContext):
                         '   </tr>\n' % \
                         (' '.join('type-' + html_escape(t.lower())
                                   for t in content_type.split('/')),
-                         quote(name), html_escape(name),
+                         quote(name) + tempurl_qs, html_escape(name),
                          bytes, last_modified)
         body += '  </table>\n' \
                 ' </body>\n' \
@@ -542,8 +573,8 @@ class StaticWeb(object):
             return self.app(env, start_response)
         if env['REQUEST_METHOD'] not in ('HEAD', 'GET'):
             return self.app(env, start_response)
-        if env.get('REMOTE_USER') and \
-                not config_true_value(env.get('HTTP_X_WEB_MODE', 'f')):
+        if env.get('REMOTE_USER') and env['REMOTE_USER'] != '.wsgi.tempurl' \
+                and not config_true_value(env.get('HTTP_X_WEB_MODE', 'f')):
             return self.app(env, start_response)
         if not container:
             return self.app(env, start_response)

swift/common/middleware/tempauth.py CHANGED Viewed

@@ -184,9 +184,11 @@ import base64
 from eventlet import Timeout
 import six
 from swift.common.memcached import MemcacheConnectionError
-from swift.common.swob import Response, Request, wsgi_to_str
-from swift.common.swob import HTTPBadRequest, HTTPForbidden, HTTPNotFound, \
-    HTTPUnauthorized, HTTPMethodNotAllowed, HTTPServiceUnavailable
+from swift.common.swob import (
+    Response, Request, wsgi_to_str, str_to_wsgi, wsgi_unquote,
+    HTTPBadRequest, HTTPForbidden, HTTPNotFound,
+    HTTPUnauthorized, HTTPMethodNotAllowed, HTTPServiceUnavailable,
+)
 from swift.common.request_helpers import get_sys_meta_prefix
 from swift.common.middleware.acl import (
@@ -469,7 +471,7 @@ class TempAuth(object):
             if not s3_auth_details['check_signature'](user['key']):
                 return None
             env['PATH_INFO'] = env['PATH_INFO'].replace(
-                account_user, account_id, 1)
+                str_to_wsgi(account_user), wsgi_unquote(account_id), 1)
             groups = self._get_user_groups(account, account_user, account_id)
         return groups

swift/common/middleware/tempurl.py CHANGED Viewed

@@ -255,7 +255,7 @@ This middleware understands the following configuration settings:
     incoming requests. Names may optionally end with ``*`` to
     indicate a prefix match. ``incoming_allow_headers`` is a
     list of exceptions to these removals.
-    Default: ``x-timestamp``
+    Default: ``x-timestamp x-open-expired``
 ``incoming_allow_headers``
     A whitespace-delimited list of the headers allowed as
@@ -309,13 +309,15 @@ from six.moves.urllib.parse import urlencode
 from swift.proxy.controllers.base import get_account_info, get_container_info
 from swift.common.header_key_dict import HeaderKeyDict
+from swift.common.http import is_success
 from swift.common.digest import get_allowed_digests, \
     extract_digest_and_algorithm, DEFAULT_ALLOWED_DIGESTS, get_hmac
 from swift.common.swob import header_to_environ_key, HTTPUnauthorized, \
     HTTPBadRequest, wsgi_to_str
 from swift.common.utils import split_path, get_valid_utf8_str, \
-    streq_const_time, quote, get_logger
+    streq_const_time, quote, get_logger, close_if_possible
 from swift.common.registry import register_swift_info, register_sensitive_param
+from swift.common.wsgi import WSGIContext
 DISALLOWED_INCOMING_HEADERS = 'x-object-manifest x-symlink-target'
@@ -324,7 +326,7 @@ DISALLOWED_INCOMING_HEADERS = 'x-object-manifest x-symlink-target'
 #: delimited list of header names and names can optionally end with '*' to
 #: indicate a prefix match. DEFAULT_INCOMING_ALLOW_HEADERS is a list of
 #: exceptions to these removals.
-DEFAULT_INCOMING_REMOVE_HEADERS = 'x-timestamp'
+DEFAULT_INCOMING_REMOVE_HEADERS = 'x-timestamp x-open-expired'
 #: Default headers as exceptions to DEFAULT_INCOMING_REMOVE_HEADERS. Simply a
 #: whitespace delimited list of header names and names can optionally end with
@@ -364,6 +366,55 @@ def get_tempurl_keys_from_metadata(meta):
             if key.lower() in ('temp-url-key', 'temp-url-key-2')]
+def normalize_temp_url_expires(value):
+    """
+    Returns the normalized expiration value as an int
+    If not None, the value is converted to an int if possible or 0
+    if not, and checked for expiration (returns 0 if expired).
+    """
+    if value is None:
+        return value
+    try:
+        temp_url_expires = int(value)
+    except ValueError:
+        try:
+            temp_url_expires = timegm(strptime(
+                value, EXPIRES_ISO8601_FORMAT))
+        except ValueError:
+            temp_url_expires = 0
+    if temp_url_expires < time():
+        temp_url_expires = 0
+    return temp_url_expires
+def get_temp_url_info(env):
+    """
+    Returns the provided temporary URL parameters (sig, expires, prefix,
+    temp_url_ip_range), if given and syntactically valid.
+    Either sig, expires or prefix could be None if not provided.
+    :param env: The WSGI environment for the request.
+    :returns: (sig, expires, prefix, filename, inline,
+        temp_url_ip_range) as described above.
+    """
+    sig = expires = prefix = ip_range = filename = inline = None
+    qs = parse_qs(env.get('QUERY_STRING', ''), keep_blank_values=True)
+    if 'temp_url_ip_range' in qs:
+        ip_range = qs['temp_url_ip_range'][0]
+    if 'temp_url_sig' in qs:
+        sig = qs['temp_url_sig'][0]
+    if 'temp_url_expires' in qs:
+        expires = qs['temp_url_expires'][0]
+    if 'temp_url_prefix' in qs:
+        prefix = qs['temp_url_prefix'][0]
+    if 'filename' in qs:
+        filename = qs['filename'][0]
+    if 'inline' in qs:
+        inline = True
+    return (sig, expires, prefix, filename, inline, ip_range)
 def disposition_format(disposition_type, filename):
     # Content-Disposition in HTTP is defined in
     # https://tools.ietf.org/html/rfc6266 and references
@@ -495,9 +546,10 @@ class TempURL(object):
         """
         if env['REQUEST_METHOD'] == 'OPTIONS':
             return self.app(env, start_response)
-        info = self._get_temp_url_info(env)
-        temp_url_sig, temp_url_expires, temp_url_prefix, filename, \
+        info = get_temp_url_info(env)
+        temp_url_sig, client_temp_url_expires, temp_url_prefix, filename, \
             inline_disposition, temp_url_ip_range = info
+        temp_url_expires = normalize_temp_url_expires(client_temp_url_expires)
         if temp_url_sig is None and temp_url_expires is None:
             return self.app(env, start_response)
         if not temp_url_sig or not temp_url_expires:
@@ -511,7 +563,10 @@ class TempURL(object):
         if hash_algorithm not in self.allowed_digests:
             return self._invalid(env, start_response)
-        account, container, obj = self._get_path_parts(env)
+        account, container, obj = self._get_path_parts(
+            env, allow_container_root=(
+                env['REQUEST_METHOD'] in ('GET', 'HEAD') and
+                temp_url_prefix == ""))
         if not account:
             return self._invalid(env, start_response)
@@ -577,116 +632,102 @@ class TempURL(object):
         env['swift.authorize_override'] = True
         env['REMOTE_USER'] = '.wsgi.tempurl'
         qs = {'temp_url_sig': temp_url_sig,
-              'temp_url_expires': temp_url_expires}
+              'temp_url_expires': client_temp_url_expires}
         if temp_url_prefix is not None:
             qs['temp_url_prefix'] = temp_url_prefix
         if filename:
             qs['filename'] = filename
         env['QUERY_STRING'] = urlencode(qs)
-        def _start_response(status, headers, exc_info=None):
-            headers = self._clean_outgoing_headers(headers)
-            if env['REQUEST_METHOD'] in ('GET', 'HEAD') and status[0] == '2':
-                # figure out the right value for content-disposition
-                # 1) use the value from the query string
-                # 2) use the value from the object metadata
-                # 3) use the object name (default)
-                out_headers = []
-                existing_disposition = None
-                for h, v in headers:
-                    if h.lower() != 'content-disposition':
-                        out_headers.append((h, v))
-                    else:
-                        existing_disposition = v
-                if inline_disposition:
-                    if filename:
-                        disposition_value = disposition_format('inline',
-                                                               filename)
-                    else:
-                        disposition_value = 'inline'
-                elif filename:
-                    disposition_value = disposition_format('attachment',
+        ctx = WSGIContext(self.app)
+        app_iter = ctx._app_call(env)
+        ctx._response_headers = self._clean_outgoing_headers(
+            ctx._response_headers)
+        if env['REQUEST_METHOD'] in ('GET', 'HEAD') and \
+                is_success(ctx._get_status_int()):
+            # figure out the right value for content-disposition
+            # 1) use the value from the query string
+            # 2) use the value from the object metadata
+            # 3) use the object name (default)
+            out_headers = []
+            existing_disposition = None
+            content_generator = None
+            for h, v in ctx._response_headers:
+                if h.lower() == 'x-backend-content-generator':
+                    content_generator = v
+                if h.lower() != 'content-disposition':
+                    out_headers.append((h, v))
+                else:
+                    existing_disposition = v
+            if content_generator == 'staticweb':
+                inline_disposition = True
+            elif obj == "":
+                # Generally, tempurl requires an object. We carved out an
+                # exception to allow GETs at the container root for the sake
+                # of staticweb, but we can't tell whether we'll have a
+                # staticweb response or not until after we call the app
+                close_if_possible(app_iter)
+                return self._invalid(env, start_response)
+            if inline_disposition:
+                if filename:
+                    disposition_value = disposition_format('inline',
                                                            filename)
-                elif existing_disposition:
-                    disposition_value = existing_disposition
                 else:
-                    name = basename(wsgi_to_str(env['PATH_INFO']).rstrip('/'))
-                    disposition_value = disposition_format('attachment',
-                                                           name)
-                # this is probably just paranoia, I couldn't actually get a
-                # newline into existing_disposition
-                value = disposition_value.replace('\n', '%0A')
-                out_headers.append(('Content-Disposition', value))
-                # include Expires header for better cache-control
-                out_headers.append(('Expires', strftime(
-                    "%a, %d %b %Y %H:%M:%S GMT",
-                    gmtime(temp_url_expires))))
-                headers = out_headers
-            return start_response(status, headers, exc_info)
-        return self.app(env, _start_response)
-    def _get_path_parts(self, env):
+                    disposition_value = 'inline'
+            elif filename:
+                disposition_value = disposition_format('attachment',
+                                                       filename)
+            elif existing_disposition:
+                disposition_value = existing_disposition
+            else:
+                name = basename(wsgi_to_str(env['PATH_INFO']).rstrip('/'))
+                disposition_value = disposition_format('attachment',
+                                                       name)
+            # this is probably just paranoia, I couldn't actually get a
+            # newline into existing_disposition
+            value = disposition_value.replace('\n', '%0A')
+            out_headers.append(('Content-Disposition', value))
+            # include Expires header for better cache-control
+            out_headers.append(('Expires', strftime(
+                "%a, %d %b %Y %H:%M:%S GMT",
+                gmtime(temp_url_expires))))
+            ctx._response_headers = out_headers
+        start_response(
+            ctx._response_status,
+            ctx._response_headers,
+            ctx._response_exc_info)
+        return app_iter
+    def _get_path_parts(self, env, allow_container_root=False):
         """
         Return the account, container and object name for the request,
         if it's an object request and one of the configured methods;
         otherwise, None is returned.
+        If it's a container request and allow_root_container is true,
+        the object name returned will be the empty string.
         :param env: The WSGI environment for the request.
+        :param allow_container_root: Whether requests to the root of a
+            container should be allowed.
         :returns: (Account str, container str, object str) or
             (None, None, None).
         """
         if env['REQUEST_METHOD'] in self.conf['methods']:
             try:
-                ver, acc, cont, obj = split_path(env['PATH_INFO'], 4, 4, True)
+                ver, acc, cont, obj = split_path(
+                    env['PATH_INFO'], 3 if allow_container_root else 4,
+                    4, True)
             except ValueError:
                 return (None, None, None)
-            if ver == 'v1' and obj.strip('/'):
-                return (wsgi_to_str(acc), wsgi_to_str(cont), wsgi_to_str(obj))
+            if ver == 'v1' and (allow_container_root or obj.strip('/')):
+                return (wsgi_to_str(acc), wsgi_to_str(cont),
+                        wsgi_to_str(obj) if obj else '')
         return (None, None, None)
-    def _get_temp_url_info(self, env):
-        """
-        Returns the provided temporary URL parameters (sig, expires, prefix,
-        temp_url_ip_range), if given and syntactically valid.
-        Either sig, expires or prefix could be None if not provided.
-        If provided, expires is also converted to an int if possible or 0
-        if not, and checked for expiration (returns 0 if expired).
-        :param env: The WSGI environment for the request.
-        :returns: (sig, expires, prefix, filename, inline,
-            temp_url_ip_range) as described above.
-        """
-        temp_url_sig = temp_url_expires = temp_url_prefix = filename =\
-            inline = None
-        temp_url_ip_range = None
-        qs = parse_qs(env.get('QUERY_STRING', ''), keep_blank_values=True)
-        if 'temp_url_ip_range' in qs:
-            temp_url_ip_range = qs['temp_url_ip_range'][0]
-        if 'temp_url_sig' in qs:
-            temp_url_sig = qs['temp_url_sig'][0]
-        if 'temp_url_expires' in qs:
-            try:
-                temp_url_expires = int(qs['temp_url_expires'][0])
-            except ValueError:
-                try:
-                    temp_url_expires = timegm(strptime(
-                        qs['temp_url_expires'][0],
-                        EXPIRES_ISO8601_FORMAT))
-                except ValueError:
-                    temp_url_expires = 0
-            if temp_url_expires < time():
-                temp_url_expires = 0
-        if 'temp_url_prefix' in qs:
-            temp_url_prefix = qs['temp_url_prefix'][0]
-        if 'filename' in qs:
-            filename = qs['filename'][0]
-        if 'inline' in qs:
-            inline = True
-        return (temp_url_sig, temp_url_expires, temp_url_prefix, filename,
-                inline, temp_url_ip_range)
     def _get_keys(self, env):
         """
         Returns the X-[Account|Container]-Meta-Temp-URL-Key[-2] header values

swift/common/middleware/x_profile/exceptions.py CHANGED Viewed

@@ -13,16 +13,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from swift import gettext_ as _
 class ProfileException(Exception):
     def __init__(self, msg):
         self.msg = msg
     def __str__(self):
-        return _('Profiling Error: %s') % self.msg
+        return 'Profiling Error: %s' % self.msg
 class NotFoundException(ProfileException):

swift/common/middleware/x_profile/html_viewer.py CHANGED Viewed

@@ -19,7 +19,6 @@ import re
 import string
 import tempfile
-from swift import gettext_ as _
 from swift.common.middleware.x_profile.exceptions import PLOTLIBNotInstalled
 from swift.common.middleware.x_profile.exceptions import ODFLIBNotInstalled
 from swift.common.middleware.x_profile.exceptions import NotFoundException
@@ -307,7 +306,7 @@ class HTMLViewer(object):
                                                  nfl_filter, download_format)
             headers.append(('Access-Control-Allow-Origin', '*'))
         else:
-            raise MethodNotAllowed(_('method %s is not allowed.') % method)
+            raise MethodNotAllowed('method %s is not allowed.' % method)
         return content, headers
     def index_page(self, log_files=None, sort='time', limit=-1,
@@ -318,7 +317,7 @@ class HTMLViewer(object):
         try:
             stats = Stats2(*log_files)
         except (IOError, ValueError):
-            raise DataLoadFailure(_('Can not load profile data from %s.')
+            raise DataLoadFailure('Can not load profile data from %s.'
                                   % log_files)
         if not fulldirs:
             stats.strip_dirs()
@@ -369,7 +368,7 @@ class HTMLViewer(object):
     def download(self, log_files, sort='time', limit=-1, nfl_filter='',
                  output_format='default'):
         if len(log_files) == 0:
-            raise NotFoundException(_('no log file found'))
+            raise NotFoundException('no log file found')
         try:
             nfl_esc = nfl_filter.replace(r'(', r'\(').replace(r')', r'\)')
             # remove the slash that is intentionally added in the URL
@@ -392,14 +391,14 @@ class HTMLViewer(object):
         except ODFLIBNotInstalled:
             raise
         except Exception as ex:
-            raise ProfileException(_('Data download error: %s') % ex)
+            raise ProfileException('Data download error: %s' % ex)
     def plot(self, log_files, sort='time', limit=10, nfl_filter='',
              metric_selected='cc', plot_type='bar'):
         if not PLOTLIB_INSTALLED:
-            raise PLOTLIBNotInstalled(_('python-matplotlib not installed.'))
+            raise PLOTLIBNotInstalled('python-matplotlib not installed.')
         if len(log_files) == 0:
-            raise NotFoundException(_('no log file found'))
+            raise NotFoundException('no log file found')
         try:
             stats = Stats2(*log_files)
             stats.sort_stats(sort)
@@ -433,7 +432,7 @@ class HTMLViewer(object):
                 data = profile_img.read()
                 return data, [('content-type', 'image/jpg')]
         except Exception as ex:
-            raise ProfileException(_('plotting results failed due to %s') % ex)
+            raise ProfileException('plotting results failed due to %s' % ex)
     def format_source_code(self, nfl):
         nfls = re.split('[:()]', nfl)
@@ -444,7 +443,7 @@ class HTMLViewer(object):
             lineno = 0
         # for security reason, this need to be fixed.
         if not file_path.endswith('.py'):
-            return _('The file type are forbidden to access!')
+            return 'The file type are forbidden to access!'
         try:
             data = []
             i = 0
@@ -465,7 +464,7 @@ class HTMLViewer(object):
                         data.append(fmt % (i, i, i, el))
             data = ''.join(data)
         except Exception:
-            return _('Can not access the file %s.') % file_path
+            return 'Can not access the file %s.' % file_path
         return '<pre>%s</pre>' % data
     def generate_stats_html(self, stats, app_path, profile_id, *selection):

swift/common/middleware/x_profile/profile_model.py CHANGED Viewed

@@ -20,7 +20,6 @@ import pstats
 import tempfile
 import time
-from swift import gettext_ as _
 from swift.common.middleware.x_profile.exceptions import ODFLIBNotInstalled
@@ -125,7 +124,7 @@ class Stats2(pstats.Stats):
     def to_ods(self, *selection):
         if not ODFLIB_INSTALLED:
-            raise ODFLIBNotInstalled(_('odfpy not installed.'))
+            raise ODFLIBNotInstalled('odfpy not installed.')
         if self.fcn_list:
             stat_list = self.fcn_list[:]
             order_text = "   Ordered by: " + self.sort_type + '\n'

swift/common/middleware/xprofile.py CHANGED Viewed

@@ -83,7 +83,6 @@ import eventlet.green.profile as eprofile
 import six
 from six.moves import urllib
-from swift import gettext_ as _
 from swift.common.utils import get_logger, config_true_value
 from swift.common.swob import Request
 from swift.common.middleware.x_profile.exceptions import MethodNotAllowed
@@ -227,7 +226,7 @@ class ProfileMiddleware(object):
                 return '%s' % pf
             except Exception as ex:
                 start_response('500 Internal Server Error', [])
-                return _('Error on render profiling results: %s') % ex
+                return 'Error on render profiling results: %s' % ex
         else:
             _locals = locals()
             code = self.unwind and PROFILE_EXEC_EAGER or\

swift 2.32.0__py2.py3-none-any.whl → 2.34.0__py2.py3-none-any.whl

swift 2.32.0py2.py3-none-any.whl → 2.34.0py2.py3-none-any.whl