kallithea Changeset - 801cdb3e0969

Changeset - 801cdb3e0969

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 15 years ago 2011-02-01 02:18:05
marcin@python-works.com

simplified simplegit and simplehg a little

2 files changed with 2 insertions and 7 deletions:

rhodecode/lib/middleware/simplegit.py

rhodecode/lib/middleware/simplehg.py

0 comments (0 inline, 0 general)

rhodecode/lib/middleware/simplegit.py

➞

Show inline comments

@@ @@ -156,13 +156,13 @@ class SimpleGit(object): @@
                 #==============================================================
                 # CHECK PERMISSIONS FOR THIS REQUEST USING GIVEN USERNAME FROM
                 # BASIC AUTH
                 #==============================================================
                 if self.action in ['pull', 'push']  or self.action:
-                    username = self.__get_environ_user(environ)
+                    username = REMOTE_USER(environ)
                     try:
                         user = self.__get_user(username)
                         self.username = user.username
                     except:
                         log.error(traceback.format_exc())
                         return HTTPInternalServerError()(environ, start_response)
@@ @@ -245,14 +245,12 @@ class SimpleGit(object): @@
         except:
             log.error(traceback.format_exc())
             raise
         repo_name = repo_name.split('/')[0]
         return repo_name
     def __get_environ_user(self, environ):
         return environ.get('REMOTE_USER')
     def __get_user(self, username):
         return UserModel().get_by_username(username, cache=True)
     def __get_action(self, environ):
         """Maps git request commands into a pull or push command.

rhodecode/lib/middleware/simplehg.py

➞

Show inline comments

@@ @@ -123,13 +123,13 @@ class SimpleHg(object): @@
                 #==============================================================
                 # CHECK PERMISSIONS FOR THIS REQUEST USING GIVEN USERNAME FROM
                 # BASIC AUTH
                 #==============================================================
                 if self.action in ['pull', 'push']:
-                    username = self.__get_environ_user(environ)
+                    username = REMOTE_USER(environ)
                     try:
                         user = self.__get_user(username)
                         self.username = user.username
                     except:
                         log.error(traceback.format_exc())
                         return HTTPInternalServerError()(environ, start_response)
@@ @@ -217,15 +217,12 @@ class SimpleHg(object): @@
         except:
             log.error(traceback.format_exc())
             raise
         return repo_name
     def __get_environ_user(self, environ):
         return environ.get('REMOTE_USER')
     def __get_user(self, username):
         return UserModel().get_by_username(username, cache=True)
     def __get_action(self, environ):
         """Maps mercurial request commands into a clone,pull or push command.
         This should always return a valid command string

0 comments (0 inline, 0 general)