From 3c9bd1ddf8814ab43d47fa3cb40cf2434de67c08 Mon Sep 17 00:00:00 2001 From: Chris Dodge Date: Wed, 5 Jun 2013 10:26:30 -0400 Subject: [PATCH 1/3] allow configuration settings to specify a session cookie name. This is to avoid problems we are experiencing between simultaneous login sessions between edx.org and edge.edx.org on certain browsers (i.e. Firefox) --- lms/envs/aws.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lms/envs/aws.py b/lms/envs/aws.py index a3d5cb653f..e393216f1f 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -102,6 +102,12 @@ with open(ENV_ROOT / CONFIG_PREFIX + "env.json") as env_file: SITE_NAME = ENV_TOKENS['SITE_NAME'] SESSION_COOKIE_DOMAIN = ENV_TOKENS.get('SESSION_COOKIE_DOMAIN') +# allow for environments to specify what cookie name our login subsystem should use +# this is to fix a bug regarding simultaneous loging between edx.org and edge.edx.org which can +# happen with some browsers (e.g. Firefox) +if ENV_TOKENS.get('SESSION_COOKIE_NAME', None): + SESSION_COOKIE_NAME = ENV_TOKENS.get('SESSION_COOKIE_NAME') + BOOK_URL = ENV_TOKENS['BOOK_URL'] MEDIA_URL = ENV_TOKENS['MEDIA_URL'] LOG_DIR = ENV_TOKENS['LOG_DIR'] From 4bade8d2868b004730daf275a6010b8d2ae140ae Mon Sep 17 00:00:00 2001 From: Chris Dodge Date: Wed, 5 Jun 2013 10:30:28 -0400 Subject: [PATCH 2/3] allow configuration settings to specify a session cookie name. This is to avoid problems we are experiencing between simultaneous login sessions between edx.org and edge.edx.org on certain browsers (i.e. Firefox) --- cms/envs/aws.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cms/envs/aws.py b/cms/envs/aws.py index f6064229e6..be30ce28b2 100644 --- a/cms/envs/aws.py +++ b/cms/envs/aws.py @@ -91,6 +91,12 @@ CACHES = ENV_TOKENS['CACHES'] SESSION_COOKIE_DOMAIN = ENV_TOKENS.get('SESSION_COOKIE_DOMAIN') +# allow for environments to specify what cookie name our login subsystem should use +# this is to fix a bug regarding simultaneous loging between edx.org and edge.edx.org which can +# happen with some browsers (e.g. Firefox) +if ENV_TOKENS.get('SESSION_COOKIE_NAME', None): + SESSION_COOKIE_NAME = ENV_TOKENS.get('SESSION_COOKIE_NAME') + #Email overrides DEFAULT_FROM_EMAIL = ENV_TOKENS.get('DEFAULT_FROM_EMAIL', DEFAULT_FROM_EMAIL) DEFAULT_FEEDBACK_EMAIL = ENV_TOKENS.get('DEFAULT_FEEDBACK_EMAIL', DEFAULT_FEEDBACK_EMAIL) From 6fb97d52c0b37155811572bf133ec4742b33427c Mon Sep 17 00:00:00 2001 From: Chris Dodge Date: Wed, 5 Jun 2013 11:21:35 -0400 Subject: [PATCH 3/3] fix typos --- cms/envs/aws.py | 2 +- lms/envs/aws.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cms/envs/aws.py b/cms/envs/aws.py index be30ce28b2..63c7d533cd 100644 --- a/cms/envs/aws.py +++ b/cms/envs/aws.py @@ -92,7 +92,7 @@ CACHES = ENV_TOKENS['CACHES'] SESSION_COOKIE_DOMAIN = ENV_TOKENS.get('SESSION_COOKIE_DOMAIN') # allow for environments to specify what cookie name our login subsystem should use -# this is to fix a bug regarding simultaneous loging between edx.org and edge.edx.org which can +# this is to fix a bug regarding simultaneous logins between edx.org and edge.edx.org which can # happen with some browsers (e.g. Firefox) if ENV_TOKENS.get('SESSION_COOKIE_NAME', None): SESSION_COOKIE_NAME = ENV_TOKENS.get('SESSION_COOKIE_NAME') diff --git a/lms/envs/aws.py b/lms/envs/aws.py index e393216f1f..588d9034db 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -103,7 +103,7 @@ SITE_NAME = ENV_TOKENS['SITE_NAME'] SESSION_COOKIE_DOMAIN = ENV_TOKENS.get('SESSION_COOKIE_DOMAIN') # allow for environments to specify what cookie name our login subsystem should use -# this is to fix a bug regarding simultaneous loging between edx.org and edge.edx.org which can +# this is to fix a bug regarding simultaneous logins between edx.org and edge.edx.org which can # happen with some browsers (e.g. Firefox) if ENV_TOKENS.get('SESSION_COOKIE_NAME', None): SESSION_COOKIE_NAME = ENV_TOKENS.get('SESSION_COOKIE_NAME')