HUE-2072 [core] Updating Proxy SSL support to be optional

xiaorong919 · Apr 17, 2014 · b293f95 · b293f95
1 parent b69811f
commit b293f95
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/desktop/conf.dist/hue.ini b/desktop/conf.dist/hue.ini
@@ -69,6 +69,9 @@
   # Help improve Hue with anonymous usage analytics.
   # Use Google Analytics to see how many times an application or specific section of an application is used, nothing more.
   ## collect_usage=true
+
+  # SECURE_PROXY_SSL_HEADER support for HTTPS termination at the load-balancer level
+  ## SECURE_PROXY_SSL_HEADER=true
 
   # Comma-separated list of Django middleware classes to use.
   # See https://docs.djangoproject.com/en/1.4/ref/middleware/ for more details on middlewares in Django.

diff --git a/desktop/conf/pseudo-distributed.ini.tmpl b/desktop/conf/pseudo-distributed.ini.tmpl
@@ -78,7 +78,11 @@
   # Help improve Hue with anonymous usage analytics.
   # Use Google Analytics to see how many times an application or specific section of an application is used, nothing more.
   ## collect_usage=true
-
+
+  # SECURE_PROXY_SSL_HEADER support for HTTPS termination at the load-balancer level
+  ## SECURE_PROXY_SSL_HEADER=true
+
+
   # Comma-separated list of Django middleware classes to use.
   # See https://docs.djangoproject.com/en/1.4/ref/middleware/ for more details on middlewares in Django.
   ## middleware=desktop.auth.backend.LdapSynchronizationBackend

diff --git a/desktop/core/src/desktop/settings.py b/desktop/core/src/desktop/settings.py
@@ -346,7 +346,8 @@
   MIDDLEWARE_CLASSES.append('desktop.middleware.EnsureSafeRedirectURLMiddleware')
 
 #Support HTTPS load-balancing
-SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTOCOL', 'https')
+if desktop.conf.SECURE_PROXY_SSL_HEADER.get():
+  SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTOCOL', 'https')
 
 ############################################################