For OS X dev, fixing dependency conflicts (swig/m2crypto) and disabli…

…ng csrf protection and CORS
ottogroup · Aug 21, 2015 · e633cd4 · e633cd4
1 parent 828f4d7
commit e633cd4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/env-config/config-local.py b/env-config/config-local.py
@@ -58,7 +58,7 @@
 MAIL_USERNAME = 'username'
 MAIL_PASSWORD = 'password'
 
-WTF_CSRF_ENABLED = True
+WTF_CSRF_ENABLED = False
 WTF_CSRF_SSL_STRICT = True # Checks Referer Header. Set to False for API access.
 WTF_CSRF_METHODS = ['DELETE', 'POST', 'PUT', 'PATCH']
 

diff --git a/requirements.txt b/requirements.txt
@@ -31,10 +31,10 @@ python-dateutil==2.2
 python-memcached==1.53
 PyYAML==3.11
 requests==2.2.1
-py-bcrypt==0.4
+bcrypt==2.0.0
 Sphinx==1.2.2
 gunicorn==18.0
-M2Crypto==0.22.3
+M2Crypto==0.21.1
 boto3==0.0.11
 dpath==1.3.2
 jira==0.32
diff --git a/security_monkey/decorators.py b/security_monkey/decorators.py
@@ -32,6 +32,8 @@ def crossdomain(allowed_origins=None, methods=None, headers=None,
 
     def get_origin(allowed_origins):
         origin = request.headers.get("Origin", None)
+        if origin and current_app.config.get('DEBUG', False):
+            return origin
         if origin and origin in allowed_origins:
             return origin
         return None

diff --git a/setup.py b/setup.py
@@ -54,10 +54,10 @@
             'python-dateutil==2.2',
             'python-memcached==1.53',
             'requests==2.2.1',
-            'py-bcrypt==0.4',
+            'bcrypt==2.0.0',
             'Sphinx==1.2.2',
             'gunicorn==18.0',
-            'M2Crypto==0.22.3',
+            'M2Crypto==0.21.1',
             'boto3==0.0.11',
             'dpath==1.3.2',
             'pyyaml==3.11',