swift 2.33.0__tar.gz → 2.33.1__tar.gz

{swift-2.33.0 → swift-2.33.1}/.zuul.yaml

@@ -44,11 +44,6 @@
       python_version: 3.6
     post-run: tools/playbooks/common/cover-post.yaml
 
-- job:
-    name: swift-tox-py36-centos-8-stream
-    parent: swift-tox-py36
-    nodeset: centos-8-stream
-
 - job:
     name: swift-tox-py37
     parent: swift-tox-base
@@ -309,13 +304,13 @@
     name: swift-tox-func-s3api-ceph-s3tests-tempauth
     parent: unittests
     voting: false
-    nodeset: centos-8-stream
+    nodeset: centos-9-stream
     description: |
       Setup a SAIO dev environment and run ceph-s3tests
     timeout: 5400
     vars:
       s3_acl: yes
-      bindep_profile: test py36
+      bindep_profile: test py39
     pre-run:
       - tools/playbooks/common/install_dependencies.yaml
       - tools/playbooks/saio_single_node_setup/setup_saio.yaml
@@ -330,13 +325,13 @@
 - job:
     name: swift-tox-func-s3api-tests-tempauth
     parent: unittests
-    nodeset: centos-8-stream
+    nodeset: centos-9-stream
     description: |
       Setup a SAIO dev environment and run our s3api test suite
     timeout: 1800
     vars:
       s3_acl: yes
-      bindep_profile: test py36
+      bindep_profile: test py39
     pre-run:
       - tools/playbooks/common/install_dependencies.yaml
       - tools/playbooks/saio_single_node_setup/setup_saio.yaml
@@ -348,16 +343,16 @@
       - tools/playbooks/probetests/post.yaml
 
 - job:
-    name: swift-probetests-centos-8-stream
+    name: swift-probetests-centos-9-stream
     parent: unittests
-    nodeset: centos-8-stream
+    nodeset: centos-9-stream
     description: |
       Setup a SAIO dev environment and run Swift's probe tests
       under Python 3.
     timeout: 7200
     vars:
       s3_acl: no
-      bindep_profile: test py36
+      bindep_profile: test py39
     pre-run:
       - tools/playbooks/common/install_dependencies.yaml
       - tools/playbooks/saio_single_node_setup/setup_saio.yaml
@@ -367,12 +362,12 @@
     post-run: tools/playbooks/probetests/post.yaml
 
 - job:
-    name: swift-probetests-centos-8-stream-arm64
-    parent: swift-probetests-centos-8-stream
+    name: swift-probetests-centos-9-stream-arm64
+    parent: swift-probetests-centos-9-stream
     nodeset:
       nodes:
-        - name: swift-centos-8-stream-arm64
-          label: centos-8-stream-arm64
+        - name: swift-centos-9-stream-arm64
+          label: centos-9-stream-arm64
     description: |
       Setup a SAIO dev environment and run Swift's probe tests
       under Python 3 on top of arm64 architecture.
@@ -380,7 +375,7 @@
 
 - job:
     name: swift-func-cors
-    parent: swift-probetests-centos-8-stream
+    parent: swift-probetests-centos-9-stream
     description: |
       Setup a SAIO dev environment and run Swift's CORS functional tests
     timeout: 1200
@@ -390,18 +385,18 @@
     post-run: tools/playbooks/cors/post.yaml
 
 - nodeset:
-    name: swift-five-nodes-py3
+    name: swift-five-nodes-centos-9
     nodes:
       - name: test-runner1
-        label: centos-8-stream
+        label: centos-9-stream
       - name: proxy1
-        label: centos-8-stream
+        label: centos-9-stream
       - name: account1
-        label: centos-8-stream
+        label: centos-9-stream
       - name: container1
-        label: centos-8-stream
+        label: centos-9-stream
       - name: object1
-        label: centos-8-stream
+        label: centos-9-stream
     groups:
       - name: test-runner
         nodes:
@@ -433,12 +428,12 @@
 - job:
     name: swift-multinode-rolling-upgrade
     parent: multinode
-    nodeset: swift-five-nodes-py3
+    nodeset: swift-five-nodes-centos-9
     description: |
       Build a 4 node swift cluster and run functional tests
     timeout: 5400
     vars:
-      bindep_profile: test py36
+      bindep_profile: test py39
     pre-run:
       - tools/playbooks/multinode_setup/pre.yaml
       - tools/playbooks/common/install_dependencies.yaml
@@ -448,12 +443,6 @@
     run: tools/playbooks/multinode_setup/run.yaml
     post-run: tools/playbooks/probetests/post.yaml
 
-- job:
-    name: swift-multinode-rolling-upgrade-victoria
-    parent: swift-multinode-rolling-upgrade
-    vars:
-      previous_swift_version: origin/unmaintained/victoria
-
 - job:
     name: swift-multinode-rolling-upgrade-wallaby
     parent: swift-multinode-rolling-upgrade
@@ -713,7 +702,7 @@
               - ^doc/(requirements.txt|(manpages|s3api|source)/.*)$
               - ^test/(cors|unit|functional|probe)/.*$
               - ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
-        - swift-probetests-centos-8-stream:
+        - swift-probetests-centos-9-stream:
             irrelevant-files: &probetest-irrelevant-files
               - ^(api-ref|releasenotes)/.*$
               # Keep doc/saio -- we use those sample configs in the saio playbooks
@@ -769,7 +758,7 @@
         - swift-tox-func-ec-py38
         - swift-func-cors
         - swift-tox-func-s3api-tests-tempauth
-        - swift-probetests-centos-8-stream:
+        - swift-probetests-centos-9-stream:
             irrelevant-files: *probetest-irrelevant-files
         - swift-dsvm-functional:
             irrelevant-files: *functest-irrelevant-files
@@ -794,13 +783,9 @@
         - swift-tox-py37
         - swift-tox-py39
         - swift-tox-py310
-        - swift-tox-py36-centos-8-stream
         - swift-tox-func-py39-centos-9-stream
         - swift-tox-func-encryption-py39-centos-9-stream
         - swift-tox-func-ec-py39-centos-9-stream
-        - swift-multinode-rolling-upgrade-train
-        - swift-multinode-rolling-upgrade-ussuri
-        - swift-multinode-rolling-upgrade-victoria
         - swift-multinode-rolling-upgrade-wallaby
         - swift-multinode-rolling-upgrade-xena
         - swift-multinode-rolling-upgrade-yoga

{swift-2.33.0 → swift-2.33.1}/CHANGELOG

@@ -1,3 +1,13 @@
+swift (2.33.1, caracal stable backports)
+
+    * Removed the use of `eval` in the xprofile middleware. Note that this
+      middleware is only intended for development purposes and is not
+      intended for use in production systems.
+
+    * Fixed `Content-Type` and `Content-Length` headers in account and
+      container `HEAD` responses (with eventlet>=0.38.0).
+
+
 swift (2.33.0, OpenStack Caracal)
 
     * S3 API fixes:

swift-2.33.1/PKG-INFO

@@ -0,0 +1,223 @@
+Metadata-Version: 2.1
+Name: swift
+Version: 2.33.1
+Summary: OpenStack Object Storage
+Home-page: https://docs.openstack.org/swift/latest/
+Author: OpenStack
+Author-email: openstack-discuss@lists.openstack.org
+Project-URL: Documentation, https://docs.openstack.org/swift/latest/
+Project-URL: Bug Tracker, https://bugs.launchpad.net/swift
+Project-URL: Source Code, https://opendev.org/openstack/swift/
+Project-URL: Release Notes, https://opendev.org/openstack/swift/src/branch/master/CHANGELOG
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: OpenStack
+Classifier: Intended Audience :: Information Technology
+Classifier: Intended Audience :: System Administrators
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+License-File: LICENSE
+License-File: AUTHORS
+Requires-Dist: eventlet!=0.34.3,>=0.25.0
+Requires-Dist: greenlet>=0.3.2
+Requires-Dist: PasteDeploy>=2.0.0
+Requires-Dist: lxml>=3.4.1
+Requires-Dist: requests>=2.14.2
+Requires-Dist: six>=1.10.0
+Requires-Dist: xattr>=0.4
+Requires-Dist: PyECLib>=1.3.1
+Requires-Dist: cryptography>=2.0.2
+Provides-Extra: kms-keymaster
+Requires-Dist: oslo.config!=4.3.0,!=4.4.0,>=4.0.0; extra == "kms-keymaster"
+Requires-Dist: castellan>=0.13.0; extra == "kms-keymaster"
+Provides-Extra: kmip-keymaster
+Requires-Dist: pykmip>=0.7.0; extra == "kmip-keymaster"
+Provides-Extra: keystone
+Requires-Dist: keystonemiddleware>=4.17.0; extra == "keystone"
+Provides-Extra: test
+Requires-Dist: hacking<6.2.0,>=2.0; extra == "test"
+Requires-Dist: coverage>=5.0.4; extra == "test"
+Requires-Dist: pytest>=4.6.11; extra == "test"
+Requires-Dist: pytest-cov>=2.12.1; extra == "test"
+Requires-Dist: stestr>=2.0.0; extra == "test"
+Requires-Dist: mock>=2.0; extra == "test"
+Requires-Dist: python-swiftclient>=3.2.0; extra == "test"
+Requires-Dist: python-keystoneclient!=2.1.0,>=2.0.0; extra == "test"
+Requires-Dist: boto>=2.32.1; extra == "test"
+Requires-Dist: boto3>=1.9; extra == "test"
+Requires-Dist: botocore>=1.12; extra == "test"
+Requires-Dist: requests-mock>=1.2.0; extra == "test"
+Requires-Dist: keystonemiddleware>=4.17.0; extra == "test"
+Requires-Dist: bandit>=1.1.0; extra == "test"
+Requires-Dist: docutils>=0.11; extra == "test"
+
+===============
+OpenStack Swift
+===============
+
+.. image:: https://governance.openstack.org/tc/badges/swift.svg
+    :target: https://governance.openstack.org/tc/reference/tags/index.html
+
+.. Change things from this point on
+
+OpenStack Swift is a distributed object storage system designed to scale
+from a single machine to thousands of servers. Swift is optimized for
+multi-tenancy and high concurrency. Swift is ideal for backups, web and mobile
+content, and any other unstructured data that can grow without bound.
+
+Swift provides a simple, REST-based API fully documented at
+https://docs.openstack.org/swift/latest/.
+
+Swift was originally developed as the basis for Rackspace's Cloud Files
+and was open-sourced in 2010 as part of the OpenStack project. It has
+since grown to include contributions from many companies and has spawned
+a thriving ecosystem of 3rd party tools. Swift's contributors are listed
+in the AUTHORS file.
+
+Docs
+----
+
+To build documentation run::
+
+    pip install -r requirements.txt -r doc/requirements.txt
+    sphinx-build -W -b html doc/source doc/build/html
+
+and then browse to doc/build/html/index.html. These docs are auto-generated
+after every commit and available online at
+https://docs.openstack.org/swift/latest/.
+
+For Developers
+--------------
+
+Getting Started
+~~~~~~~~~~~~~~~
+
+Swift is part of OpenStack and follows the code contribution, review, and
+testing processes common to all OpenStack projects.
+
+If you would like to start contributing, check out these
+`notes <CONTRIBUTING.rst>`__ to help you get started.
+
+The best place to get started is the
+`"SAIO - Swift All In One" <https://docs.openstack.org/swift/latest/development_saio.html>`__.
+This document will walk you through setting up a development cluster of
+Swift in a VM. The SAIO environment is ideal for running small-scale
+tests against Swift and trying out new features and bug fixes.
+
+Tests
+~~~~~
+
+There are three types of tests included in Swift's source tree.
+
+#. Unit tests
+#. Functional tests
+#. Probe tests
+
+Unit tests check that small sections of the code behave properly. For example,
+a unit test may test a single function to ensure that various input gives the
+expected output. This validates that the code is correct and regressions are
+not introduced.
+
+Functional tests check that the client API is working as expected. These can
+be run against any endpoint claiming to support the Swift API (although some
+tests require multiple accounts with different privilege levels). These are
+"black box" tests that ensure that client apps written against Swift will
+continue to work.
+
+Probe tests are "white box" tests that validate the internal workings of a
+Swift cluster. They are written to work against the
+`"SAIO - Swift All In One" <https://docs.openstack.org/swift/latest/development_saio.html>`__
+dev environment. For example, a probe test may create an object, delete one
+replica, and ensure that the background consistency processes find and correct
+the error.
+
+You can run unit tests with ``.unittests``, functional tests with
+``.functests``, and probe tests with ``.probetests``. There is an
+additional ``.alltests`` script that wraps the other three.
+
+To fully run the tests, the target environment must use a filesystem that
+supports large xattrs. XFS is strongly recommended. For unit tests and in-
+process functional tests, either mount ``/tmp`` with XFS or provide another
+XFS filesystem via the ``TMPDIR`` environment variable. Without this setting,
+tests should still pass, but a very large number will be skipped.
+
+Code Organization
+~~~~~~~~~~~~~~~~~
+
+-  bin/: Executable scripts that are the processes run by the deployer
+-  doc/: Documentation
+-  etc/: Sample config files
+-  examples/: Config snippets used in the docs
+-  swift/: Core code
+
+   -  account/: account server
+   -  cli/: code that backs some of the CLI tools in bin/
+   -  common/: code shared by different modules
+
+      -  middleware/: "standard", officially-supported middleware
+      -  ring/: code implementing Swift's ring
+
+   -  container/: container server
+   -  locale/: internationalization (translation) data
+   -  obj/: object server
+   -  proxy/: proxy server
+
+-  test/: Unit, functional, and probe tests
+
+Data Flow
+~~~~~~~~~
+
+Swift is a WSGI application and uses eventlet's WSGI server. After the
+processes are running, the entry point for new requests is the
+``Application`` class in ``swift/proxy/server.py``. From there, a
+controller is chosen, and the request is processed. The proxy may choose
+to forward the request to a back-end server. For example, the entry
+point for requests to the object server is the ``ObjectController``
+class in ``swift/obj/server.py``.
+
+For Deployers
+-------------
+
+Deployer docs are also available at
+https://docs.openstack.org/swift/latest/. A good starting point is at
+https://docs.openstack.org/swift/latest/deployment_guide.html
+There is an `ops runbook <https://docs.openstack.org/swift/latest/ops_runbook/index.html>`__
+that gives information about how to diagnose and troubleshoot common issues
+when running a Swift cluster.
+
+You can run functional tests against a Swift cluster with
+``.functests``. These functional tests require ``/etc/swift/test.conf``
+to run. A sample config file can be found in this source tree in
+``test/sample.conf``.
+
+For Client Apps
+---------------
+
+For client applications, official Python language bindings are provided
+at https://opendev.org/openstack/python-swiftclient.
+
+Complete API documentation at
+https://docs.openstack.org/api-ref/object-store/
+
+There is a large ecosystem of applications and libraries that support and
+work with OpenStack Swift. Several are listed on the
+`associated projects <https://docs.openstack.org/swift/latest/associated_projects.html>`__
+page.
+
+--------------
+
+For more information come hang out in #openstack-swift on OFTC.
+
+Thanks,
+
+The Swift Development Team
+

{swift-2.33.0 → swift-2.33.1}/bandit.yaml

@@ -79,7 +79,7 @@
 # B703 : django_mark_safe
 
 # (optional) list included test IDs here, eg '[B101, B406]':
-tests: [B102, B103, B302, B303, B304, B305, B306, B308, B310, B401, B501, B502, B506, B601, B602, B609]
+tests: [B102, B103, B302, B303, B304, B305, B306, B307, B308, B310, B401, B501, B502, B506, B601, B602, B609]
 
 # (optional) list skipped test IDs here, eg '[B101, B406]':
 skips:

{swift-2.33.0 → swift-2.33.1}/etc/account-server.conf-sample

@@ -295,7 +295,8 @@ use = egg:swift#backend_ratelimit
 # ionice_priority =
 
 # Note: Put it at the beginning of the pipeline to profile all middleware. But
-# it is safer to put this after healthcheck.
+# it is safer to put this after healthcheck. Not intended for production
+# environments!
 [filter:xprofile]
 use = egg:swift#xprofile
 # This option enable you to switch profilers which should inherit from python

{swift-2.33.0 → swift-2.33.1}/etc/container-server.conf-sample

@@ -337,7 +337,8 @@ use = egg:swift#backend_ratelimit
 # ionice_priority =
 
 # Note: Put it at the beginning of the pipeline to profile all middleware. But
-# it is safer to put this after healthcheck.
+# it is safer to put this after healthcheck. Not intended for production
+# environments!
 [filter:xprofile]
 use = egg:swift#xprofile
 # This option enable you to switch profilers which should inherit from python

{swift-2.33.0 → swift-2.33.1}/etc/object-server.conf-sample

@@ -693,7 +693,8 @@ use = egg:swift#backend_ratelimit
 # ionice_priority =
 #
 # Note: Put it at the beginning of the pipleline to profile all middleware. But
-# it is safer to put this after healthcheck.
+# it is safer to put this after healthcheck. Not intended for production
+# environments!
 [filter:xprofile]
 use = egg:swift#xprofile
 # This option enable you to switch profilers which should inherit from python

{swift-2.33.0 → swift-2.33.1}/etc/proxy-server.conf-sample

@@ -1162,6 +1162,7 @@ use = egg:swift#container_sync
 
 # Note: Put it at the beginning of the pipeline to profile all middleware. But
 # it is safer to put this after catch_errors, gatekeeper and healthcheck.
+# Not intended for production environments!
 [filter:xprofile]
 use = egg:swift#xprofile
 # This option enable you to switch profilers which should inherit from python

swift-2.33.1/releasenotes/notes/release-2.33.1-d81e097504cd5917.yaml

@@ -0,0 +1,10 @@
+---
+fixes:
+  - |
+    Removed the use of ``eval`` in the xprofile middleware. Note that this
+    middleware is only intended for development purposes and is not
+    intended for use in production systems.
+
+  - |
+    Fixed ``Content-Type`` and ``Content-Length`` headers in account and
+    container ``HEAD`` responses (with eventlet>=0.38.0).

{swift-2.33.0 → swift-2.33.1}/swift/common/middleware/listing_formats.py

@@ -18,6 +18,7 @@ import six
 from xml.etree.cElementTree import Element, SubElement, tostring
 
 from swift.common.constraints import valid_api_version
+from swift.common.header_key_dict import HeaderKeyDict
 from swift.common.http import HTTP_NO_CONTENT
 from swift.common.request_helpers import get_param
 from swift.common.swob import HTTPException, HTTPNotAcceptable, Request, \
@@ -178,52 +179,39 @@ class ListingFilter(object):
             start_response(status, headers)
             return resp_iter
 
-        header_to_index = {}
-        resp_content_type = resp_length = None
-        for i, (header, value) in enumerate(headers):
-            header = header.lower()
-            if header == 'content-type':
-                header_to_index[header] = i
-                resp_content_type = value.partition(';')[0]
-            elif header == 'content-length':
-                header_to_index[header] = i
-                resp_length = int(value)
-            elif header == 'vary':
-                header_to_index[header] = i
-
         if not status.startswith(('200 ', '204 ')):
             start_response(status, headers)
             return resp_iter
 
+        headers_dict = HeaderKeyDict(headers)
+        resp_content_type = headers_dict.get(
+            'content-type', '').partition(';')[0]
+        resp_length = headers_dict.get('content-length')
+
         if can_vary:
-            if 'vary' in header_to_index:
-                value = headers[header_to_index['vary']][1]
+            if 'vary' in headers_dict:
+                value = headers_dict['vary']
                 if 'accept' not in list_from_csv(value.lower()):
-                    headers[header_to_index['vary']] = (
-                        'Vary', value + ', Accept')
+                    headers_dict['vary'] = value + ', Accept'
             else:
-                headers.append(('Vary', 'Accept'))
+                headers_dict['vary'] = 'Accept'
 
         if resp_content_type != 'application/json':
-            start_response(status, headers)
+            start_response(status, list(headers_dict.items()))
             return resp_iter
 
-        if resp_length is None or \
-                resp_length > MAX_CONTAINER_LISTING_CONTENT_LENGTH:
-            start_response(status, headers)
+        if req.method == 'HEAD':
+            headers_dict['content-type'] = out_content_type + '; charset=utf-8'
+            # proxy logging (and maybe other mw?) seem to be good about
+            # sticking this on HEAD/204 but we do it here to be responsible
+            # and explicit
+            headers_dict['content-length'] = 0
+            start_response(status, list(headers_dict.items()))
             return resp_iter
 
-        def set_header(header, value):
-            if value is None:
-                del headers[header_to_index[header]]
-            else:
-                headers[header_to_index[header]] = (
-                    headers[header_to_index[header]][0], str(value))
-
-        if req.method == 'HEAD':
-            set_header('content-type', out_content_type + '; charset=utf-8')
-            set_header('content-length', None)  # don't know, can't determine
-            start_response(status, headers)
+        if resp_length is None or \
+                int(resp_length) > MAX_CONTAINER_LISTING_CONTENT_LENGTH:
+            start_response(status, list(headers_dict.items()))
             return resp_iter
 
         body = b''.join(resp_iter)
@@ -237,7 +225,7 @@ class ListingFilter(object):
         except ValueError:
             # Static web listing that's returning invalid JSON?
             # Just pass it straight through; that's about all we *can* do.
-            start_response(status, headers)
+            start_response(status, list(headers_dict.items()))
             return [body]
 
         if not req.allow_reserved_names:
@@ -257,16 +245,16 @@ class ListingFilter(object):
                 body = json.dumps(listing).encode('ascii')
         except KeyError:
             # listing was in a bad format -- funky static web listing??
-            start_response(status, headers)
+            start_response(status, list(headers_dict.items()))
             return [body]
 
         if not body:
             status = '%s %s' % (HTTP_NO_CONTENT,
                                 RESPONSE_REASONS[HTTP_NO_CONTENT][0])
 
-        set_header('content-type', out_content_type + '; charset=utf-8')
-        set_header('content-length', len(body))
-        start_response(status, headers)
+        headers_dict['content-type'] = out_content_type + '; charset=utf-8'
+        headers_dict['content-length'] = len(body)
+        start_response(status, list(headers_dict.items()))
         return [body]
 
 

{swift-2.33.0 → swift-2.33.1}/swift/common/middleware/x_profile/html_viewer.py

@@ -246,7 +246,7 @@ class HTMLViewer(object):
         if multiple:
             return value
         if isinstance(value, list):
-            return eval(value[0]) if isinstance(default, int) else value[0]
+            return int(value[0]) if isinstance(default, int) else value[0]
         else:
             return value
 

{swift-2.33.0 → swift-2.33.1}/swift/common/middleware/xprofile.py

@@ -16,6 +16,11 @@
 """
 Profiling middleware for Swift Servers.
 
+.. note::
+    This middleware is intended for development and testing environments only,
+    not production. No authentication is expected or required for the web UI,
+    and profiling may incur noticeable performance penalties.
+
 The current implementation is based on eventlet aware profiler.(For the
 future, more profilers could be added in to collect more data for analysis.)
 Profiling all incoming requests and accumulating cpu timing statistics