Move cors allowed_origin check into add_origin3.0.0

This fixes an issue caused by c4957606cb290a639a4a02fbf648044242c5c207
where the add_origin method would fail if allowed_origin was
set to None. This could occur (even if oslo_config_project was
also set) if the projects config file contained its own
[cors] section anyway.

By moving the 'if allowed_origin:' check into add_origin
we ensure the function handles the default value if it
ever gets called.

Change-Id: I643e7a50e62564741fda784846bbdf3eb2bcc715
Closes-bug: #1518112

1 files changed, 10 insertions, 0 deletions

diff --git a/oslo_middleware/tests/test_cors.py b/oslo_middleware/tests/test_cors.py
index e47c5d8..de91c34 100644
--- a/oslo_middleware/tests/test_cors.py
+++ b/oslo_middleware/tests/test_cors.py
@@ -164,6 +164,16 @@ class CORSTestFilterFactory(test_base.BaseTestCase):
         '''Assert that a filter factory with oslo_config_project succeed.'''
         cors.filter_factory(global_conf=None, oslo_config_project='foobar')
 
+    def test_cor_config_sections_with_defaults(self):
+        '''Assert cors.* config sections with default values work.'''
+
+        # Set up the config fixture.
+        config = self.useFixture(fixture.Config(cfg.CONF))
+        config.load_raw_values(group='cors.subdomain')
+
+        # Now that the config is set up, create our application.
+        self.application = cors.CORS(test_application, cfg.CONF)
+
     def test_factory_latent_properties(self):
         '''Assert latent properties in paste.ini config.