sharedkernel 2.5.9__py3-none-any.whl → 2.6.2__py3-none-any.whl

sharedkernel/config.py

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

sharedkernel/ip_session_service.py

@@ -65,50 +65,88 @@ class IPSessionAuth:
     def ip_session_auth(self, request: Request):
 
         if not config.IP_SESSION_AUTH_ENABLE:
+            if config.VERBOSE:
+                print("IP_SESSION_AUTH | OK | IP Session Auth is disabled")
             return
 
+        if config.VERBOSE:
+            print("IP_SESSION_AUTH | INFO | Request Headers: ", request.headers)
+
         api_key = request.headers.get(config.APIKEY_HEADER_NAME)
 
         if api_key:
+            if config.VERBOSE:
+                print("IP_SESSION_AUTH | OK | API Key is provided")
             return
 
         state = getattr(request.state, "decoded_token", None)
+        if config.VERBOSE:
+            print("IP_SESSION_AUTH | INFO | State: ", state)
+
         if not state:
+            if config.VERBOSE:
+                print("IP_SESSION_AUTH | ERROR | No state found")
             raise UnAuthorizedException()
 
         nameid = state.get("nameid")
         sessionid = state.get("sessionId")
+        if config.VERBOSE:
+            print("IP_SESSION_AUTH | INFO | Nameid: ", nameid)
+            print("IP_SESSION_AUTH | INFO | Sessionid: ", sessionid)
 
         if not nameid or not sessionid:
+            if config.VERBOSE:
+                print("IP_SESSION_AUTH | ERROR | No nameid or sessionid found")
             raise UnAuthorizedException()
 
         request_ip = request.headers.get(config.IP_HEADER_NAME)
+
         if not request_ip:
+            if config.VERBOSE:
+                print("IP_SESSION_AUTH | ERROR | No request ip found")
             raise UnAuthorizedException()
 
         request_ip = request_ip.strip()
+        if config.VERBOSE:
+            print("IP_SESSION_AUTH | INFO | Request ip: ", request_ip)
 
         if self._is_ip_allowed(request_ip):
+            if config.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:
+            print("IP_SESSION_AUTH | INFO | User data: ", user_data)
 
         if not user_data:
+            if config.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:
+                print("IP_SESSION_AUTH | ERROR | Error decoding user data")
             raise UnAuthorizedException()
 
         stored_ip = payload.get("Ip")
-
+        if config.VERBOSE:
+            print("IP_SESSION_AUTH | INFO | Stored ip: ", stored_ip)
+            
         if not stored_ip:
+            if config.VERBOSE:
+                print("IP_SESSION_AUTH | ERROR | No stored ip found")
             raise UnAuthorizedException()
 
         if stored_ip.strip() != request_ip:
+            if config.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)
+        self.redis.expire(redis_key, lifetime_minutes * 60)
+        if config.VERBOSE:
+            print("IP_SESSION_AUTH | OK | IP session auth successful")

sharedkernel/jwt_service.py

@@ -18,12 +18,17 @@ class JWTBearer(HTTPBearer):
     async def __call__(self, request: Request):
         try:
             if current_user_info.get(None):
-                return 
-            
-            credentials: HTTPAuthorizationCredentials = await super(
-                JWTBearer, self
-            ).__call__(request)
-            decoded_token = self.verify(credentials.credentials)
+                return
+
+            token = request.cookies.get("token")
+            if not token:
+                credentials: HTTPAuthorizationCredentials = await super(
+                    JWTBearer, self
+                ).__call__(request)
+
+                token = credentials.credentials
+
+            decoded_token = self.verify(token=token)
             request.state.decoded_token = decoded_token
 
             nameid = decoded_token.get("nameid") or decoded_token.get("id")

sharedkernel/logger/logger_service.py

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

{sharedkernel-2.5.9.dist-info → sharedkernel-2.6.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sharedkernel
-Version: 2.5.9
+Version: 2.6.2
 Summary: sharekernel is a shared package between all python projects
 Author: Smilinno
 Description-Content-Type: text/markdown
@@ -21,7 +21,6 @@ Requires-Dist: beautifulsoup4
 Requires-Dist: deepdiff
 Requires-Dist: kombu
 Requires-Dist: redis
-Requires-Dist: pymongo
 Dynamic: author
 Dynamic: description
 Dynamic: description-content-type
@@ -32,6 +31,12 @@ Dynamic: summary
 this is a shared kernel package
 
 # Change Log
+### Version 2.6.2
+- Add Verbose
+### Version 2.6.1
+- hotfix namings
+### Version 2.6.0
+- add cookie validation to jwt service
 ### Version 2.5.9
 - Fix bug
 ### Version 2.5.8

{sharedkernel-2.5.9.dist-info → sharedkernel-2.6.2.dist-info}/RECORD

@@ -1,11 +1,11 @@
 sharedkernel/common.py,sha256=HL5vsuJBaIeBcoXA8Hbe6jnYAv4danIszo5Y7G2gGDA,622
-sharedkernel/config.py,sha256=ynpH3zmpWa8fPjcjqJ25dpc6Ohp3yzHKsKzST1ilH0w,1808
+sharedkernel/config.py,sha256=kiRDUipAHTWI-F0IN3NghgU6GlM9MNVybApNonm8wWo,1888
 sharedkernel/data_format_converter.py,sha256=GWGbfhKJBifkz-cfnqKAFjJM43WC0qdq9KSELj3xR30,3774
 sharedkernel/date_converter.py,sha256=Cjd4ewm0pIfQzv7nlgAAB_EYrr-VvXxQGehJCNphgXc,4491
 sharedkernel/diff_utils.py,sha256=mtwJmc05GAXUOB0ZLtqAhfBT1kGoSQ7qmP5N44P73ho,2564
 sharedkernel/file_validation.py,sha256=X-vdUy1Se2li3f-_Ro5UJi_Muqz-QmkKu6b5eHs-eiA,2892
-sharedkernel/ip_session_service.py,sha256=omdMSfuu7LVKZlujZnWoPBgebNhrSl2_gsoiV2VpEfU,3387
-sharedkernel/jwt_service.py,sha256=xjHPhxk63ajGZmIfBgjgB_M-bt2SamSYwBGgS9DvQNg,1760
+sharedkernel/ip_session_service.py,sha256=Oru8qUhdHeAgaRkLoCrsWO-_TP17PQ2yMDn8x8cHEaA,5224
+sharedkernel/jwt_service.py,sha256=QNkGLn1ZzU5gBD0Cjyadtqu_zHnS3_A2y-CDZSrc4Q8,1872
 sharedkernel/multipart_upload.py,sha256=JVlCBlznB9dWh2_spjAqzLOqQT1CHUTvrR4m7ug8qaM,1877
 sharedkernel/regex_masking.py,sha256=zQrgteP8Cuq1EC9B7QUJqAXUxK9ISD9kWMYK2AbRfw0,3288
 sharedkernel/s3_uploader.py,sha256=VWgN-RVHmLXMDuxgZux3M-iFwWk5zhRnUIECKS0auW4,3637
@@ -29,7 +29,7 @@ sharedkernel/logger/log_dto.py,sha256=GN0nfZMTMJN4hXM47M_Wkkr1Fgm4kVgWfgQWNZfuUe
 sharedkernel/logger/log_enums.py,sha256=b6RCy6oLx-uUQANQVoEq3yxMld0m4Gtq5pTDos78vL8,209
 sharedkernel/logger/log_info.py,sha256=bGv8QBTNB-4EfJf-cYuuAU2c_d1PNt_7R15vc3y-fJk,141
 sharedkernel/logger/log_middlewares.py,sha256=fjqti-K1u5dJkrbU02jTtRK__N7vEUot5N5DbAUZ-XY,1014
-sharedkernel/logger/logger_service.py,sha256=6dMPWEvLa4poEO7ZJo00e88hsEpDEvkj5E0u6iiQOUU,6490
+sharedkernel/logger/logger_service.py,sha256=KXvA3ql7s_uyY7QHs-CtGqodIrMplPVYV1RcHcFe9k8,6581
 sharedkernel/normalizer/__init__.py,sha256=cDmbquAW6o7rnvv3XkI7h5vMYp-3NmGN6zp1ryYOUcc,154
 sharedkernel/normalizer/number_normalizer.py,sha256=zJ700T0t9P7hgxp7vox98LdPw9A4jsUjIHA_II9YmqU,286
 sharedkernel/normalizer/phone_number_normalizer.py,sha256=8z-JGWvH45GiOkceMz9jZ4gLoW9X120I1JSzCAGWcvU,19268
@@ -40,7 +40,7 @@ sharedkernel/objects/json_string_model.py,sha256=j63tnoqiok0EmBP6T-ChYuQYKPw7mLq
 sharedkernel/objects/jwt_model.py,sha256=XQHQhTbg7PT8XiUh5fd9MwRH4ldPsesI_hfbjaSqdKg,134
 sharedkernel/objects/result.py,sha256=I_9hX5TPEO1oStzuFLjFh1rtimXorz7ml-OaW_2BMvc,680
 sharedkernel/objects/user_info.py,sha256=51WyspRxlIWzK7Lfxgqg4D6mylXeHe9ZSenf-RhYTdA,286
-sharedkernel-2.5.9.dist-info/METADATA,sha256=QdwvZft8H4u2FyXHgWBWWPXAewuqYjMyg36DopagDY8,3851
-sharedkernel-2.5.9.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-sharedkernel-2.5.9.dist-info/top_level.txt,sha256=TVTOnV1MItSSlpSjqkiijuHkoVsGHS4CArpsM-lylkE,13
-sharedkernel-2.5.9.dist-info/RECORD,,
+sharedkernel-2.6.2.dist-info/METADATA,sha256=FPMlxY5-ML4oob4T7-238cIRQoU37Ca1uHUbFo2NPjk,3952
+sharedkernel-2.6.2.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+sharedkernel-2.6.2.dist-info/top_level.txt,sha256=TVTOnV1MItSSlpSjqkiijuHkoVsGHS4CArpsM-lylkE,13
+sharedkernel-2.6.2.dist-info/RECORD,,