refs #484 to configure CORS

Author: odaka_to

config/config_sample.yml

@@ -53,6 +53,20 @@ common: &common
     # Enable bugsnag (set the API key)
     bugsnag: _env:BUGSNAG
 
+    # CORS support is not enabled by default
+    cors:
+        origins: _env:CORS_ORIGINS:["null"]
+        methods: _env:CORS_METHODS
+        headers: _env:CORS_HEADERS:[Content-Type]
+        expose_headers: _env:CORS_EXPOSE_HEADERS
+        supports_credentials: _env:CORS_SUPPORTS_CREDENTIALS
+        max_age: _env:CORS_MAX_AGE
+        send_wildcard: _env:CORS_SEND_WILDCARD
+        always_send: _env:CORS_ALWAYS_SEND
+        automatic_options: _env:CORS_AUTOMATIC_OPTIONS
+        vary_header: _env:CORS_VARY_HEADER
+        resources: _env:CORS_RESOURCES
+
 local: &local
     <<: *common
     storage: local

docker_registry/app.py

@@ -16,6 +16,7 @@
 from .lib import config
 from .server import __version__
 import flask
+from flask.ext.cors import CORS
 
 # configure logging prior to subsequent imports which assume
 # logging has been configured
@@ -109,6 +110,10 @@ def init():
                           app_version=__version__
                           )
         bugsnag.flask.handle_exceptions(app)
+    # Configure flask_cors
+    for i in cfg.cors.keys():
+        app.config['CORS_%s' % i.upper()] = cfg.cors[i]
+    CORS(app)
 
 
 def _adapt_smtp_secure(value):

docker_registry/index.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 
 import flask
-import flask_cors
 
 from docker_registry.core import compat
 from docker_registry.core import exceptions
@@ -103,7 +102,6 @@ def put_repository(namespace, repository, images=False):
 
 
 @app.route('/v1/repositories/<path:repository>/images', methods=['GET'])
-@flask_cors.cross_origin(methods=['GET'])  # allow all origins (*)
 @toolkit.parse_repository_name
 @toolkit.requires_auth
 @mirroring.source_lookup(index_route=True)

docker_registry/search.py

@@ -5,7 +5,6 @@
 from .lib import config
 from .lib import index
 import flask
-import flask_cors
 
 
 cfg = config.load()
@@ -18,7 +17,6 @@
 
 
 @app.route('/v1/search', methods=['GET'])
-@flask_cors.cross_origin(methods=['GET'])  # allow all origins (*)
 def get_search():
     search_term = flask.request.args.get('q', '')
     if INDEX is None:

requirements/main.txt

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