kallithea Changeset - a93b8a544f83

Changeset - a93b8a544f83

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

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

hooks: drop 'server_url' parameter

The parameter might be conceptually nice, but it was only available for 2
hooks. To be really useful, it should have been available everywhere. It also
only reported the URL from the web request that initiated the hook ... and as
such it does some layering violations. The user URL might be the address that
should be used internally from the hook. And it can conceptually not be made
available actions that doesn't originate from a user web request. It seems much
better that custom hooks configure what they want to do. Perhaps by reading the
.ini file and using canonical_url.

4 files changed with 2 insertions and 12 deletions:

kallithea/config/rcextensions/__init__.py

kallithea/lib/base.py

kallithea/lib/utils2.py

kallithea/model/scm.py

0 comments (0 inline, 0 general)

kallithea/config/rcextensions/__init__.py

➞

Show inline comments

@@ @@ -184,13 +184,12 @@ DELETE_USER_HOOK = _dluserhook @@
 # build-in hook that Kallithea uses for logging pushes
 def _pushhook(*args, **kwargs):
     """
     Post push hook
     kwargs available:
       :param server_url: url of instance that triggered this hook
       :param config: path to .ini config used
       :param scm: type of VS 'git' or 'hg'
       :param username: name of user who pushed
       :param ip: ip of who pushed
       :param action: push
       :param repository: repository name
@@ @@ -210,13 +209,12 @@ PUSH_HOOK = _pushhook @@
 # build-in hook that Kallithea uses for logging pulls
 def _pullhook(*args, **kwargs):
     """
     Post pull hook
     kwargs available::
       :param server_url: url of instance that triggered this hook
       :param config: path to .ini config used
       :param scm: type of VS 'git' or 'hg'
       :param username: name of user who pulled
       :param ip: ip of who pulled
       :param action: pull
       :param repository: repository name

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, get_server_url, _set_extras
     safe_str, safe_int, _set_extras
 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
@@ @@ -337,13 +337,12 @@ class BaseVCSController(object): @@
                 'ip': ip_addr,
                 'username': user.username,
                 'action': parsed_request.action,
                 'repository': parsed_request.repo_name,
                 'scm': self.scm_alias,
                 'config': CONFIG['__file__'],
                 'server_url': get_server_url(environ),
+            }
             #======================================================================
             # REQUEST HANDLING
             #======================================================================
             log.debug('HOOKS extras is %s', extras)

kallithea/lib/utils2.py

➞

Show inline comments

@@ @@ -515,17 +515,12 @@ def obfuscate_url_pw(engine): @@
         return engine
     if _url.password:
         _url.password = 'XXXXX'
     return str(_url)
 def get_server_url(environ):
     req = webob.Request(environ)
     return req.host_url + req.script_name
 def _extract_extras():
     """
     Extracts the Kallithea extras data from os.environ, and wraps it into named
     AttributeDict object
     """
     try:

kallithea/model/scm.py

➞

Show inline comments

@@ @@ -44,14 +44,13 @@ from kallithea.lib.vcs.exceptions import @@
 from kallithea.lib.vcs.utils.lazy import LazyProperty
 from kallithea.lib.vcs.nodes import FileNode
 from kallithea.lib.vcs.backends.base import EmptyChangeset
 from kallithea import BACKENDS
 from kallithea.lib import helpers as h
 from kallithea.lib.utils2 import safe_str, safe_unicode, get_server_url, \
     _set_extras
 from kallithea.lib.utils2 import safe_str, safe_unicode, _set_extras
 from kallithea.lib.auth import HasRepoPermissionLevel, HasRepoGroupPermissionLevel, \
     HasUserGroupPermissionLevel, HasPermissionAny, HasPermissionAny
 from kallithea.lib.utils import get_filesystem_repos, make_ui, \
     action_logger
 from kallithea.model.db import Repository, Session, Ui, CacheInvalidation, \
     UserFollowing, UserLog, User, RepoGroup, PullRequest
@@ @@ -344,13 +343,12 @@ class ScmModel(object): @@
             'ip': _get_ip_addr(environ),
             'username': username,
             'action': action or 'push_local',
             'repository': repo_name,
             'scm': repo_alias,
             'config': CONFIG['__file__'],
             'server_url': get_server_url(environ),
+        }
         _set_extras(extras)
     def _handle_push(self, repo, username, action, repo_name, revisions):
         """
         Handle that the repository has changed.

0 comments (0 inline, 0 general)