skyplatform-iam 1.0.0__tar.gz → 1.0.1__tar.gz

{skyplatform_iam-1.0.0 → skyplatform_iam-1.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skyplatform-iam
-Version: 1.0.0
+Version: 1.0.1
 Summary: SkyPlatform IAM认证SDK，提供FastAPI中间件和认证路由
 Project-URL: Homepage, https://github.com/xinmayoujiang12621/agenterra_iam
 Project-URL: Documentation, https://skyplatform-iam.readthedocs.io/
@@ -24,7 +24,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Internet :: WWW/HTTP :: HTTP Servers
 Classifier: Topic :: Security
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Requires-Dist: fastapi>=0.68.0
 Requires-Dist: pydantic>=1.8.0
 Requires-Dist: python-dotenv>=0.19.0

{skyplatform_iam-1.0.0 → skyplatform_iam-1.0.1}/pyproject.toml

@@ -4,13 +4,13 @@ build-backend = "hatchling.build"
 
 [project]
 name = "skyplatform-iam"
-version = "1.0.0"
+version = "1.0.1"
 authors = [
   { name="x9", email="xuanxienanxunmobao@gmail.com" },
 ]
 description = "SkyPlatform IAM认证SDK，提供FastAPI中间件和认证路由"
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 license = { text = "MIT" }
 keywords = ["fastapi", "authentication", "middleware", "iam", "skyplatform"]
 classifiers = [

{skyplatform_iam-1.0.0 → skyplatform_iam-1.0.1}/skyplatform_iam/__init__.py

@@ -6,6 +6,7 @@ SkyPlatform IAM SDK
 from .config import AuthConfig
 from .middleware import AuthMiddleware
 from .connect_agenterra_iam import ConnectAgenterraIam
+from .auth_middleware import setup_auth_middleware
 from .exceptions import (
     SkyPlatformAuthException,
     AuthenticationError,
@@ -28,6 +29,7 @@ __all__ = [
     
     # 中间件
     "AuthMiddleware",
+    "setup_auth_middleware",
     
     # 客户端
     "ConnectAgenterraIam",

{skyplatform_iam-1.0.0 → skyplatform_iam-1.0.1}/skyplatform_iam/auth_middleware.py

@@ -4,20 +4,36 @@ from typing import Optional, Dict
 import jwt
 
 from .connect_agenterra_iam import ConnectAgenterraIam
+from .config import AuthConfig
 import logging
 
 logger = logging.getLogger(__name__)
 
 
 class AuthMiddleware:
-    def __init__(self):
+    def __init__(self, auth_config: Optional[AuthConfig] = None):
         self.security = HTTPBearer(auto_error=False)
         self.iam_client = ConnectAgenterraIam()
+        self.auth_config = auth_config
+
+    def is_path_whitelisted(self, path: str) -> bool:
+        """
+        检查路径是否在白名单中
+        """
+        if not self.auth_config:
+            return False
+        return self.auth_config.is_path_whitelisted(path)
 
     async def verify_token(self, request: Request):
         # 通过token, server_ak, server_sk判断是否有权限
-        credentials: HTTPAuthorizationCredentials = await self.security(request)
         api_path = request.url.path
+        
+        # 首先检查路径是否在白名单中
+        if self.is_path_whitelisted(api_path):
+            logger.info(f"路径 {api_path} 在白名单中，跳过IAM鉴权")
+            return True
+        
+        credentials: HTTPAuthorizationCredentials = await self.security(request)
         method = request.method
 
         server_ak = request.headers.get("SERVER-AK", "")
@@ -162,6 +178,18 @@ class AuthMiddleware:
 auth_middleware = AuthMiddleware()
 
 
+def setup_auth_middleware(auth_config: AuthConfig) -> None:
+    """
+    设置认证中间件配置
+    
+    Args:
+        auth_config: 认证配置实例，包含白名单路径等配置
+    """
+    global auth_middleware
+    auth_middleware = AuthMiddleware(auth_config)
+    logger.info(f"认证中间件已配置，白名单路径数量: {len(auth_config.get_whitelist_paths())}")
+
+
 # 便捷的依赖函数
 async def get_current_user(request: Request) -> Dict:
     """获取当前用户的依赖函数"""

skyplatform_iam-1.0.1/skyplatform_iam/config.py

@@ -0,0 +1,132 @@
+"""
+SkyPlatform IAM SDK 配置模块
+"""
+import os
+import fnmatch
+from typing import Optional, List
+from pydantic import BaseModel, Field
+from dotenv import load_dotenv
+
+# 加载环境变量
+load_dotenv()
+
+
+class AuthConfig(BaseModel):
+    """
+    认证配置类
+    支持环境变量和代码配置
+    """
+    # IAM服务配置
+    agenterra_iam_host: str
+    server_name: str
+    access_key: str
+
+    # Token配置
+    token_header: str = "Authorization"
+    token_prefix: str = "Bearer "
+
+    # 错误处理配置
+    enable_debug: bool = False
+
+    # 白名单路径配置（实例变量）
+    whitelist_paths: List[str] = Field(default_factory=list)
+
+    class Config:
+        env_prefix = "AGENTERRA_"
+
+    @classmethod
+    def from_env(cls) -> "AuthConfig":
+        """
+        从环境变量创建配置
+        """
+        return cls(
+            agenterra_iam_host=os.environ.get('AGENTERRA_IAM_HOST', ''),
+            server_name=os.environ.get('AGENTERRA_SERVER_NAME', ''),
+            access_key=os.environ.get('AGENTERRA_ACCESS_KEY', ''),
+            enable_debug=os.environ.get('AGENTERRA_ENABLE_DEBUG', 'false').lower() == 'true',
+            whitelist_paths=[]  # 初始化空的白名单路径列表
+        )
+
+    def validate_config(self) -> bool:
+        """
+        验证配置是否完整
+        """
+        required_fields = ['agenterra_iam_host', 'server_name', 'access_key']
+        for field in required_fields:
+            if not getattr(self, field):
+                raise ValueError(f"配置项 {field} 不能为空")
+        return True
+
+    def _normalize_path(self, path: str) -> str:
+        """
+        标准化路径格式
+        """
+        if not path:
+            return path
+        
+        # 确保路径以 / 开头
+        if not path.startswith('/'):
+            path = '/' + path
+        
+        # 移除重复的斜杠
+        while '//' in path:
+            path = path.replace('//', '/')
+        
+        return path
+
+    def add_whitelist_path(self, path: str) -> None:
+        """
+        添加白名单路径
+        """
+        if not path:
+            return
+        
+        normalized_path = self._normalize_path(path)
+        if normalized_path not in self.whitelist_paths:
+            self.whitelist_paths.append(normalized_path)
+
+    def add_whitelist_paths(self, paths: List[str]) -> None:
+        """
+        批量添加白名单路径
+        """
+        for path in paths:
+            self.add_whitelist_path(path)
+
+    def remove_whitelist_path(self, path: str) -> None:
+        """
+        移除白名单路径
+        """
+        if not path:
+            return
+        
+        normalized_path = self._normalize_path(path)
+        if normalized_path in self.whitelist_paths:
+            self.whitelist_paths.remove(normalized_path)
+
+    def clear_whitelist_paths(self) -> None:
+        """
+        清空所有白名单路径
+        """
+        self.whitelist_paths.clear()
+
+    def get_whitelist_paths(self) -> List[str]:
+        """
+        获取所有白名单路径
+        """
+        return self.whitelist_paths.copy()
+
+    def is_path_whitelisted(self, path: str) -> bool:
+        """
+        检查路径是否在白名单中（支持通配符匹配）
+        """
+        if not path:
+            return False
+        
+        normalized_path = self._normalize_path(path)
+        
+        for whitelist_path in self.whitelist_paths:
+            # 支持通配符匹配
+            if fnmatch.fnmatch(normalized_path, whitelist_path):
+                return True
+        
+        return False

skyplatform_iam-1.0.0/skyplatform_iam/config.py

@@ -1,68 +0,0 @@
-"""
-SkyPlatform IAM SDK 配置模块
-"""
-import os
-from typing import Optional, List
-from pydantic import BaseModel
-from dotenv import load_dotenv
-
-# 加载环境变量
-load_dotenv()
-
-
-class AuthConfig(BaseModel):
-    """
-    认证配置类
-    支持环境变量和代码配置
-    """
-    # IAM服务配置
-    agenterra_iam_host: str
-    server_name: str
-    access_key: str
-
-    
-    # Token配置
-    token_header: str = "Authorization"
-    token_prefix: str = "Bearer "
-    
-    # 错误处理配置
-    enable_debug: bool = False
-    
-    class Config:
-        env_prefix = "AGENTERRA_"
-        
-    @classmethod
-    def from_env(cls) -> "AuthConfig":
-        """
-        从环境变量创建配置
-        """
-        return cls(
-            agenterra_iam_host=os.environ.get('AGENTERRA_IAM_HOST', ''),
-            server_name=os.environ.get('AGENTERRA_SERVER_NAME', ''),
-            access_key=os.environ.get('AGENTERRA_ACCESS_KEY', ''),
-            enable_debug=os.environ.get('AGENTERRA_ENABLE_DEBUG', 'false').lower() == 'true'
-        )
-    
-    def validate_config(self) -> bool:
-        """
-        验证配置是否完整
-        """
-        required_fields = ['agenterra_iam_host', 'server_name', 'access_key']
-        for field in required_fields:
-            if not getattr(self, field):
-                raise ValueError(f"配置项 {field} 不能为空")
-        return True
-    
-    def add_whitelist_path(self, path: str) -> None:
-        """
-        添加白名单路径
-        """
-        if path not in self.whitelist_paths:
-            self.whitelist_paths.append(path)
-    
-    def remove_whitelist_path(self, path: str) -> None:
-        """
-        移除白名单路径
-        """
-        if path in self.whitelist_paths:
-            self.whitelist_paths.remove(path)