Mercurial > kallithea
diff rhodecode/lib/middleware/simplegit.py @ 3179:cd50d1b5f35b
merged with beta
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Mon, 21 Jan 2013 00:03:44 +0100 |
parents | a5f0bc867edc e7ba69286276 |
children | e351161b8734 |
line wrap: on
line diff
--- a/rhodecode/lib/middleware/simplegit.py Fri Dec 14 04:45:03 2012 +0100 +++ b/rhodecode/lib/middleware/simplegit.py Mon Jan 21 00:03:44 2013 +0100 @@ -109,7 +109,7 @@ if not self._check_ssl(environ, start_response): return HTTPNotAcceptable('SSL REQUIRED !')(environ, start_response) - ipaddr = self._get_ip_addr(environ) + ip_addr = self._get_ip_addr(environ) username = None self._git_first_op = False # skip passing error to error controller @@ -140,7 +140,7 @@ anonymous_user = self.__get_user('default') username = anonymous_user.username anonymous_perm = self._check_permission(action, anonymous_user, - repo_name) + repo_name, ip_addr) if anonymous_perm is not True or anonymous_user.active is False: if anonymous_perm is not True: @@ -182,7 +182,7 @@ return HTTPInternalServerError()(environ, start_response) #check permissions for this repository - perm = self._check_permission(action, user, repo_name) + perm = self._check_permission(action, user, repo_name, ip_addr) if perm is not True: return HTTPForbidden()(environ, start_response) @@ -191,7 +191,7 @@ from rhodecode import CONFIG server_url = get_server_url(environ) extras = { - 'ip': ipaddr, + 'ip': ip_addr, 'username': username, 'action': action, 'repository': repo_name, @@ -233,11 +233,12 @@ self._invalidate_cache(repo_name) self._handle_githooks(repo_name, action, baseui, environ) - log.info('%s action on GIT repo "%s"' % (action, repo_name)) + log.info('%s action on GIT repo "%s" by "%s" from %s' % + (action, repo_name, username, ip_addr)) app = self.__make_app(repo_name, repo_path, extras) return app(environ, start_response) except HTTPLockedRC, e: - log.debug('Repositry LOCKED ret code 423!') + log.debug('Repository LOCKED ret code 423!') return e(environ, start_response) except Exception: log.error(traceback.format_exc())