oxutils 0.5.2__tar.gz → 0.6.0__tar.gz

{oxutils-0.5.2 → oxutils-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oxutils
-Version: 0.5.2
+Version: 0.6.0
 Summary: Production-ready utilities for Django applications in the Oxiliere ecosystem
 Keywords: django,utilities,jwt,audit,logging,celery,structlog
 Author: Edimedia Mutoke
@@ -121,6 +121,10 @@ MIDDLEWARE = [
 ```bash
 OXI_SERVICE_NAME=my-service
 OXI_JWT_JWKS_URL=https://auth.example.com/.well-known/jwks.json
+
+# JWT keys are base64-encoded PEM contents (not file paths)
+OXI_JWT_SIGNING_KEY=$(base64 -w0 private_key.pem)
+OXI_JWT_VERIFYING_KEY=$(base64 -w0 public_key.pem)
 ```
 
 ### 3. Usage Examples

{oxutils-0.5.2 → oxutils-0.6.0}/README.md

@@ -59,6 +59,10 @@ MIDDLEWARE = [
 ```bash
 OXI_SERVICE_NAME=my-service
 OXI_JWT_JWKS_URL=https://auth.example.com/.well-known/jwks.json
+
+# JWT keys are base64-encoded PEM contents (not file paths)
+OXI_JWT_SIGNING_KEY=$(base64 -w0 private_key.pem)
+OXI_JWT_VERIFYING_KEY=$(base64 -w0 public_key.pem)
 ```
 
 ### 3. Usage Examples

{oxutils-0.5.2 → oxutils-0.6.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "oxutils"
-version = "0.5.2"
+version = "0.6.0"
 description = "Production-ready utilities for Django applications in the Oxiliere ecosystem"
 readme = "README.md"
 license = "LGPL-3.0-only"

{oxutils-0.5.2 → oxutils-0.6.0}/src/oxutils/__init__.py

@@ -40,7 +40,7 @@ Other:
       image validation, bound-request detection
 """
 
-__version__ = "0.5.2"
+__version__ = "0.6.0"
 
 from oxutils.conf import AUDIT_MIDDLEWARE, UTILS_APPS
 from oxutils.settings import oxi_settings

{oxutils-0.5.2 → oxutils-0.6.0}/src/oxutils/jwt/auth.py

@@ -1,4 +1,3 @@
-import os
 from typing import Any, Dict, List, Optional, Tuple, Type
 
 from django.contrib.auth import SESSION_KEY, get_user_model
@@ -33,31 +32,26 @@ def get_jwks() -> Dict[str, Any]:
         Dict containing the public JWK in JWKS format.
 
     Raises:
-        ImproperlyConfigured: If jwt_verifying_key is not configured or file doesn't exist.
+        ImproperlyConfigured: If jwt_verifying_key is not configured or is not a
+            valid base64-encoded PEM string.
     """
     global _public_jwk_cache
 
-    if oxi_settings.jwt_verifying_key is None:
+    key_data = oxi_settings.jwt_verifying_key_pem
+
+    if key_data is None:
         raise ImproperlyConfigured(
             "JWT verifying key is not configured. Set OXI_JWT_VERIFYING_KEY environment variable."
         )
 
-    key_path = oxi_settings.jwt_verifying_key
-
-    if not os.path.exists(key_path):
-        raise ImproperlyConfigured(f"JWT verifying key file not found at: {key_path}")
-
     if _public_jwk_cache is None:
         try:
-            with open(key_path, "r") as f:
-                key_data = f.read()
-
             _public_jwk_cache = jwk.JWK.from_pem(key_data.encode("utf-8"))
             _public_jwk_cache.update(kid="main")
         except Exception as e:
             raise ImproperlyConfigured(
-                f"Failed to load JWT verifying key from {key_path}: {str(e)}"
-            )
+                f"Failed to load JWT verifying key: {str(e)}"
+            ) from e
 
     return {"keys": [_public_jwk_cache.export(as_dict=True)]}
 

{oxutils-0.5.2 → oxutils-0.6.0}/src/oxutils/jwt/utils.py

@@ -39,7 +39,7 @@ def populate_user(request: HttpRequest):
         return
 
     try:
-        request.user = User.objects.get(oxi_id=request.user.id)
+        request.user = User.objects.get(pk=request.user.id)
     except User.DoesNotExist as exc:
         logger.exception("user_not_found", oxi_id=request.user.id, message=str(exc))
         raise InvalidToken() from exc

{oxutils-0.5.2 → oxutils-0.6.0}/src/oxutils/oxiliere/middleware.py

@@ -57,7 +57,7 @@ class TenantMainMiddleware(MiddlewareMixin):
         try:
             return tenant.users.select_related("user").get(user__pk=user.id, status="active")
         except ObjectDoesNotExist as exc:
-            logger.error("tenant_user_not_found", tenant_id=tenant.id, user_id=user.id, exc_info=exc)
+            logger.error("tenant_user_not_found", tenant_id=tenant.id, user_id=user.id, error=str(exc))
             if raise_exception:
                 raise ObjectDoesNotExist("tenant_user_not_found") from exc
             return None

{oxutils-0.5.2 → oxutils-0.6.0}/src/oxutils/permissions/permissions.py

@@ -11,6 +11,8 @@ in the active language.
 
 from django.utils.translation import gettext_lazy as _
 
+ACCESS_APPLICATION_NAME = "access"
+
 # ── Actions used internally by the permissions module ────────────────
 # The ``access`` scope is strictly owned by ``oxutils.permissions``.
 PERMISSION_PRESET = {

oxutils-0.6.0/src/oxutils/settings.py

@@ -0,0 +1,79 @@
+import base64
+import binascii
+from typing import Optional
+
+from pydantic import Field
+from pydantic_settings import BaseSettings, SettingsConfigDict
+
+__all__ = [
+    'oxi_settings',
+]
+
+
+class OxUtilsSettings(BaseSettings):
+    model_config = SettingsConfigDict(
+        validate_assignment=True,
+        extra="ignore",
+        env_prefix='OXI_'
+    )
+
+    # Service
+    service_name: Optional[str] = 'Oxutils'
+    site_name: Optional[str] = 'Oxiliere'
+    site_domain: Optional[str] = 'oxiliere.com'
+    multitenancy: bool = Field(False)
+
+    # Auth JWT Settings — base64-encoded PEM strings
+    jwt_signing_key: Optional[str] = None
+    jwt_verifying_key: Optional[str] = None
+    jwt_jwks_url: Optional[str] = None
+    jwt_access_token_key: str = Field('access')
+    jwt_algorithm: Optional[str] = Field('RS256')
+    jwt_access_token_lifetime: int = Field(15)  # minutes
+
+    # AuditLog
+    log_access: bool = Field(False)
+    retention_delay: int = Field(7)  # one week
+
+    # logger
+    log_file_path: Optional[str] = Field('logs/oxiliere.log')
+
+    def model_post_init(self, __context):
+        """Called after model initialization to perform validation."""
+        self._validate_jwt_keys()
+
+    @staticmethod
+    def _decode_jwt_key(value: str, name: str) -> str:
+        """Decode a base64-encoded PEM key, raising ValueError if invalid."""
+        try:
+            decoded = base64.b64decode("".join(value.split()), validate=True)
+            return decoded.decode("utf-8")
+        except (binascii.Error, UnicodeDecodeError) as exc:
+            raise ValueError(
+                f"{name} is not a valid base64-encoded PEM string: {exc}"
+            ) from exc
+
+    def _validate_jwt_keys(self):
+        """Validate that configured JWT keys are valid base64-encoded PEM strings."""
+        if self.jwt_signing_key:
+            self._decode_jwt_key(self.jwt_signing_key, "JWT signing key")
+
+        if self.jwt_verifying_key:
+            self._decode_jwt_key(self.jwt_verifying_key, "JWT verifying key")
+
+    @property
+    def jwt_signing_key_pem(self) -> Optional[str]:
+        """The decoded PEM signing key, or None if not configured."""
+        if not self.jwt_signing_key:
+            return None
+        return self._decode_jwt_key(self.jwt_signing_key, "JWT signing key")
+
+    @property
+    def jwt_verifying_key_pem(self) -> Optional[str]:
+        """The decoded PEM verifying key, or None if not configured."""
+        if not self.jwt_verifying_key:
+            return None
+        return self._decode_jwt_key(self.jwt_verifying_key, "JWT verifying key")
+
+
+oxi_settings = OxUtilsSettings()

oxutils-0.5.2/src/oxutils/settings.py

@@ -1,72 +0,0 @@
-from typing import Optional
-from pydantic import Field
-from pydantic_settings import BaseSettings, SettingsConfigDict
-
-
-
-
-__all__ = [
-    'oxi_settings',
-]
-
-
-
-class OxUtilsSettings(BaseSettings):
-    model_config = SettingsConfigDict(
-        validate_assignment=True,
-        extra="ignore",
-        env_prefix='OXI_'
-    )
-
-    # Service
-    service_name: Optional[str] = 'Oxutils'
-    site_name: Optional[str] = 'Oxiliere'
-    site_domain: Optional[str] = 'oxiliere.com'
-    multitenancy: bool = Field(False)
-
-    # Auth JWT Settings (JWT_SIGNING_KEY)
-    jwt_signing_key: Optional[str] = None
-    jwt_verifying_key: Optional[str] = None
-    jwt_jwks_url: Optional[str] = None
-    jwt_access_token_key: str = Field('access')
-    jwt_algorithm: Optional[str] = Field('RS256')
-    jwt_access_token_lifetime: int = Field(15) # minutes
-
-
-    # AuditLog
-    log_access: bool = Field(False)
-    retention_delay: int = Field(7)  # one week
-
-    # logger
-    log_file_path: Optional[str] = Field('logs/oxiliere.log')
-
-    def model_post_init(self, __context):
-        """Called after model initialization to perform validation."""
-        self._validate_jwt_keys()
-    
-    def _validate_jwt_keys(self):
-        """Validate JWT key files if configured."""
-        import os
-        
-        if self.jwt_signing_key:
-            if not os.path.exists(self.jwt_signing_key):
-                raise ValueError(
-                    f"JWT signing key file not found at: {self.jwt_signing_key}"
-                )
-            if not os.path.isfile(self.jwt_signing_key):
-                raise ValueError(
-                    f"JWT signing key path is not a file: {self.jwt_signing_key}"
-                )
-        
-        if self.jwt_verifying_key:
-            if not os.path.exists(self.jwt_verifying_key):
-                raise ValueError(
-                    f"JWT verifying key file not found at: {self.jwt_verifying_key}"
-                )
-            if not os.path.isfile(self.jwt_verifying_key):
-                raise ValueError(
-                    f"JWT verifying key path is not a file: {self.jwt_verifying_key}"
-                )
-                
-
-oxi_settings = OxUtilsSettings()