kallithea Changeset - be2163ef127e

Changeset - be2163ef127e

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 13 years ago 2012-06-03 00:37:12
marcin@python-works.com

Add ip reference into BaseController

1 file changed with 13 insertions and 9 deletions:

rhodecode/lib/base.py

0 comments (0 inline, 0 general)

rhodecode/lib/base.py

➞

Show inline comments

@@ @@ -27,12 +27,22 @@ from rhodecode.model.db import Repositor @@
 from rhodecode.model.notification import NotificationModel
 from rhodecode.model.scm import ScmModel
 log = logging.getLogger(__name__)
 def _get_ip_addr(environ):
     proxy_key = 'HTTP_X_REAL_IP'
     proxy_key2 = 'HTTP_X_FORWARDED_FOR'
     def_key = 'REMOTE_ADDR'
     return environ.get(proxy_key2,
                        environ.get(proxy_key, environ.get(def_key, '0.0.0.0'))
+                       )
 class BasicAuth(AuthBasicAuthenticator):
     def __init__(self, realm, authfunc, auth_http_code=None):
         self.realm = realm
         self.authfunc = authfunc
         self._rc_auth_http_code = auth_http_code
@@ @@ -114,21 +124,13 @@ class BaseVCSController(object): @@
                                                                   repo_name):
                 return False
         return True
     def _get_ip_addr(self, environ):
         proxy_key = 'HTTP_X_REAL_IP'
         proxy_key2 = 'HTTP_X_FORWARDED_FOR'
         def_key = 'REMOTE_ADDR'
         return environ.get(proxy_key2,
                            environ.get(proxy_key,
                                        environ.get(def_key, '0.0.0.0')
+                            )
+                        )
         return _get_ip_addr(environ)
     def __call__(self, environ, start_response):
         start = time.time()
         try:
             return self._handle_request(environ, start_response)
         finally:
@@ @@ -150,20 +152,22 @@ class BaseController(WSGIController): @@
         c.unread_notifications = NotificationModel()\
                         .get_unread_cnt_for_user(c.rhodecode_user.user_id)
         self.cut_off_limit = int(config.get('cut_off_limit'))
         self.sa = meta.Session
         self.scm_model = ScmModel(self.sa)
         self.ip_addr = ''
     def __call__(self, environ, start_response):
         """Invoke the Controller"""
         # WSGIController.__call__ dispatches to the Controller method
         # the request is routed to. This routing information is
         # available in environ['pylons.routes_dict']
         start = time.time()
         try:
             self.ip_addr = _get_ip_addr(environ)
             # make sure that we update permissions each time we call controller
             api_key = request.GET.get('api_key')
             cookie_store = CookieStoreWrapper(session.get('rhodecode_user'))
             user_id = cookie_store.get('user_id', None)
             username = get_container_username(environ, config)
             auth_user = AuthUser(user_id, api_key, username)

0 comments (0 inline, 0 general)