Merge pull request #3025 from ryanpetrello/django-cors-headers

add Django CORS middleware

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]

awx/settings/defaults.py

@@ -252,6 +252,7 @@ TEMPLATES = [
 MIDDLEWARE_CLASSES = (  # NOQA
     'awx.main.middleware.TimingMiddleware',
     'awx.main.middleware.MigrationRanCheckMiddleware',
+    'corsheaders.middleware.CorsMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.locale.LocaleMiddleware',
     'django.middleware.common.CommonMiddleware',
@@ -284,6 +285,7 @@ INSTALLED_APPS = (
     'polymorphic',
     'taggit',
     'social_django',
+    'corsheaders',
     'awx.conf',
     'awx.main',
     'awx.api',

docs/licenses/django-cors-headers.txt

@@ -0,0 +1 @@
+Copyright 2017 Otto Yiu and other contributors␍http://ottoyiu.com␍␍Permission is hereby granted, free of charge, to any person obtaining␍a copy of this software and associated documentation files (the␍"Software"), to deal in the Software without restriction, including␍without limitation the rights to use, copy, modify, merge, publish,␍distribute, sublicense, and/or sell copies of the Software, and to␍permit persons to whom the Software is furnished to do so, subject to␍the following conditions:␍␍The above copyright notice and this permission notice shall be␍included in all copies or substantial portions of the Software.␍␍THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,␍EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF␍MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND␍NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE␍LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION␍OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION␍WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.␍

requirements/requirements.in

@@ -8,6 +8,7 @@ daphne==1.3.0   # Last before backwards-incompatible channels 2 upgrade
 defusedxml==0.5.0  # py36 support https://github.com/tiran/defusedxml/pull/4
 Django==1.11.16
 django-auth-ldap==1.7.0
+django-cors-headers==2.4.0
 django-crum==0.7.2
 django-extensions==2.0.0
 django-jsonfield==1.0.1

requirements/requirements.txt

@@ -78,6 +78,7 @@ pyrad==2.1                # via django-radius
 pysocks==1.6.8
 python-dateutil==2.7.2
 python-ldap==3.1.0        # via django-auth-ldap
+django-cors-headers==2.4.0
 python-logstash==0.4.6
 python-memcached==1.59
 python3-openid>=3.0.10      # via social-auth-core