kallithea Changeset - a4a4bcc09ac5

Changeset - a4a4bcc09ac5

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 7 years ago 2019-01-07 02:08:35
mads@kiilerich.com

Grafted from: b2c1950dd6a7

middleware: remove access fallback to reuse previous access - drop _git_stored_op

Before, the previous action was kept in the global controller instance. That
was conceptually wrong. The previous request might be entirely unrelated,
coming from another user.

It was mainly used for 'info/refs' commands ... but even more, that will be the
first command that is sent, giving nothing relevant to reuse.

Fortunately, with handling of 'info/refs', we no longer seem to need it.

The fallback for unknown commands with unknown 'action' is now to return a HTTP
failure, like we do for Mercurial.

1 file changed with 15 insertions and 14 deletions:

kallithea/lib/middleware/simplegit.py

0 comments (0 inline, 0 general)

kallithea/lib/middleware/simplegit.py

➞

Show inline comments

@@ @@ -34,7 +34,7 @@ import logging @@
 import traceback
 from webob.exc import HTTPNotFound, HTTPForbidden, HTTPInternalServerError, \
     HTTPNotAcceptable
+    HTTPNotAcceptable, HTTPBadRequest
 from kallithea.model.db import Ui
 from kallithea.lib.utils2 import safe_str, safe_unicode, get_server_url, \
@@ @@ -60,8 +60,6 @@ def is_git(environ): @@
 class SimpleGit(BaseVCSController):
     _git_stored_op = 'pull' # most recent kind of command
     def _handle_request(self, environ, start_response):
         if not is_git(environ):
             return self.application(environ, start_response)
@@ @@ -149,6 +147,8 @@ class SimpleGit(BaseVCSController): @@
     def __get_action(self, environ):
         """
         Maps Git request commands into 'pull' or 'push'.
         Raises HTTPBadRequest if the request environment doesn't look like a git client.
         """
         mapping = {
             'git-receive-pack': 'push',
@@ @@ -156,18 +156,19 @@ class SimpleGit(BaseVCSController): @@
+        }
         path_info = environ.get('PATH_INFO', '')
         m = GIT_PROTO_PAT.match(path_info)
         if m is not None:
         if m is None:
             action = None
         else:
             cmd = m.group(2)
             if cmd == 'info/refs':
                 service = environ['QUERY_STRING'].split('=')
                 cmd = service[1] if len(service) > 1 else None
                 if cmd in mapping:
                     self._git_stored_op = mapping[cmd]
             elif cmd in mapping:
                 self._git_stored_op = mapping[cmd]
         # fallback to stored variable as we don't know if the last
         # operation is pull/push
         return self._git_stored_op
             query_string = environ['QUERY_STRING']
             if cmd == 'info/refs' and query_string.startswith('service='):
                 service = query_string.split('=', 1)[1]
                 action = mapping.get(service)
             else:
                 action = mapping.get(cmd)
         if action is None:
             raise HTTPBadRequest('Unable to detect pull/push action for %r! Are you using a nonstandard command or client?' % path_info)
         return action
     def _handle_githooks(self, repo_name, action, baseui, environ):
         """

0 comments (0 inline, 0 general)