diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-11-21 05:43:10 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-11-21 05:43:10 +0000 |
commit | 3eeaf4a0312eb613a211ff89e4d3a168aa3546d8 (patch) | |
tree | e89868d5682dbc2315ab1cf3e74a102a121c6b1b | |
parent | 1fa346e8ba7671ecb1ad92575a146b7433c211d5 (diff) | |
parent | 40135b76a92cef4197e2f68be46fd129d41630c6 (diff) | |
download | oslo-middleware-3eeaf4a0312eb613a211ff89e4d3a168aa3546d8.tar.gz |
Merge "Backward compat for allowed_origin"
-rw-r--r-- | oslo_middleware/cors.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/oslo_middleware/cors.py b/oslo_middleware/cors.py index ac86bc1..b91fabd 100644 --- a/oslo_middleware/cors.py +++ b/oslo_middleware/cors.py @@ -18,6 +18,7 @@ import logging from oslo_config import cfg from oslo_middleware import base +import six import webob.dec import webob.exc import webob.response @@ -180,6 +181,12 @@ class CORS(base.ConfigurableMiddleware): :param allow_headers: List of HTTP headers to permit from the client. :return: ''' + + # NOTE(dims): Support older code that still passes in + # a string for allowed_origin instead of a list + if isinstance(allowed_origin, six.string_types): + allowed_origin = [allowed_origin] + for origin in allowed_origin: if origin in self.allowed_origins: |