Re-express CORS as extra

Docker-DCO-1.1-Signed-off-by: Olivier Gambier <[email protected]> (github: dmp42)

Author: Olivier Gambier

Dockerfile

@@ -25,7 +25,7 @@ add ./config/boto.cfg /etc/boto.cfg
 run pip install /docker-registry/depends/docker-registry-core
 
 # Install registry
-run pip install file:///docker-registry#egg=docker-registry[bugsnag,newrelic]
+run pip install file:///docker-registry#egg=docker-registry[bugsnag,newrelic,cors]
 
 env DOCKER_REGISTRY_CONFIG /docker-registry/config/config_sample.yml
 env SETTINGS_FLAVOR dev

config/config_sample.yml

@@ -56,7 +56,7 @@ common: &common
 
     # CORS support is not enabled by default
     cors:
-        origins: _env:CORS_ORIGINS:["null"]
+        origins: _env:CORS_ORIGINS
         methods: _env:CORS_METHODS
         headers: _env:CORS_HEADERS:[Content-Type]
         expose_headers: _env:CORS_EXPOSE_HEADERS

docker_registry/app.py

@@ -7,10 +7,10 @@
 
 from . import toolkit
 from .extras import bugsnag
+from .extras import cors
 from .lib import config
 from .server import __version__
 import flask
-from flask.ext.cors import CORS  # noqa
 
 # configure logging prior to subsequent imports which assume
 # logging has been configured
@@ -79,11 +79,10 @@ def init():
             secure=secure_args)
         mail_handler.setLevel(logging.ERROR)
         app.logger.addHandler(mail_handler)
+    # Optional bugsnag support
     bugsnag.boot(app, cfg.bugsnag, cfg.flavor, __version__)
-    # Configure flask_cors
-    for i in cfg.cors.keys():
-        app.config['CORS_%s' % i.upper()] = cfg.cors[i]
-    CORS(app)
+    # Optional cors support
+    cors.boot(app, cfg.cors)
 
 
 def _adapt_smtp_secure(value):

docker_registry/extras/cors.py

@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+
+
+def boot(application, config):
+    if config and config['origins']:
+        try:
+            from flask.ext.cors import CORS
+            for i in config.keys():
+                application.config['CORS_%s' % i.upper()] = config[i]
+            CORS(application)
+        except Exception as e:
+            raise Exception('Failed to init cors support %s' % e)

requirements/main.txt

@@ -1,6 +1,5 @@
 blinker==1.3
 Flask==0.10.1
-Flask-cors==1.8.0
 gevent==1.0.1
 gunicorn==19.1
 PyYAML==3.11

setup.py

@@ -98,5 +98,6 @@
     extras_require={
         'bugsnag': ['bugsnag>=2.0,<2.1'],
         'newrelic': ['newrelic>=2.22,<2.23'],
+        'cors': ['Flask-cors>=1.8,<2.0'],
     }
 )