sharedkernel 2.6.2__tar.gz → 2.6.4__tar.gz

{sharedkernel-2.6.2 → sharedkernel-2.6.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sharedkernel
-Version: 2.6.2
+Version: 2.6.4
 Summary: sharekernel is a shared package between all python projects
 Author: Smilinno
 Description-Content-Type: text/markdown
@@ -31,6 +31,10 @@ Dynamic: summary
 this is a shared kernel package
 
 # Change Log
+### Version 2.6.4
+- Add Verbose to log
+### Version 2.6.3
+- fix bug ip-header-name
 ### Version 2.6.2
 - Add Verbose
 ### Version 2.6.1

{sharedkernel-2.6.2 → sharedkernel-2.6.4}/README.md

@@ -2,6 +2,10 @@
 this is a shared kernel package
 
 # Change Log
+### Version 2.6.4
+- Add Verbose to log
+### Version 2.6.3
+- fix bug ip-header-name
 ### Version 2.6.2
 - Add Verbose
 ### Version 2.6.1

{sharedkernel-2.6.2 → sharedkernel-2.6.4}/setup.py

@@ -40,7 +40,7 @@ setup(
         "redis",
     ],
     # *strongly* suggested for sharing
-    version="2.6.2",
+    version="2.6.4",
     description="sharekernel is a shared package between all python projects",
     long_description=long_description,
     long_description_content_type="text/markdown",

{sharedkernel-2.6.2 → sharedkernel-2.6.4}/sharedkernel/config.py

@@ -1,6 +1,7 @@
 import os
 
-VERBOSE = True if os.getenv("VERBOSE", "False").lower() == "true" else False
+IP_SESSION_VERBOSE = True if os.getenv("IP_SESSION_VERBOSE", "False").lower() == "true" else False
+LOG_VERBOSE = True if os.getenv("LOG_VERBOSE", "False").lower() == "true" else False
 
 # Log *******************************************************************************
 LOG_ENABLE = True if os.getenv("LOG_ENABLE", "False").lower() == "true" else False

{sharedkernel-2.6.2 → sharedkernel-2.6.4}/sharedkernel/ip_session_service.py

@@ -60,93 +60,107 @@ class IPSessionAuth:
         except (ValueError, TypeError, json.JSONDecodeError):
             raise BusinessException(ErrorCode.Internal_Server)
 
+    def _get_ip_from_request(self, request: dict, ip_header_name: str) -> str:
+        ip_address = request.headers.get(ip_header_name)
+
+        if not ip_address:
+            return None
+
+        if ip_header_name.lower() == "x-forwarded-for":
+            ip_address = ip_address.split(",")[0]
+        
+        return ip_address
+
+            
+
     
     @unified_logger()
     def ip_session_auth(self, request: Request):
 
         if not config.IP_SESSION_AUTH_ENABLE:
-            if config.VERBOSE:
+            if config.IP_SESSION_VERBOSE:
                 print("IP_SESSION_AUTH | OK | IP Session Auth is disabled")
             return
 
-        if config.VERBOSE:
-            print("IP_SESSION_AUTH | INFO | Request Headers: ", request.headers)
+        if config.IP_SESSION_VERBOSE:
+            print("="*70)
+            print("IP_SESSION_AUTH | INFO | Request Headers:\n", request.headers)
 
         api_key = request.headers.get(config.APIKEY_HEADER_NAME)
 
         if api_key:
-            if config.VERBOSE:
+            if config.IP_SESSION_VERBOSE:
                 print("IP_SESSION_AUTH | OK | API Key is provided")
             return
 
         state = getattr(request.state, "decoded_token", None)
-        if config.VERBOSE:
+        if config.IP_SESSION_VERBOSE:
             print("IP_SESSION_AUTH | INFO | State: ", state)
 
         if not state:
-            if config.VERBOSE:
+            if config.IP_SESSION_VERBOSE:
                 print("IP_SESSION_AUTH | ERROR | No state found")
             raise UnAuthorizedException()
 
         nameid = state.get("nameid")
         sessionid = state.get("sessionId")
-        if config.VERBOSE:
+        if config.IP_SESSION_VERBOSE:
             print("IP_SESSION_AUTH | INFO | Nameid: ", nameid)
             print("IP_SESSION_AUTH | INFO | Sessionid: ", sessionid)
 
         if not nameid or not sessionid:
-            if config.VERBOSE:
+            if config.IP_SESSION_VERBOSE:
                 print("IP_SESSION_AUTH | ERROR | No nameid or sessionid found")
             raise UnAuthorizedException()
 
-        request_ip = request.headers.get(config.IP_HEADER_NAME)
+        request_ip = self._get_ip_from_request(request, config.IP_HEADER_NAME)
 
         if not request_ip:
-            if config.VERBOSE:
+            if config.IP_SESSION_VERBOSE:
                 print("IP_SESSION_AUTH | ERROR | No request ip found")
             raise UnAuthorizedException()
 
         request_ip = request_ip.strip()
-        if config.VERBOSE:
+        if config.IP_SESSION_VERBOSE:
             print("IP_SESSION_AUTH | INFO | Request ip: ", request_ip)
 
         if self._is_ip_allowed(request_ip):
-            if config.VERBOSE:
+            if config.IP_SESSION_VERBOSE:
                 print("IP_SESSION_AUTH | OK | IP is in whitelist")
             return
 
         redis_key = f"userId:{nameid}:session:{sessionid}"
         user_data = self.redis.get(redis_key)
-        if config.VERBOSE:
+        if config.IP_SESSION_VERBOSE:
             print("IP_SESSION_AUTH | INFO | User data: ", user_data)
 
         if not user_data:
-            if config.VERBOSE:
+            if config.IP_SESSION_VERBOSE:
                 print("IP_SESSION_AUTH | ERROR | No user data found")
             raise UnAuthorizedException()
 
         try:
             payload = json.loads(user_data.decode())
         except (ValueError, UnicodeDecodeError, TypeError):
-            if config.VERBOSE:
+            if config.IP_SESSION_VERBOSE:
                 print("IP_SESSION_AUTH | ERROR | Error decoding user data")
             raise UnAuthorizedException()
 
         stored_ip = payload.get("Ip")
-        if config.VERBOSE:
+        if config.IP_SESSION_VERBOSE:
             print("IP_SESSION_AUTH | INFO | Stored ip: ", stored_ip)
             
         if not stored_ip:
-            if config.VERBOSE:
+            if config.IP_SESSION_VERBOSE:
                 print("IP_SESSION_AUTH | ERROR | No stored ip found")
             raise UnAuthorizedException()
 
         if stored_ip.strip() != request_ip:
-            if config.VERBOSE:
+            if config.IP_SESSION_VERBOSE:
                 print("IP_SESSION_AUTH | ERROR | Stored ip does not match request ip")
             raise UnAuthorizedException()
 
         lifetime_minutes = self._get_lifetime()
         self.redis.expire(redis_key, lifetime_minutes * 60)
-        if config.VERBOSE:
+        if config.IP_SESSION_VERBOSE:
             print("IP_SESSION_AUTH | OK | IP session auth successful")

{sharedkernel-2.6.2 → sharedkernel-2.6.4}/sharedkernel/logger/logger_service.py

@@ -92,8 +92,9 @@ class LoggerService:
 
 
     def emit(self, log: LogDTO):
-        # if config.VERBOSE:
-        #     print("LOGGER | INFO | Emitting log:\n", log)
+        if config.LOG_VERBOSE:
+            print("="*70)
+            print("LOGGER | INFO | Emitting log:\n", log)
         self.publish(log)
 
 

{sharedkernel-2.6.2 → sharedkernel-2.6.4}/sharedkernel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sharedkernel
-Version: 2.6.2
+Version: 2.6.4
 Summary: sharekernel is a shared package between all python projects
 Author: Smilinno
 Description-Content-Type: text/markdown
@@ -31,6 +31,10 @@ Dynamic: summary
 this is a shared kernel package
 
 # Change Log
+### Version 2.6.4
+- Add Verbose to log
+### Version 2.6.3
+- fix bug ip-header-name
 ### Version 2.6.2
 - Add Verbose
 ### Version 2.6.1