Changeset 8675

Timestamp:

07/11/12 10:16:21 (8 years ago)

Author:

mnagni

Message:

Improved the hostname/IP retrivial feature

Location:

mauRepo/dj_security_middleware/trunk/dj_security_middleware/dj_security_middleware

Files:

• __init__.py (modified) (1 diff)
• middleware.py (modified) (3 diffs)

mauRepo/dj_security_middleware/trunk/dj_security_middleware/dj_security_middleware/__init__.py

@@ -1 @@
-__version__ = '0.0.2'
+__version__ = '0.0.3'

mauRepo/dj_security_middleware/trunk/dj_security_middleware/dj_security_middleware/middleware.py

@@ -40 +40 @@
 from django.utils.http import urlencode
 
+import logging
+
+# Get an instance of a logger
+logger = logging.getLogger(__name__)
+
 LOGIN_SERVICE_ERROR = 'No LOGIN_SETTING parameter is defined in the \
 application settings.py file. Please define a proper URL to the \
@@ -68 +73 @@
         if not settings.DJ_SECURITY_SHAREDSECRET:
             raise DJMiddlewareException(DJ_SECURITY_SHAREDSECRET_ERROR)        
-        if not settings.DJ_MIDDLEWARE_IP:
-            raise DJMiddlewareException(DJ_MIDDLEWARE_IP_ERROR)        
+        #if not settings.DJ_MIDDLEWARE_IP:
+        #    raise DJMiddlewareException(DJ_MIDDLEWARE_IP_ERROR)        
          
         try:
             timestamp, userid, tokens, user_data = _is_authenticated(request)
-        except MissingCookieException:             
+        except (MissingCookieException, DJMiddlewareException):             
             url = '%s?%s' % (settings.DJ_SECURITY_LOGIN_SERVICE, _build_ret_url(request))
             return HttpResponseRedirect(url)        
@@ -113 +118 @@
     
 def _get_host_ip():
-    if settings.DJ_MIDDLEWARE_IP:
+    if getattr(settings, 'DJ_MIDDLEWARE_IP', None):
         return settings.DJ_MIDDLEWARE_IP
         
+    import urlparse
     import socket
-    ret = 'localhost'
-    try:
-        hostname = socket.gethostname()
-        ret = socket.gethostbyname_ex(hostname)[2][0]
-    except Exception:
-        pass    
-    return ret    
+    remote_urls = socket.getaddrinfo(socket.gethostname(), None)
+    for remote_url in remote_urls:
+        ret = remote_url[4][0]
+        if not ret.startswith('127'):
+            logger.debug("remote_url: %s" % (ret))
+            return ret