kallithea Changeset - 110a00c181de

Changeset - 110a00c181de

Parent rev.

Child rev.

[Not reviewed]

beta

0 7 0

Marcin Kuzminski - 15 years ago 2011-01-05 23:39:26
marcin@python-works.com

Added force https option into config files

7 files changed with 41 insertions and 5 deletions:

development.ini

production.ini

rhodecode/config/deployment.ini_tmpl

rhodecode/config/middleware.py

rhodecode/lib/__init__.py

rhodecode/lib/celerylib/__init__.py

rhodecode/lib/middleware/https_fixup.py

0 comments (0 inline, 0 general)

development.ini

➞

Show inline comments

@@ @@ -43,12 +43,13 @@ use = egg:rhodecode @@
 full_stack = true
 static_files = true
 lang=en
 cache_dir = %(here)s/data
 index_dir = %(here)s/data/index
 cut_off_limit = 256000
 force_https = false
 ####################################
 ###        CELERY CONFIG        ####
 ####################################
 use_celery = false
 broker.host = localhost

production.ini

➞

Show inline comments

@@ @@ -43,12 +43,13 @@ use = egg:rhodecode @@
 full_stack = true
 static_files = false
 lang=en
 cache_dir = %(here)s/data
 index_dir = %(here)s/data/index
 cut_off_limit = 256000
 force_https = false
 ####################################
 ###        CELERY CONFIG        ####
 ####################################
 use_celery = false
 broker.host = localhost

rhodecode/config/deployment.ini_tmpl

➞

Show inline comments

@@ @@ -44,12 +44,13 @@ full_stack = true @@
 static_files = true
 lang=en
 cache_dir = %(here)s/data
 index_dir = %(here)s/data/index
 app_instance_uuid = ${app_instance_uuid}
 cut_off_limit = 256000
 force_https = false
 ####################################
 ###        CELERY CONFIG        ####
 ####################################
 use_celery = false
 broker.host = localhost

rhodecode/config/middleware.py

➞

Show inline comments

@@ @@ -56,13 +56,13 @@ def make_app(global_conf, full_stack=Tru @@
         if asbool(config['debug']):
             app = StatusCodeRedirect(app)
         else:
             app = StatusCodeRedirect(app, [400, 401, 403, 404, 500])
     #enable https redirets based on HTTP_X_URL_SCHEME set by proxy
     app = HttpsFixup(app)
+    app = HttpsFixup(app, config)
     # Establish the Registry for this application
     app = RegistryManager(app)
     if asbool(static_files):
         # Serve static files

rhodecode/lib/__init__.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.lib.__init__
     ~~~~~~~~~~~~~~~~~~~~~~~
     Some simple helper functions
     :created_on: Jan 5, 2011
     :author: marcink
     :copyright: (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 def str2bool(v):
     return v.lower() in ["yes", "true", "t", "1"] if v else None

rhodecode/lib/celerylib/__init__.py

➞

Show inline comments

@@ @@ -32,21 +32,19 @@ import traceback @@
 import logging
 from hashlib import md5
 from decorator import decorator
 from vcs.utils.lazy import LazyProperty
 from rhodecode.lib import str2bool
 from rhodecode.lib.pidlock import DaemonLock, LockHeld
 from pylons import  config
 log = logging.getLogger(__name__)
 def str2bool(v):
     return v.lower() in ["yes", "true", "t", "1"] if v else None
 try:
     CELERY_ON = str2bool(config['app_conf'].get('use_celery'))
 except KeyError:
     CELERY_ON = False
 class ResultWrapper(object):

rhodecode/lib/middleware/https_fixup.py

➞

Show inline comments

@@ @@ -22,15 +22,18 @@ @@
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 from rhodecode.lib import str2bool
 class HttpsFixup(object):
     def __init__(self, app):
+    def __init__(self, app, config):
         self.application = app
         self.config = config
     def __call__(self, environ, start_response):
         self.__fixup(environ)
         return self.application(environ, start_response)
@@ @@ -38,11 +41,14 @@ class HttpsFixup(object): @@
         """Function to fixup the environ as needed. In order to use this
         middleware you should set this header inside your
         proxy ie. nginx, apache etc.
         """
         proto = environ.get('HTTP_X_URL_SCHEME')
         if str2bool(self.config.get('force_https')):
             proto = 'https'
         if proto == 'https':
             environ['wsgi.url_scheme'] = proto
         else:
             environ['wsgi.url_scheme'] = 'http'
         return None

0 comments (0 inline, 0 general)