abs-auth-rbac-core 0.1.14__tar.gz → 0.1.16__tar.gz

{abs_auth_rbac_core-0.1.14 → abs_auth_rbac_core-0.1.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: abs-auth-rbac-core
-Version: 0.1.14
+Version: 0.1.16
 Summary: RBAC and Auth core utilities including JWT token management.
 License: MIT
 Author: AutoBridgeSystems
@@ -11,6 +11,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: abs-exception-core (>=0.1.0,<0.2.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)
 Requires-Dist: fastapi[standard] (>=0.115.12,<0.116.0)
 Requires-Dist: passlib (>=1.7.4,<2.0.0)

{abs_auth_rbac_core-0.1.14 → abs_auth_rbac_core-0.1.16}/abs_auth_rbac_core/rbac/service.py

@@ -1,7 +1,9 @@
 from typing import List, Optional, Callable,Any,Tuple
 import os
+from pydantic import BaseModel
 import casbin
 from casbin_sqlalchemy_adapter import Adapter
+from casbin_redis_watcher import RedisWatcher, WatcherOptions,new_watcher
 from sqlalchemy import and_, select
 from sqlalchemy.orm import Session, joinedload
 from ..schema import CreatePermissionSchema
@@ -13,7 +15,9 @@ from ..models import (
     Permission,
     UserPermission
 )
+from abs_utils.logger import setup_logger
 
+logger = setup_logger(__name__)
 from abs_exception_core.exceptions import (
     DuplicatedError,
     NotFoundError,
@@ -21,9 +25,17 @@ from abs_exception_core.exceptions import (
 )
 
 from ..models.gov_casbin_rule import GovCasbinRule
+from redis import Redis
+
+class RedisWatcherSchema(BaseModel):
+    host: str
+    port: int
+    channel: str
+    ssl: Optional[bool] = False
+    password: Optional[str] = None
 
 class RBACService:
-    def __init__(self, session: Callable[...,Session]):
+    def __init__(self, session: Callable[...,Session],redis_config:Optional[RedisWatcherSchema]=None):
         """
         Service For Managing the RBAC
         Args:
@@ -31,9 +43,10 @@ class RBACService:
         """
         self.db = session
         self.enforcer = None
-        self._initialize_casbin()
+        self._initialize_casbin(redis_config)
+        self.watcher = None
 
-    def _initialize_casbin(self):
+    def _initialize_casbin(self,redis_config:Optional[RedisWatcherSchema]=None):
         """
         Initiates the casbin policy using the default rules
         """
@@ -54,6 +67,44 @@ class RBACService:
             # Load policies
             self.enforcer.load_policy()
 
+            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,
+                        decode_responses=True,
+                        socket_connect_timeout=5,
+                        socket_timeout=5,
+                        retry_on_timeout=True,
+                        health_check_interval=30
+                    )
+                    
+                    # 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)
+
+                    self.enforcer.set_watcher(watcher)
+                    self.watcher = watcher
+                    self.enforcer.save_policy()
+                    
+                except Exception as e:
+                    logger.error(f"Failed to initialize Redis watcher: {e}")
+                    self.watcher = None
+            else:
+                logger.info("Redis watcher not configured - Casbin will work without real-time policy updates")
+
     def add_policy(self,role:str,resource:str,action:str,module:str):
         """
         Add a policy to the casbin enforcer
@@ -104,13 +155,14 @@ class RBACService:
         """
         with self.db() as session:
             try:
-                if hasattr(permissions[0], "model_dump"):
-                    permission_objs = [Permission(**permission.model_dump()) for permission in permissions]
+                if hasattr(permissions,'model_dump'):
+                    add_permissions = [Permission(**permission.model_dump()) for permission in permissions]
                 else:
-                    permission_objs = [Permission(**permission) for permission in permissions]
-                session.bulk_save_objects(permission_objs)
+                    add_permissions = [Permission(**permission) for permission in permissions]
+
+                session.bulk_save_objects(add_permissions)
                 session.commit()
-                return permission_objs
+                return add_permissions
             except Exception as e:
                 raise e
             
@@ -161,7 +213,7 @@ class RBACService:
                 self.revoke_user_permissions(user_uuid,list(remove_permissions))
             if add_permissions:
                 self.attach_permissions_to_user(user_uuid,list(add_permissions))
-            return True
+            return self.get_user_permissions(user_uuid)
 
     def attach_permissions_to_user(self, user_uuid: str, permission_uuids: List[str]):
         with self.db() as session:
@@ -181,7 +233,7 @@ class RBACService:
             if added_policies:
                 self.enforcer.save_policy()
                 self.enforcer.load_policy()
-            return user_permissions
+            return self.get_user_permissions(user_uuid)
 
 
     def revoke_user_permissions(self, user_uuid: str, permission_uuids: List[str]):
@@ -852,3 +904,55 @@ class RBACService:
         else:
             with self.db() as session:
                 return query_role(session)
+
+    def is_watcher_active(self) -> bool:
+        """Check if Redis watcher is active and connected"""
+        return self.watcher is not None and hasattr(self.watcher, 'pub_client') and self.watcher.pub_client is not None
+
+    def get_watcher_status(self) -> dict:
+        """Get detailed watcher status information"""
+        if not self.is_watcher_active():
+            return {
+                "active": False,
+                "message": "Watcher not initialized or not active"
+            }
+        
+        try:
+            # Test Redis connection
+            self.watcher.pub_client.ping()
+            return {
+                "active": True,
+                "host": self.watcher.pub_client.connection_pool.connection_kwargs.get('host'),
+                "port": self.watcher.pub_client.connection_pool.connection_kwargs.get('port'),
+                "channel": getattr(self.watcher, 'channel', 'unknown'),
+                "connected": True
+            }
+        except Exception as e:
+            return {
+                "active": False,
+                "error": str(e),
+                "message": "Watcher exists but Redis connection failed"
+            }
+
+    def reload_policies(self) -> bool:
+        """Manually reload policies from database"""
+        try:
+            self.enforcer.load_policy()
+            return True
+        except Exception as e:
+            print(f"Failed to reload policies: {e}")
+            return False
+
+    def get_policy_count(self) -> int:
+        """Get the total number of policies in the enforcer"""
+        return len(self.enforcer.get_policy())
+
+    def clear_all_policies(self) -> bool:
+        """Clear all policies from the enforcer (use with caution)"""
+        try:
+            self.enforcer.clear_policy()
+            self.enforcer.save_policy()
+            return True
+        except Exception as e:
+            print(f"Failed to clear policies: {e}")
+            return False

{abs_auth_rbac_core-0.1.14 → abs_auth_rbac_core-0.1.16}/pyproject.toml

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