kallithea Changeset - 1901954df11d

Changeset - 1901954df11d

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 7 years ago 2019-01-10 03:35:01
mads@kiilerich.com

middleware: use shared code for setting hook context (KALLITHEA_EXTRAS environment variable)

1 file changed with 3 insertions and 15 deletions:

kallithea/lib/base.py

0 comments (0 inline, 0 general)

kallithea/lib/base.py

➞

Show inline comments

@@ @@ -46,13 +46,13 @@ from tg import TGController @@
 from tg.i18n import ugettext as _
 from kallithea import __version__, BACKENDS
 from kallithea.config.routing import url
 from kallithea.lib.utils2 import str2bool, safe_unicode, AttributeDict, \
-    safe_str, safe_int, _set_extras
     safe_str, safe_int
 from kallithea.lib import auth_modules
 from kallithea.lib.auth import AuthUser, HasPermissionAnyMiddleware
 from kallithea.lib.compat import json
 from kallithea.lib.utils import get_repo_slug, is_valid_repo
 from kallithea.lib.exceptions import UserCreationError
 from kallithea.lib.vcs.exceptions import RepositoryError, EmptyRepositoryError, ChangesetDoesNotExistError
@@ @@ -327,29 +327,17 @@ class BaseVCSController(object): @@
             #======================================================================
             ip_addr = self._get_ip_addr(environ)
             user, response_app = self._authorize(environ, parsed_request.action, parsed_request.repo_name, ip_addr)
             if response_app is not None:
                 return response_app(environ, start_response)
             # extras are injected into Mercurial UI object and later available
             # in hooks executed by Kallithea
             from kallithea import CONFIG
             extras = {
                 'ip': ip_addr,
                 'username': user.username,
                 'action': parsed_request.action,
                 'repository': parsed_request.repo_name,
                 'scm': self.scm_alias,
                 'config': CONFIG['__file__'],
+            }
             #======================================================================
             # REQUEST HANDLING
             #======================================================================
             log.debug('HOOKS extras is %s', extras)
             _set_extras(extras)
             ScmModel()._handle_rc_scm_extras(user.username, ip_addr,
                 parsed_request.repo_name, self.scm_alias, parsed_request.action)
             try:
                 log.info('%s action on %s repo "%s" by "%s" from %s',
                          parsed_request.action, self.scm_alias, parsed_request.repo_name, safe_str(user.username), ip_addr)
                 app = self._make_app(parsed_request)
                 return app(environ, start_response)

0 comments (0 inline, 0 general)