nlbone 0.8.7__py3-none-any.whl → 0.9.0__py3-none-any.whl

nlbone/adapters/auth/auth_service.py

@@ -1,3 +1,5 @@
+import functools
+
 import requests
 
 from nlbone.config.settings import get_settings
@@ -15,7 +17,12 @@ class AuthService(BaseAuthService):
         self._timeout = float(s.HTTP_TIMEOUT_SECONDS)
         self._client = requests.session()
 
-    def has_access(self, token: str, permissions: list[str]) -> bool: ...
+    def has_access(self, token: str, permissions: list[str]) -> bool:
+        data = self.verify_token(token)
+        if not data:
+            return False
+        has_access = [self.client_id + "#" + perm in data.get("allowed_permissions", []) for perm in permissions]
+        return all(has_access)
 
     @cached(ttl=15 * 60)
     def verify_token(self, token: str) -> dict:
@@ -41,7 +48,9 @@ class AuthService(BaseAuthService):
             return result.json()
         return None
 
-    def is_client_token(self, token: str, allowed_clients: set[str] | None = None) -> bool: ...
+    def is_client_token(self, token: str, allowed_clients: set[str] | None = None) -> bool:
+        data = self.verify_token(token)
+        return data.get('preferred_username').startswith('service-account')
 
     def client_has_access(self, token: str, permissions: list[str], allowed_clients: set[str] | None = None) -> bool:
         data = self.verify_token(token)
@@ -50,4 +59,10 @@ class AuthService(BaseAuthService):
         has_access = [self.client_id + "#" + perm in data.get("allowed_permissions", []) for perm in permissions]
         return all(has_access)
 
-    def get_permissions(self, token: str) -> list[str]: ...
+    def get_permissions(self, token: str) -> list[str]:
+        data = self.verify_token(token)
+        return data.get('allowed_permissions', [])
+
+@functools.lru_cache(maxsize=1)
+def get_auth_service() -> AuthService:
+    return AuthService()

nlbone/interfaces/api/dependencies/async_auth.py

@@ -1,6 +1,6 @@
 import functools
 
-from nlbone.adapters.auth import KeycloakAuthService
+from nlbone.adapters.auth.auth_service import get_auth_service
 from nlbone.interfaces.api.exceptions import ForbiddenException, UnauthorizedException
 from nlbone.utils.context import current_request
 
@@ -16,7 +16,7 @@ async def current_user_id() -> int:
 
 async def current_client_id() -> str:
     request = current_request()
-    if client_id := KeycloakAuthService().get_client_id(request.state.token):
+    if client_id := get_auth_service().get_client_id(request.state.token):
         return str(client_id)
     raise UnauthorizedException()
 
@@ -50,7 +50,7 @@ def has_access(*, permissions=None):
             request = current_request()
             if not await current_user_id():
                 raise UnauthorizedException()
-            if not KeycloakAuthService().has_access(request.state.token, permissions=permissions):
+            if not get_auth_service().has_access(request.state.token, permissions=permissions):
                 raise ForbiddenException(f"Forbidden {permissions}")
 
             return await func(*args, **kwargs)

nlbone/interfaces/api/dependencies/auth.py

@@ -1,8 +1,7 @@
 import functools
 
 from nlbone.core.domain.models import CurrentUserData
-from nlbone.adapters.auth import KeycloakAuthService
-from nlbone.adapters.auth.keycloak import get_auth_service
+from nlbone.adapters.auth.auth_service import get_auth_service
 from nlbone.config.settings import get_settings
 from nlbone.interfaces.api.exceptions import ForbiddenException, UnauthorizedException
 from nlbone.utils.context import current_request
@@ -31,14 +30,14 @@ def current_user() -> CurrentUserData:
 
 def current_client_id() -> str:
     request = current_request()
-    if client_id := KeycloakAuthService().get_client_id(request.state.token):
+    if client_id := get_auth_service().get_client_id(request.state.token):
         return str(client_id)
     raise UnauthorizedException()
 
 
 def client_has_access_func(*, permissions=None):
     request = current_request()
-    if not KeycloakAuthService().client_has_access(request.state.token, permissions=permissions):
+    if not get_auth_service().client_has_access(request.state.token, permissions=permissions):
         raise ForbiddenException(f"Forbidden {permissions}")
     return True
 
@@ -71,10 +70,8 @@ def user_has_access_func(*, permissions=None):
     request = current_request()
     if not current_user_id():
         raise UnauthorizedException()
-    user_permissions = get_auth_service().get_permissions(request.state.token)
-    for p in permissions or []:
-        if p not in user_permissions:
-            raise ForbiddenException(f"Forbidden {permissions}")
+    if not get_auth_service().has_access(request.state.token, permissions=permissions):
+        raise ForbiddenException(f"Forbidden {permissions}")
     return True
 
 

nlbone/interfaces/api/middleware/authentication.py

@@ -88,7 +88,7 @@ class AuthenticationMiddleware(BaseHTTPMiddleware):
                 return await call_next(request)
         if request.headers.get("X-Client-Id") == "website" and request.headers.get("Authorization"):
             authenticate_user(request)
-        elif request.cookies.get("access_token"):
+        elif request.cookies.get("access_token") or request.headers.get("Authorization"):
             authenticate_user(request)
         elif request.headers.get("Authorization"):
             authenticate_admin_user(request, auth_service=self._get_auth)

{nlbone-0.8.7.dist-info → nlbone-0.9.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nlbone
-Version: 0.8.7
+Version: 0.9.0
 Summary: Backbone package for interfaces and infrastructure in Python projects
 Author-email: Amir Hosein Kahkbazzadeh <a.khakbazzadeh@gmail.com>
 License: MIT

{nlbone-0.8.7.dist-info → nlbone-0.9.0.dist-info}/RECORD

@@ -4,7 +4,7 @@ nlbone/types.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/adapters/__init__.py,sha256=NzUmk4XPyp3GJOw7VSE86xkQMZLtG3MrOoXLeoB551M,41
 nlbone/adapters/snowflake.py,sha256=eC5eXWgkTIJlO5J44VFbD1-MXj8HYs0lCNp37paSfXY,2324
 nlbone/adapters/auth/__init__.py,sha256=hkDHvsFhw_UiOHG9ZSMqjiAhK4wumEforitveSZswVw,42
-nlbone/adapters/auth/auth_service.py,sha256=9KoVqWUr5PpB8nYkdduogh6DtEGzVUSaXJ9ZbdGgKuM,2051
+nlbone/adapters/auth/auth_service.py,sha256=l8SyskSyswas940i-hXEnJ-gboTpjsXURm_GiAMQwMY,2591
 nlbone/adapters/auth/keycloak.py,sha256=IhEriaFl5mjIGT6ZUCU9qROd678ARchvWgd4UJ6zH7s,4925
 nlbone/adapters/auth/token_provider.py,sha256=kzjFAaFY8SPnU0Tn6l-YVrhEOAiFV0QE3eit3D7u2VQ,1438
 nlbone/adapters/cache/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -81,15 +81,15 @@ nlbone/interfaces/api/additional_filed/resolver.py,sha256=jv1TIBBHN4LBIMwHGipcy4
 nlbone/interfaces/api/additional_filed/default_field_rules/__init__.py,sha256=LUSAOO3xRUt5ptlraIx7H-7dSkdr1D-WprmnqXRB16g,48
 nlbone/interfaces/api/additional_filed/default_field_rules/image_field_rules.py,sha256=ecKqPeXZ-YiF14RK9PmK7ln3PCzpCUc18S5zm5IF3fw,339
 nlbone/interfaces/api/dependencies/__init__.py,sha256=rnYRrFVZCfICQrp_PVFlzNg3BeC57yM08wn2DbOHCfk,359
-nlbone/interfaces/api/dependencies/async_auth.py,sha256=uQV36yk7s7SVsnwuA3eZ2NfqqVOe0vPFOSLuZcVsS8s,2122
-nlbone/interfaces/api/dependencies/auth.py,sha256=GGhXTUG0J_VHOjsQTBFpxHQV1OvT6RIGo2Jvj9IwQ6E,3310
+nlbone/interfaces/api/dependencies/async_auth.py,sha256=CSl87X76qNuUfvvmtDN6uPwFJNbdrKWUuW4U3CZ3e1E,2126
+nlbone/interfaces/api/dependencies/auth.py,sha256=tE9T5HeRPqtimVDB-lYX_5lBaVvERSILT9FP55P-9hk,3190
 nlbone/interfaces/api/dependencies/client_credential.py,sha256=Bo4dYx75Qw0JzTKD9ZfV5EXDEOuwndJk2D-V37K2ePg,1293
 nlbone/interfaces/api/dependencies/db.py,sha256=-UD39J_86UU7ZJs2ZncpdND0yhAG0NeeeALrgSDuuFw,466
 nlbone/interfaces/api/dependencies/uow.py,sha256=QfLEvLYLNWZJQN1k-0q0hBVtUld3D75P4j39q_RjcnE,1181
 nlbone/interfaces/api/middleware/__init__.py,sha256=zbX2vaEAfxRMIYwO2MVY_2O6bqG5H9o7HqGpX14U3Is,158
 nlbone/interfaces/api/middleware/access_log.py,sha256=vIkxxxfy2HcjqqKb8XCfGCcSrivAC8u6ie75FMq5x-U,1032
 nlbone/interfaces/api/middleware/add_request_context.py,sha256=o8mdo-D6fODM9OyHunE5UodkVxsh4F__5tDv8ju8Sxg,1952
-nlbone/interfaces/api/middleware/authentication.py,sha256=Bt6sYu4KtXAyUQnSIp-Z2Z1yKNNtfRy9Y3rOZcYTFhw,3299
+nlbone/interfaces/api/middleware/authentication.py,sha256=scXytNOtV7bg7iLtw19tdhmeIFQmY5qF6HCXAUbKGXg,3339
 nlbone/interfaces/api/pagination/__init__.py,sha256=pA1uC4rK6eqDI5IkLVxmgO2B6lExnOm8Pje2-hifJZw,431
 nlbone/interfaces/api/pagination/offset_base.py,sha256=pdfNgmP99eFC5qCWyY1JgW8hNhOuEGnmrlvQPGArdj8,4709
 nlbone/interfaces/api/schema/__init__.py,sha256=LAqgynfupeqOQ6u0I5ucrcYnojRMZUg9yW8IjKSQTNI,119
@@ -116,8 +116,8 @@ nlbone/utils/normalize_mobile.py,sha256=sGH4tV9gX-6eVKozviNWJhm1DN1J28Nj-ERldCYk
 nlbone/utils/read_files.py,sha256=mx8dfvtaaARQFRp_U7OOiERg-GT62h09_lpTzIQsVhs,291
 nlbone/utils/redactor.py,sha256=-V4HrHmHwPi3Kez587Ek1uJlgK35qGSrwBOvcbw8Jas,1279
 nlbone/utils/time.py,sha256=DjjyQ9GLsfXoT6NK8RDW2rOlJg3e6sF04Jw6PBUrSvg,1268
-nlbone-0.8.7.dist-info/METADATA,sha256=BWhAnL79xAnbCEzF5gr7ttturbVDNcn-N2JvysN-4Yk,2294
-nlbone-0.8.7.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-nlbone-0.8.7.dist-info/entry_points.txt,sha256=CpIL45t5nbhl1dGQPhfIIDfqqak3teK0SxPGBBr7YCk,59
-nlbone-0.8.7.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nlbone-0.8.7.dist-info/RECORD,,
+nlbone-0.9.0.dist-info/METADATA,sha256=2GgKIXQKJN0w0vK9mjf5aPvQ3bjuC-Db0VLUY_Jwmh8,2294
+nlbone-0.9.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+nlbone-0.9.0.dist-info/entry_points.txt,sha256=CpIL45t5nbhl1dGQPhfIIDfqqak3teK0SxPGBBr7YCk,59
+nlbone-0.9.0.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nlbone-0.9.0.dist-info/RECORD,,