kallithea Changeset - 9f0fe6777833

Changeset - 9f0fe6777833

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 14 years ago 2012-02-28 16:44:17
marcin@python-works.com

merge pull request #32 from codingtony

2 files changed with 9 insertions and 20 deletions:

docs/changelog.rst

rhodecode/lib/middleware/simplegit.py

0 comments (0 inline, 0 general)

docs/changelog.rst

➞

Show inline comments

@@ @@ -17,13 +17,13 @@ news @@
 fixes
 +++++
 - fixed git protocol issues with repos-groups
 - fixed git remote repos validator that prevented from cloning remote git repos
 - fixes #370 ending slashes fixes for repo and groups
-#- fixes #368 improved git-protocol detection to handle other clients
 - fixes #368 improved git-protocol detection to handle other clients
 - fixes #366 When Setting Repository Group To Blank Repo Group Wont Be
   Moved To Root
 .3.1 (**2012-02-27**)
 ----------------------

rhodecode/lib/middleware/simplegit.py

➞

Show inline comments

@@ @@ -77,30 +77,26 @@ from rhodecode.model.db import User @@
 from webob.exc import HTTPNotFound, HTTPForbidden, HTTPInternalServerError
 log = logging.getLogger(__name__)
-GIT_PROTO_PAT = re.compile(r'git-upload-pack|git-receive-pack|info\/refs')
+GIT_PROTO_PAT = re.compile(r'^/(.+)/(info/refs|git-upload-pack|git-receive-pack)')
 def is_git(environ):
     """Returns True if request's target is git server.
     ``HTTP_USER_AGENT`` would then have git client version given.
     :param environ:
     """
     http_user_agent = environ.get('HTTP_USER_AGENT')
     if http_user_agent and http_user_agent.startswith('git'):
         return True
     return False
     path_info = environ['PATH_INFO']
     isgit_path = GIT_PROTO_PAT.match(path_info)
     log.debug('is a git path %s pathinfo : %s' % (isgit_path, path_info))
     return isgit_path
 class SimpleGit(BaseVCSController):
     def _handle_request(self, environ, start_response):
         if not is_git(environ):
             return self.application(environ, start_response)
         proxy_key = 'HTTP_X_REAL_IP'
         def_key = 'REMOTE_ADDR'
         ipaddr = environ.get(proxy_key, environ.get(def_key, '0.0.0.0'))
@@ @@ -219,31 +215,24 @@ class SimpleGit(BaseVCSController): @@
         Get's repository name out of PATH_INFO header
         :param environ: environ where PATH_INFO is stored
         """
         try:
             environ['PATH_INFO'] = self._get_by_id(environ['PATH_INFO'])
             repo_name = '/'.join(environ['PATH_INFO'].split('/')[1:])
             repo_name = GIT_PROTO_PAT.split(repo_name)
             if repo_name:
                 repo_name = repo_name[0]
             if repo_name.endswith('/'):
                 repo_name = repo_name.rstrip('/')
             repo_name = GIT_PROTO_PAT.match(environ['PATH_INFO']).group(1)
         except:
             log.error(traceback.format_exc())
             raise
         return repo_name
     def __get_user(self, username):
         return User.get_by_username(username)
     def __get_action(self, environ):
         """
         Maps git request commands into a pull or push command.
         """Maps git request commands into a pull or push command.
         :param environ:
         """
         service = environ['QUERY_STRING'].split('=')
         if len(service) > 1:
             service_cmd = service[1]

0 comments (0 inline, 0 general)