abs-auth-rbac-core 0.3.0__py3-none-any.whl → 0.3.2__py3-none-any.whl

abs_auth_rbac_core/auth/middleware.py

@@ -1,13 +1,38 @@
 from fastapi import Depends, Request
 from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials
+from fastapi import HTTPException
 import logging
-from typing import Callable, Any
+from typing import Callable, Any, Optional
 
 from .jwt_functions import JWTFunctions
 from .auth_functions import get_user_by_attribute
-from abs_exception_core.exceptions import UnauthorizedError
+from abs_exception_core.exceptions import UnauthorizedError, AuthError
+from fastapi.security.utils import get_authorization_scheme_param
 
-security = HTTPBearer()
+class CustomHTTPBearer(HTTPBearer):
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+    
+    async def __call__(self, request: Request) -> Optional[HTTPAuthorizationCredentials]:
+        authorization = request.headers.get("Authorization")
+        scheme, credentials = get_authorization_scheme_param(authorization)
+        
+        if not (authorization and scheme and credentials):
+            if self.auto_error:
+                raise UnauthorizedError(detail="Invalid authentication credentials")
+            else:
+                return None
+        
+        if scheme.lower() != "bearer":
+            if self.auto_error:
+                raise UnauthorizedError(detail="Invalid authentication credentials")
+            else:
+                return None
+        
+        return HTTPAuthorizationCredentials(scheme=scheme, credentials=credentials)
+
+security = CustomHTTPBearer()
+# security = HTTPBearer()
 logger = logging.getLogger(__name__)
 
 
@@ -45,7 +70,11 @@ def auth_middleware(
             request.state.user = user
             return user 
 
+        except UnauthorizedError as e:
+            logger.error(e)
+            raise
         except Exception as e:
             logger.error(f"Authentication error: {str(e)}", exc_info=True)
             raise UnauthorizedError(detail="Authentication failed")
+    
     return get_auth

abs_auth_rbac_core/rbac/service.py

@@ -46,6 +46,7 @@ class RBACService:
         self._initialize_casbin(redis_config)
         self.watcher = None
 
+
     def _initialize_casbin(self,redis_config:Optional[RedisWatcherSchema]=None):
         """
         Initiates the casbin policy using the default rules
@@ -69,31 +70,42 @@ class RBACService:
 
             if redis_config:
                 try:
-                    # Create Redis client with proper configuration
                     redis_client = Redis(
                         host=redis_config.host,
                         port=redis_config.port,
                         password=redis_config.password if hasattr(redis_config, 'password') else None,
-                        ssl=redis_config.ssl,
+                        ssl=redis_config.ssl, # This is crucial for azure redis
+                        ssl_cert_reqs=None,  # This is crucial for azure redis (Should be none for azure redis)
+                        ssl_check_hostname=False,
+                        socket_connect_timeout=10, # Only socket_connect_timeout is required for azure redis watcher
                         decode_responses=True,
-                        socket_connect_timeout=5,
-                        socket_timeout=5,
                         retry_on_timeout=True,
-                        health_check_interval=30
-                    )
+                        health_check_interval=30 # Required for open connection
+                        )
+                    
                     
                     # Test Redis connection
                     redis_client.ping()
 
                     # Create Watcher and Options
-                    test_option = WatcherOptions()
-                    test_option.pub_client = redis_client
-                    test_option.sub_client = redis_client
-                    test_option.channel = redis_config.channel
-                    test_option.optional_update_callback = lambda _: self.enforcer.load_policy()
-
-                    # Create watcher
-                    watcher = new_watcher(test_option)
+                    option = WatcherOptions()
+                    option.host = redis_config.host
+                    option.port = redis_config.port
+                    option.password = redis_config.password
+                    option.ssl = redis_config.ssl
+                    option.channel = redis_config.channel
+                    option.optional_update_callback = lambda _: self.enforcer.load_policy()
+
+                    option.init_config()
+
+                    watcher = RedisWatcher()
+
+                    watcher.sub_client = redis_client.pubsub()
+                    watcher.pub_client = redis_client
+                    watcher.init_config(option)
+                    watcher.close = False
+                    watcher.subscribe_thread.start()
+                    watcher.subscribe_event.wait(timeout=10)
 
                     self.enforcer.set_watcher(watcher)
                     self.watcher = watcher

{abs_auth_rbac_core-0.3.0.dist-info → abs_auth_rbac_core-0.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: abs-auth-rbac-core
-Version: 0.3.0
+Version: 0.3.2
 Summary: RBAC and Auth core utilities including JWT token management.
 License: MIT
 Author: AutoBridgeSystems
@@ -12,7 +12,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: abs-exception-core (>=0.2.0,<0.3.0)
-Requires-Dist: abs-utils (>=0.4.0,<0.5.0)
+Requires-Dist: abs-utils (>=0.4.1,<0.5.0)
 Requires-Dist: casbin (>=1.41.0,<2.0.0)
 Requires-Dist: casbin-redis-watcher (>=1.3.0,<2.0.0)
 Requires-Dist: casbin-sqlalchemy-adapter (>=1.4.0,<2.0.0)

{abs_auth_rbac_core-0.3.0.dist-info → abs_auth_rbac_core-0.3.2.dist-info}/RECORD

@@ -2,7 +2,7 @@ abs_auth_rbac_core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 abs_auth_rbac_core/auth/__init__.py,sha256=Pvetd98VD9jsok1F9e82yS9kLZMFqTpbN51hkxZQHzw,67
 abs_auth_rbac_core/auth/auth_functions.py,sha256=fhfKRhtpE_J9MHu2jSsIA-cy77A3wCAQKbGGZeh4pe4,947
 abs_auth_rbac_core/auth/jwt_functions.py,sha256=9vhjWrxXdE8fVQ4FGrPj9y6PoSEsaeFohPhgI-3hToI,4111
-abs_auth_rbac_core/auth/middleware.py,sha256=Hn5EoDE2zEWXHXTgrSFgE85s0ivzFNTxYIqtgLBdtGE,1849
+abs_auth_rbac_core/auth/middleware.py,sha256=sAHhPiSSiS1iqSl8-thsaZXRK4EQLFJ08BKzKPpgmmQ,2965
 abs_auth_rbac_core/models/__init__.py,sha256=9ImboxQ04XxRjd5o1RDBn465BOj3F2pahuVXF15NuqE,292
 abs_auth_rbac_core/models/base_model.py,sha256=AaWObslm8sTetv4H1Ia_gPpi_75uF5z1o7Et9WAvstU,612
 abs_auth_rbac_core/models/gov_casbin_rule.py,sha256=9PpCQWg6TWeBvgjRcC2VxSSFMkNW-B9a4e2LmmDmmiY,1000
@@ -17,11 +17,11 @@ abs_auth_rbac_core/models/user_role.py,sha256=20pqmtJPzlUrI9ulHGouk8XlFgrGG7I6ik
 abs_auth_rbac_core/rbac/__init__.py,sha256=oYjtpmfrkEbwWCBAWuRoU1fM4fCpBxkF_lwQrelK1As,79
 abs_auth_rbac_core/rbac/decorator.py,sha256=pEFAW0Nn2iE4KBctPhNOmO_VLeJFDX2V9v2LsCu6kHY,1824
 abs_auth_rbac_core/rbac/policy.conf,sha256=wghhhKxgZH0rPhh1QFrIpq9nevJT3s7OxxvXiU3zzuI,305
-abs_auth_rbac_core/rbac/service.py,sha256=zzHvbROqUpgKSLghJ7bDnxDHWkF1tyMG9XObxu0KwoY,37837
+abs_auth_rbac_core/rbac/service.py,sha256=A0Mg6HFUKzRo2pksOJGu-t_QztaB20ZECc5FfIQ8IDU,38447
 abs_auth_rbac_core/schema/__init__.py,sha256=v9xibJ8Wr9k0u6PEYNK0LCGUJD71SB5vxu9BZG0S7tM,46
 abs_auth_rbac_core/schema/permission.py,sha256=XvxPU68FY0PFgkF4GR2bSrzNvFB8c8OgY_d0JOJvMc8,203
 abs_auth_rbac_core/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 abs_auth_rbac_core/util/permission_constants.py,sha256=EHM4ZkQmMWR-AyoSEf-pJL-EC_eZ4Q_JEp9w62GknHY,102747
-abs_auth_rbac_core-0.3.0.dist-info/METADATA,sha256=8hbrSyJFuTUWiJL9DwYRKAeCdoG27jbXKpGTaBaDFtg,23591
-abs_auth_rbac_core-0.3.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-abs_auth_rbac_core-0.3.0.dist-info/RECORD,,
+abs_auth_rbac_core-0.3.2.dist-info/METADATA,sha256=7q_MiRXEV0O829MFDvvqk0GMpa8ym0nvdGPASQ1_8Ys,23591
+abs_auth_rbac_core-0.3.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+abs_auth_rbac_core-0.3.2.dist-info/RECORD,,