Changeset 59dfb4 in indico

Timestamp:

03/17/11 12:33:15 (2 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

1f0b21

Parents:

c45d407

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (03/17/11 12:32:27)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (03/17/11 12:33:15)

Message:

[FIX] getHostIP() now called by services

Location:

indico

Files:

• MaKaC/accessControl.py (modified) (2 diffs)
• MaKaC/services/implementation/base.py (modified) (2 diffs)
• MaKaC/services/interface/rpc/process.py (modified) (3 diffs)
• MaKaC/webinterface/rh/base.py (modified) (5 diffs)
• web/wsgi/indico_wsgi_handler.py (modified) (2 diffs)

indico/MaKaC/accessControl.py

@@ -27 +27 @@
 from MaKaC.common.contextManager import ContextManager
 from MaKaC.plugins import Observable
-
+from MaKaC.common.logger import Logger
 
 class AccessController( Persistent, Observable ):
@@ -92 +92 @@
             #return self._fatherProtection
         except:
+            Logger.get('accessController').exception('_getFatherProtection')
             self._fatherProtection = 0
             return 0

indico/MaKaC/services/implementation/base.py

@@ -153 +153 @@
     """
 
-    def __init__(self, params, remoteHost, session, req=None):
+    def __init__(self, params, session, req):
         """
         Constructor.  Initializes provate variables
         @param req: HTTP Request provided by the previous layer
         """
-        RequestHandlerBase.__init__(self)
-        self._req = req
+        RequestHandlerBase.__init__(self, req)
         self._params = params
         self._requestStarted = False
@@ -165 +164 @@
         # Fill in the aw instance with the current information
         self._aw = AccessWrapper()
-        self._aw.setIP(remoteHost)
+        self._aw.setIP(self.getHostIP())
         self._aw.setSession(session)
         self._aw.setUser(session.getUser())

indico/MaKaC/services/interface/rpc/process.py

@@ -16 +16 @@
 from MaKaC.services.interface.rpc.common import RequestError
 from MaKaC.services.interface.rpc.common import ProcessError
+
 
 def lookupHandler(method):
@@ -42 +43 @@
     return handler
 
+
 def processRequest(method, params, req):
     # lookup handler
@@ -48 +50 @@
     # invoke handler
     if hasattr(handler, "process"):
-        result = handler(params, req.get_remote_host(), getSession(req), req).process()
+        result = handler(params, getSession(req), req).process()
     else:
-        result = handler(params, req.get_remote_host(), getSession(req), req)
+        result = handler(params, getSession(req), req)
 
     return result

indico/MaKaC/webinterface/rh/base.py

@@ -63 +63 @@
 from MaKaC.plugins.base import OldObservable
 
+
 class RequestHandlerBase(OldObservable):
 
@@ -68 +69 @@
     _currentRH = None
 
-    def __init__( self ):
+    def __init__(self, req):
+
+        # attention: not thread-safe
         RequestHandlerBase._currentRH = self
+
+        if req == None:
+            raise Exception("Request object not initialised")
+        self._req = req
 
     def _checkProtection( self ):
@@ -118 +125 @@
         from MaKaC import i18n
         i18n.install('messages', lang, unicode=True)
+
+    def getHostIP(self):
+        import socket
+
+        host = str(self._req.get_remote_host(apache.REMOTE_NOLOOKUP))
+
+        try:
+            hostIP = socket.gethostbyname(host)
+            minfo = info.HelperMaKaCInfo.getMaKaCInfoInstance()
+            if minfo.useProxy():
+                # if we're behind a proxy, use X-Forwarded-For
+                xff = self._req.headers_in.get("X-Forwarded-For",hostIP).split(", ")[-1]
+                return socket.gethostbyname(xff)
+            else:
+                return hostIP
+        except socket.gaierror, e:
+            # in case host resolution fails
+            raise HostnameResolveError("Error resolving host '%s' : %s" % (host, e))
+
+
 
 
@@ -169 +196 @@
                     current rh.
         """
-        RequestHandlerBase.__init__(self)
-        if req == None:
-            raise Exception("Request object not initialised")
-        self._req = req
+        RequestHandlerBase.__init__(self, req)
         self._requestStarted = False
         self._websession = None
@@ -188 +212 @@
 
     # Methods =============================================================
-
-    def getHostIP(self):
-        import socket
-
-        host = str(self._req.get_remote_host(apache.REMOTE_NOLOOKUP))
-
-        try:
-            hostIP = socket.gethostbyname(host)
-            minfo = info.HelperMaKaCInfo.getMaKaCInfoInstance()
-            if minfo.useProxy():
-                # if we're behind a proxy, use X-Forwarded-For
-                xff = self._req.headers_in.get("X-Forwarded-For",hostIP).split(", ")[-1]
-                return socket.gethostbyname(xff)
-            else:
-                return hostIP
-        except socket.gaierror, e:
-            # in case host resolution fails
-            raise HostnameResolveError("Error resolving host '%s' : %s" % (host, e))
-
 
     def getTarget( self ):

indico/web/wsgi/indico_wsgi_handler.py

@@ -285 +285 @@
         self.__errors = environ['wsgi.errors']
         self.__headers_in = table([])
+
         for key, value in environ.iteritems():
             if key.startswith('HTTP_'):
@@ -292 +293 @@
         if environ.get('CONTENT_TYPE'):
             self.__headers_in['content-type'] = environ['CONTENT_TYPE']
+
         ## HTTP headers variables
         ## We might want to add some other fields in the future