kallithea Changeset - b3d8a3000a7f

Changeset - b3d8a3000a7f

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Mads Kiilerich (mads) - 5 years ago 2020-11-10 17:43:37
mads@kiilerich.com

Grafted from: 017e1e43eb39

lib: cleanup of _get_ip_addr

3 files changed with 8 insertions and 15 deletions:

kallithea/config/middleware/wrapper.py

kallithea/controllers/api/__init__.py

kallithea/lib/base.py

0 comments (0 inline, 0 general)

kallithea/config/middleware/wrapper.py

➞

Show inline comments

@@ @@ -26,13 +26,13 @@ Original author and date, and relevant c @@
 :license: GPLv3, see LICENSE.md for more details.
 """
 import logging
 import time
-from kallithea.lib.base import _get_ip_addr, get_path_info
+from kallithea.lib.base import get_ip_addr, get_path_info
 log = logging.getLogger(__name__)
 class Meter:
@@ @@ -88,13 +88,13 @@ class RequestWrapper(object): @@
         self.application = app
         self.config = config
     def __call__(self, environ, start_response):
         meter = Meter(start_response)
         description = "Request from %s for %s" % (
-            _get_ip_addr(environ),
+            get_ip_addr(environ),
             get_path_info(environ),
+        )
         log.info("%s received", description)
         try:
             result = self.application(environ, meter.start_response)
         finally:

kallithea/controllers/api/__init__.py

➞

Show inline comments

@@ @@ -34,14 +34,13 @@ import types @@
 from tg import Response, TGController, request, response
 from webob.exc import HTTPError, HTTPException
 from kallithea.lib import ext_json
 from kallithea.lib.auth import AuthUser
 from kallithea.lib.base import _get_ip_addr as _get_ip
 from kallithea.lib.base import get_path_info
 from kallithea.lib.base import get_ip_addr, get_path_info
 from kallithea.lib.utils2 import ascii_bytes
 from kallithea.model import db
 log = logging.getLogger('JSONRPC')
@@ @@ -80,15 +79,12 @@ class JSONRPCController(TGController): @@
      Sub-classes should catch their exceptions and raise JSONRPCError
      if they want to pass meaningful errors to the client.
      """
     def _get_ip_addr(self, environ):
         return _get_ip(environ)
     def _get_method_args(self):
         """
         Return `self._rpc_args` to dispatched controller method
         chosen by __call__
         """
         return self._rpc_args
@@ @@ -100,13 +96,13 @@ class JSONRPCController(TGController): @@
         """
         # Since we are here we should respond as JSON
         response.content_type = 'application/json'
         environ = state.request.environ
         start = time.time()
-        ip_addr = self._get_ip_addr(environ)
+        ip_addr = get_ip_addr(environ)
         self._req_id = None
         if 'CONTENT_LENGTH' not in environ:
             log.debug("No Content-Length")
             raise JSONRPCErrorResponse(retid=self._req_id,
                                        message="No Content-Length in request")
         else:
@@ @@ -205,13 +201,13 @@ class JSONRPCController(TGController): @@
         self._rpc_args = {}
         self._rpc_args.update(self._request_params)
         self._rpc_args['action'] = self._req_method
         self._rpc_args['environ'] = environ
         log.info('IP: %s Request to %s time: %.3fs' % (
-            self._get_ip_addr(environ),
+            get_ip_addr(environ),
             get_path_info(environ), time.time() - start)
+        )
         state.set_action(self._rpc_call, [])
         state.set_params(self._rpc_args)
         return state

kallithea/lib/base.py

➞

Show inline comments

@@ @@ -75,13 +75,13 @@ def _filter_proxy(ip): @@
         _first_ip = _ips[0].strip()
         log.debug('Got multiple IPs %s, using %s', ','.join(_ips), _first_ip)
         return _first_ip
     return ip
-def _get_ip_addr(environ):
+def get_ip_addr(environ):
     proxy_key = 'HTTP_X_REAL_IP'
     proxy_key2 = 'HTTP_X_FORWARDED_FOR'
     def_key = 'REMOTE_ADDR'
     ip = environ.get(proxy_key)
     if ip:
@@ @@ -297,15 +297,12 @@ class BaseVCSController(object): @@
         else:
             assert False, action
         return True
     def _get_ip_addr(self, environ):
         return _get_ip_addr(environ)
     def __call__(self, environ, start_response):
         try:
             # try parsing a request for this VCS - if it fails, call the wrapped app
             parsed_request = self.parse_request(environ)
             if parsed_request is None:
                 return self.application(environ, start_response)
@@ @@ -321,13 +318,13 @@ class BaseVCSController(object): @@
                 # Note: the client doesn't get the helpful error message
                 raise webob.exc.HTTPBadRequest('Unable to detect pull/push action for %r! Are you using a nonstandard command or client?' % parsed_request.repo_name)
             #======================================================================
             # CHECK PERMISSIONS
             #======================================================================
-            ip_addr = self._get_ip_addr(environ)
+            ip_addr = 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)
             #======================================================================
             # REQUEST HANDLING
@@ @@ -485,13 +482,13 @@ class BaseController(TGController): @@
         if request.method not in ['POST', 'PUT'] and request.POST:
             log.error('%r request with payload parameters; WebOb should have stopped this', request.method)
             raise webob.exc.HTTPBadRequest()
     def __call__(self, environ, context):
         try:
-            ip_addr = _get_ip_addr(environ)
+            ip_addr = get_ip_addr(environ)
             self._basic_security_checks()
             api_key = request.GET.get('api_key')
             try:
                 # Request.authorization may raise ValueError on invalid input
                 type, params = request.authorization

0 comments (0 inline, 0 general)