abs-auth-rbac-core 0.3.0__tar.gz → 0.3.2__tar.gz

{abs_auth_rbac_core-0.3.0 → abs_auth_rbac_core-0.3.2}/PKG-INFO

@@ -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 → abs_auth_rbac_core-0.3.2}/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-0.3.0 → abs_auth_rbac_core-0.3.2}/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 → abs_auth_rbac_core-0.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "abs-auth-rbac-core"
-version = "0.3.0"
+version = "0.3.2"
 description = "RBAC and Auth core utilities including JWT token management."
 authors = [
     {name = "AutoBridgeSystems", email = "info@autobridgesystems.com"}
@@ -18,7 +18,7 @@ dependencies = [
     "casbin-sqlalchemy-adapter (>=1.4.0,<2.0.0)",
     "psycopg2-binary (>=2.9.10,<3.0.0)",
     "casbin-redis-watcher (>=1.3.0,<2.0.0)",
-    "abs-utils (>=0.4.0,<0.5.0)"
+    "abs-utils (>=0.4.1,<0.5.0)"
 ]
 
 [build-system]