Encryptors 2.54__tar.gz → 2.56__tar.gz

{encryptors-2.54 → encryptors-2.56}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Encryptors
-Version: 2.54
+Version: 2.56
 Summary: End-to-end algorithm library
 Author: OSDental LLC
 Author-email: support@osdental.ai

{encryptors-2.54 → encryptors-2.56}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 # ANDERSON REVISAR EL CACHE LOCAL DEL KEYVAULT PARA VALIDAR SI FUNCIONA
 setup(
     name="Encryptors", 
-    version="2.54",
+    version="2.56",
     author="OSDental LLC",
     author_email="support@osdental.ai",
     description="End-to-end algorithm library",

{encryptors-2.54 → encryptors-2.56}/src/Encryptors.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Encryptors
-Version: 2.54
+Version: 2.56
 Summary: End-to-end algorithm library
 Author: OSDental LLC
 Author-email: support@osdental.ai

{encryptors-2.54 → encryptors-2.56}/src/Osdental/Decorators/SecureResolver.py

@@ -1,6 +1,6 @@
 import logging
 from functools import wraps
-from typing import Callable
+from typing import Callable, Dict, Any
 from graphql import GraphQLResolveInfo
 from Osdental.Models.Response import Response
 from Osdental.Graphql.Models import BaseGraphQLContext
@@ -15,12 +15,20 @@ from Osdental.Helpers._AuthTokenProcessor import (
     extract_bearer_token, build_auth_token, decrypt_and_parse_payload
 )
 from Osdental.Enums.StatusCode import StatusCode
+from Osdental.Helpers.AuditDispatcher import AuditDispatcher
 
 
 logger = logging.getLogger(__name__)
 
 
-def __test(dispatcher, request, request_payload, result, decrypted_key):
+def __test(
+    dispatcher: AuditDispatcher, 
+    request,
+    request_payload: Dict[str, Any],
+    result: Response,
+    decrypted_key: str
+) -> None:
+
     dispatcher.dispatch(
         request=request,
         request_payload=request_payload,
@@ -40,14 +48,16 @@ def resolver(public: bool = False, action=None):
         async def wrapper(obj, info: GraphQLResolveInfo, **kwargs):
             try:
                 context: BaseGraphQLContext = info.context
+                container = context.container
                 request = context.request
+                headers = request.headers
+                settings = container.settings
+
                 token: type[AuthToken] | None = None
 
                 # ── 1. AUTENTICACIÓN ──────────────────────────────
                 if not public:
 
-                    headers = request.headers
-                    container = context.container
                     token_service: IAuthTokenService = container.auth_token_service
                     user_token = extract_bearer_token(headers)
                     
@@ -93,9 +103,13 @@ def resolver(public: bool = False, action=None):
                 if not isinstance(result, Response):
                     raise TypeError("Resolver must return a Response instance")
 
-                dispatcher = request.app.state.audit_dispatcher
+                
 
                 request_payload = {
+                    "env": settings.environment,
+                    "ms_name": settings.microservice_name,
+                    "ms_version": settings.microservice_version,
+                    "is_auditable": settings.is_auditable,
                     "operation_type": info.operation.operation.value,
                     "operation_name": body.get("operationName", "UnknownOperation"),
                     "query": body.get("query"),
@@ -110,6 +124,11 @@ def resolver(public: bool = False, action=None):
                 if isinstance(result, Response):
                     decrypted_key = result.key if not token else token.aes_key_auth
 
+                dispatcher = AuditDispatcher(
+                    messaging=container.az_sb_audit,
+                    storage=container.az_blob_storage
+                )
+                
                 __test(
                     dispatcher=dispatcher,
                     request_payload=request_payload,

{encryptors-2.54 → encryptors-2.56}/src/Osdental/Graphql/_Helpers/_AuditHelper.py

@@ -1,14 +1,14 @@
 import json
 from typing import Dict, Literal, Any, Optional
-from Osdental.Models._Audit import Audit
 
 class AuditHelper:
         
     @staticmethod
-    async def build_request_payload(audit: Audit) -> Dict[str, Any]:
-        request = audit.request
-        audit_config = audit.audit_config
-        payload = audit.payload
+    async def build_request_payload(
+        request, 
+        payload: Dict[str, Any], 
+        audit_type
+    ) -> Dict[str, Any]:
 
         default_value = "*"
 
@@ -30,19 +30,19 @@ class AuditHelper:
 
         return {
             "idMessageLog": request.headers.get("Idmessagelog"),
-            "environment": audit_config.environment,
+            "environment": payload.get("env"),
             "header": json.dumps(headers),
             "microServiceUrl": str(request.url),
-            "microServiceName": audit_config.microservice_name,
-            "microServiceVersion": audit_config.microservice_version,
-            "serviceName": audit.operation_name,
+            "microServiceName": payload.get("ms_name"),
+            "microServiceVersion": payload.get("ms_version"),
+            "serviceName": payload.get("operation_name"),
             "machineNameUser": request.headers.get("Machinenameuser", default_value),
             "ipUser": user_ip or default_value,
-            "userName": audit.full_name,
+            "userName": payload.get("user"),
             "localitation": default_value,
             "httpMethod": request.method,
             "messageIn": json.dumps(payload) if payload else default_value,
-            "auditLog": audit.audit_type
+            "auditLog": audit_type,
         }
     
     @staticmethod
@@ -64,4 +64,4 @@ class AuditHelper:
             "httpResponseCode": status_code,
             "messageOut": result,
             "errorProducer": error
-        }
+        }

{encryptors-2.54 → encryptors-2.56}/src/Osdental/Helpers/AuditDispatcher.py

@@ -2,12 +2,10 @@ import logging
 import asyncio
 from typing import Dict, Any, Optional
 from fastapi import Request
-from Osdental.Models.AuditConfig import AuditConfig
 from Osdental.Messaging import IMessageQueue
 from Osdental.Graphql._Helpers._AuditHelper import AuditHelper
 from Osdental.Storage import IStorageService
 from Osdental.Helpers.ResponseDecryptor import decryptor_data, VALID_TYPES
-from Osdental.Models._Audit import Audit
 from Osdental.Models.Response import Response
 from Osdental.Models.ApiResponse import ApiResponse
 from Osdental.Constants.Constant import Constant
@@ -21,19 +19,14 @@ class AuditDispatcher:
         self, 
         messaging: IMessageQueue, 
         storage: IStorageService,
-        audit_config: AuditConfig, 
         max_queue_size: int = 5000
     ):
         self._messaging = messaging
         self._storage = storage
-        self._audit_config = audit_config
+
         self._queue = asyncio.Queue(maxsize=max_queue_size)
         self._worker_task = None
 
-    # Se llama en startup
-    def start(self):
-        self._worker_task = asyncio.create_task(self._worker())
-
     # Se llama en shutdown
     async def stop(self):
         # Esperar a que la cola se vacíe
@@ -56,6 +49,9 @@ class AuditDispatcher:
         audit_type: str = None
     ):
         try:
+            if self._worker_task is None:
+                self._worker_task = asyncio.create_task(self._worker())
+        
             payload = {
                 "request": request,
                 "request_payload": request_payload,
@@ -87,31 +83,30 @@ class AuditDispatcher:
 
     # Logica
     async def _process(self, payload: Dict[str, Any]) -> None:
-        if not self._audit_config.is_auditable:
-            logger.info("Auditing is disabled. Skipping audit processing.")
-            return
-        
+
         import json
-        
+
         request = payload["request"]
         request_payload = payload["request_payload"]
         result: Response | ApiResponse = payload["result"]
         audit_type = payload["audit_type"]
+
+        print(request_payload)
+
+        if not request_payload.get("is_auditable"):
+            logger.info("Auditing is disabled. Skipping audit processing.")
+            return
         
         operation_name = request_payload.get("operation_name")
         if operation_name == 'UnknownOperation':
             logger.info("Skipping audit: no data in GraphQL response")
             return
         
-        audit = Audit(
-            audit_type=audit_type,
+        request_audit_payload = await AuditHelper.build_request_payload(
             request=request,
-            audit_config=self._audit_config,
-            operation_name=operation_name,
-            full_name=request_payload.get("user", "Joe Doe"),
-            payload=request_payload.get("variables")
+            payload=request_payload,
+            audit_type=audit_type
         )
-        request_audit_payload = await AuditHelper.build_request_payload(audit=audit)
 
         status_code = result.status
         message = result.message
@@ -168,6 +163,7 @@ class AuditDispatcher:
         data = json.dumps(audit_message)
         blob_name = f"audits/{message_log_id}.text"
         success = await self._storage.upload(blob_name, data)
+        
         if not success:
             logger.error("Failed to upload audit log to storage. Skipping message dispatch.")
             return

{encryptors-2.54 → encryptors-2.56}/src/Osdental/Services/JwtAuthTokenService.py

@@ -79,7 +79,6 @@ class JwtAuthTokenService(IAuthTokenService):
         claims = self._jwt.validate_token(
             token=token,
             options=TokenValidationOptions(
-                validate_expiration=True,
                 validate_issuer=False,
                 validate_audience=False,
             )
@@ -103,7 +102,6 @@ class JwtAuthTokenService(IAuthTokenService):
         claims = self._jwt.validate_token(
             token=token,
             options=TokenValidationOptions(
-                validate_expiration=True,
                 validate_issuer=False,
                 validate_audience=False,
             )
@@ -127,7 +125,6 @@ class JwtAuthTokenService(IAuthTokenService):
             options=TokenValidationOptions(
                 issuer=self._issuer,
                 audience=self._audience,
-                validate_expiration=True,
                 validate_issuer=True,
                 validate_audience=True,
             )