maleo-foundation 0.1.36__py3-none-any.whl → 0.1.37__py3-none-any.whl

maleo_foundation/managers/service.py

@@ -20,7 +20,7 @@ from maleo_foundation.middlewares.base import RequestProcessor
 from maleo_foundation.services.token import BaseTokenService
 from maleo_foundation.types import BaseTypes
 from maleo_foundation.utils.exceptions import BaseExceptions
-from maleo_foundation.utils.keyloader import load_key
+from maleo_foundation.utils.keyloader import BaseKeyLoaders
 from maleo_foundation.utils.logging import GoogleCloudLogging, ServiceLogger, MiddlewareLogger
 
 class LogConfig(BaseModel):
@@ -294,14 +294,14 @@ class ServiceManager:
     def _parse_keys(self) -> None:
         #* Parse private key
         key_type = BaseEnums.KeyType.PRIVATE
-        private = load_key(
+        private = BaseKeyLoaders.load_rsa(
             type=key_type,
             path=self._settings.PRIVATE_KEY_PATH,
             password=self._settings.KEY_PASSWORD
         )
         #* Parse public key
         key_type = BaseEnums.KeyType.PUBLIC
-        public = load_key(
+        public = BaseKeyLoaders.load_rsa(
             type=key_type,
             path=self._settings.PUBLIC_KEY_PATH
         )

maleo_foundation/middlewares/authentication.py

@@ -6,7 +6,7 @@ from typing import Tuple
 from maleo_foundation.authentication import Credentials, User
 from maleo_foundation.models.transfers.parameters.token import BaseTokenParametersTransfers
 from maleo_foundation.services.token import BaseTokenService
-from maleo_foundation.utils.extractor import extract_client_ip
+from maleo_foundation.utils.extractor import BaseExtractors
 from maleo_foundation.utils.logging import MiddlewareLogger
 
 class Backend(AuthenticationBackend):
@@ -16,7 +16,7 @@ class Backend(AuthenticationBackend):
         self._key = key
 
     async def authenticate(self, conn:HTTPConnection) -> Tuple[Credentials, User]:
-        client_ip = extract_client_ip(conn)
+        client_ip = BaseExtractors.extract_client_ip(conn)
         if "Authorization" not in conn.headers:
             self._logger.info(f"Request | IP: {client_ip} | URL: {conn.url.path} - Result | General: Header did not contain authorization")
             return Credentials(), User(authenticated=False)

maleo_foundation/middlewares/base.py

@@ -9,7 +9,7 @@ from fastapi.responses import JSONResponse
 from starlette.middleware.base import BaseHTTPMiddleware, RequestResponseEndpoint
 from typing import Awaitable, Callable, Optional, Sequence
 from maleo_foundation.models.responses import BaseResponses
-from maleo_foundation.utils.extractor import extract_client_ip
+from maleo_foundation.utils.extractor import BaseExtractors
 from maleo_foundation.utils.logging import MiddlewareLogger
 
 RequestProcessor = Callable[[Request], Awaitable[Optional[Response]]]
@@ -80,23 +80,6 @@ class BaseMiddleware(BaseHTTPMiddleware):
                 self.last_cleanup = now
                 self.logger.debug(f"Cleaned up request cache. Removed {len(inactive_ips)} inactive IPs. Current tracked IPs: {len(self.requests)}")
 
-    def _extract_client_ip(self, request:Request) -> str:
-        """Extract client IP with more robust handling of proxies"""
-        #* Check for X-Forwarded-For header (common when behind proxy/load balancer)
-        x_forwarded_for = request.headers.get("X-Forwarded-For")
-        if x_forwarded_for:
-            #* The client's IP is the first one in the list
-            ips = [ip.strip() for ip in x_forwarded_for.split(",")]
-            return ips[0]
-        
-        #* Check for X-Real-IP header (used by some proxies)
-        x_real_ip = request.headers.get("X-Real-IP")
-        if x_real_ip:
-            return x_real_ip
-            
-        #* Fall back to direct client connection
-        return request.client.host if request.client else "unknown"
-
     def _check_rate_limit(self, client_ip:str) -> bool:
         """Check if the client has exceeded their rate limit"""
         with self._lock:
@@ -179,7 +162,7 @@ class BaseMiddleware(BaseHTTPMiddleware):
         self._cleanup_old_data() #* Run periodic cleanup
         request_timestamp = datetime.now(tz=timezone.utc) #* Record the request timestamp
         start_time = time.perf_counter() #* Record the start time
-        client_ip = extract_client_ip(request) #* Get request IP with improved extraction
+        client_ip = BaseExtractors.extract_client_ip(request) #* Get request IP with improved extraction
 
         try:
             #* 1. Rate limit check

maleo_foundation/utils/__init__.py

@@ -1,13 +1,15 @@
 from __future__ import annotations
 from .formatter import BaseFormatter
-from .logger import BaseLogger
 from .exceptions import BaseExceptions
+from .extractor import BaseExtractors
+from .keyloader import BaseKeyLoaders
 from .controller import BaseControllerUtils
 from .query import BaseQueryUtils
 
 class BaseUtils:
     Formatter = BaseFormatter
-    Logger = BaseLogger
     Exceptions = BaseExceptions
+    Extractors = BaseExtractors
+    KeyLoader = BaseKeyLoaders
     Controller = BaseControllerUtils
     Query = BaseQueryUtils

maleo_foundation/utils/extractor.py

@@ -1,18 +1,20 @@
 from starlette.requests import HTTPConnection
 
-def extract_client_ip(conn:HTTPConnection) -> str:
-    """Extract client IP with more robust handling of proxies"""
-    #* Check for X-Forwarded-For header (common when behind proxy/load balancer)
-    x_forwarded_for = conn.headers.get("X-Forwarded-For")
-    if x_forwarded_for:
-        #* The client's IP is the first one in the list
-        ips = [ip.strip() for ip in x_forwarded_for.split(",")]
-        return ips[0]
+class BaseExtractors:
+    @staticmethod
+    def extract_client_ip(conn:HTTPConnection) -> str:
+        """Extract client IP with more robust handling of proxies"""
+        #* Check for X-Forwarded-For header (common when behind proxy/load balancer)
+        x_forwarded_for = conn.headers.get("X-Forwarded-For")
+        if x_forwarded_for:
+            #* The client's IP is the first one in the list
+            ips = [ip.strip() for ip in x_forwarded_for.split(",")]
+            return ips[0]
 
-    #* Check for X-Real-IP header (used by some proxies)
-    x_real_ip = conn.headers.get("X-Real-IP")
-    if x_real_ip:
-        return x_real_ip
+        #* Check for X-Real-IP header (used by some proxies)
+        x_real_ip = conn.headers.get("X-Real-IP")
+        if x_real_ip:
+            return x_real_ip
 
-    #* Fall back to direct client connection
-    return conn.client.host if conn.client else "unknown"
+        #* Fall back to direct client connection
+        return conn.client.host if conn.client else "unknown"

maleo_foundation/utils/keyloader.py

@@ -3,63 +3,65 @@ from cryptography.hazmat.primitives import serialization
 from typing import Optional, Union
 from maleo_foundation.enums import BaseEnums
 
-def load_key(
-    type:BaseEnums.KeyType,
-    path: Union[str, pathlib.Path],
-    password:Optional[Union[str, bytes]] = None,
-    format:BaseEnums.KeyFormatType = BaseEnums.KeyFormatType.STRING,
-) -> Union[bytes, str]:
-    """
-    Load an RSA private or public key strictly from a file.
+class BaseKeyLoaders:
+    @staticmethod
+    def load_rsa(
+        type:BaseEnums.KeyType,
+        path: Union[str, pathlib.Path],
+        password:Optional[Union[str, bytes]] = None,
+        format:BaseEnums.KeyFormatType = BaseEnums.KeyFormatType.STRING,
+    ) -> Union[bytes, str]:
+        """
+        Load an RSA private or public key strictly from a file.
 
-    Args:
-        path (str | pathlib.Path): Path to the PEM file.
-        password (str | bytes | None): Password for encrypted private keys (optional).
+        Args:
+            path (str | pathlib.Path): Path to the PEM file.
+            password (str | bytes | None): Password for encrypted private keys (optional).
 
-    Returns:
-        rsa.RSAPrivateKey | rsa.RSAPublicKey
-    """
-    if not isinstance(type, BaseEnums.KeyType):
-        raise TypeError("Invalid key type")
+        Returns:
+            rsa.RSAPrivateKey | rsa.RSAPublicKey
+        """
+        if not isinstance(type, BaseEnums.KeyType):
+            raise TypeError("Invalid key type")
 
-    file_path = pathlib.Path(path)
+        file_path = pathlib.Path(path)
 
-    if not file_path.is_file():
-        raise FileNotFoundError(f"Key file not found: {file_path}")
+        if not file_path.is_file():
+            raise FileNotFoundError(f"Key file not found: {file_path}")
 
-    if password is not None and not isinstance(password, (str, bytes)):
-        raise TypeError("Invalid passsword type")
+        if password is not None and not isinstance(password, (str, bytes)):
+            raise TypeError("Invalid passsword type")
 
-    if not isinstance(format, BaseEnums.KeyFormatType):
-        raise TypeError("Invalid key format type")
+        if not isinstance(format, BaseEnums.KeyFormatType):
+            raise TypeError("Invalid key format type")
 
-    key_data = file_path.read_bytes()
+        key_data = file_path.read_bytes()
 
-    if type == BaseEnums.KeyType.PRIVATE:
-        private_key = serialization.load_pem_private_key(
-            key_data,
-            password=password.encode() if isinstance(password, str) else password,
-        )
-        private_key_bytes = private_key.private_bytes(
-            encoding=serialization.Encoding.PEM,
-            format=serialization.PrivateFormat.PKCS8,
-            encryption_algorithm=serialization.NoEncryption()
-        )
-        if format == BaseEnums.KeyFormatType.BYTES:
-            return private_key_bytes
-        elif format == BaseEnums.KeyFormatType.STRING:
-            return private_key_bytes.decode()
+        if type == BaseEnums.KeyType.PRIVATE:
+            private_key = serialization.load_pem_private_key(
+                key_data,
+                password=password.encode() if isinstance(password, str) else password,
+            )
+            private_key_bytes = private_key.private_bytes(
+                encoding=serialization.Encoding.PEM,
+                format=serialization.PrivateFormat.PKCS8,
+                encryption_algorithm=serialization.NoEncryption()
+            )
+            if format == BaseEnums.KeyFormatType.BYTES:
+                return private_key_bytes
+            elif format == BaseEnums.KeyFormatType.STRING:
+                return private_key_bytes.decode()
 
-    elif type == BaseEnums.KeyType.PUBLIC:
-        public_key = serialization.load_pem_public_key(key_data)
-        public_key_bytes = public_key.public_bytes(
-            encoding=serialization.Encoding.PEM,
-            format=serialization.PublicFormat.SubjectPublicKeyInfo
-        )
-        if format == BaseEnums.KeyFormatType.BYTES:
-            return public_key_bytes
-        elif format == BaseEnums.KeyFormatType.STRING:
-            return public_key_bytes.decode()
+        elif type == BaseEnums.KeyType.PUBLIC:
+            public_key = serialization.load_pem_public_key(key_data)
+            public_key_bytes = public_key.public_bytes(
+                encoding=serialization.Encoding.PEM,
+                format=serialization.PublicFormat.SubjectPublicKeyInfo
+            )
+            if format == BaseEnums.KeyFormatType.BYTES:
+                return public_key_bytes
+            elif format == BaseEnums.KeyFormatType.STRING:
+                return public_key_bytes.decode()
 
-    else:
-        raise ValueError(f"Unsupported key type: {type}")
+        else:
+            raise ValueError(f"Unsupported key type: {type}")

{maleo_foundation-0.1.36.dist-info → maleo_foundation-0.1.37.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maleo_foundation
-Version: 0.1.36
+Version: 0.1.37
 Summary: Foundation package for Maleo
 Author-email: Agra Bima Yuda <agra@nexmedis.com>
 License: MIT

{maleo_foundation-0.1.36.dist-info → maleo_foundation-0.1.37.dist-info}/RECORD

@@ -13,7 +13,7 @@ maleo_foundation/expanded_types/token.py,sha256=4fRTJw6W5MYq71NksNrWNi7qYHQ4_lQw
 maleo_foundation/managers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo_foundation/managers/db.py,sha256=ZN0b43OgqQtk2WHKMJQ0E2TeaSEyVJ0-l4FEkrSG0Qo,4645
 maleo_foundation/managers/middleware.py,sha256=7CDXPMb28AR7J72TWOeKFxOlMypKezEtO9mr53a88B0,4032
-maleo_foundation/managers/service.py,sha256=c6syGWL5DdGWix075_WVaAIfSV7SSHbfrPlCQBnYOK8,20377
+maleo_foundation/managers/service.py,sha256=-xsghwPtqV95YcktytV7Zba_E38JkmwUPlHXcLppfkQ,20413
 maleo_foundation/managers/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo_foundation/managers/client/base.py,sha256=lYREmEoTLShlPPXOKKiAopjefJ8nIWHCi7IvWkXXKeY,1465
 maleo_foundation/managers/client/maleo.py,sha256=NibYGdiN3EXUw5nx-tL48QAZym14GcA4BDZihGJNQ-g,4254
@@ -22,8 +22,8 @@ maleo_foundation/managers/client/google/base.py,sha256=7jCnzkBN-F8xJEfP5eopuyfRB
 maleo_foundation/managers/client/google/secret.py,sha256=E2SthMUHScIo9Cz5ICbCK7xBg16hnzKANk7--B82828,3481
 maleo_foundation/managers/client/google/storage.py,sha256=CZmbKBS4p7OCYb5MKWmGB56-Dl7gi7xXteoqpJpVH08,2748
 maleo_foundation/middlewares/__init__.py,sha256=bqE2EIFC3rWcR2AwFPR0fk2kSFfeTRzgA24GbnuT5RA,3697
-maleo_foundation/middlewares/authentication.py,sha256=j1IcNnsfVVgDL4eVPP3LARjh5rKHm2KUEfS3E3j7snc,3120
-maleo_foundation/middlewares/base.py,sha256=3OaB5F57F3epKNieoAgarYM6PimoUdUl3DgpadtVuqs,11743
+maleo_foundation/middlewares/authentication.py,sha256=mpJ4WJ25zw4SGvgpeJE9eSV3-AtK5IJtN2U8Dh9rmMk,3132
+maleo_foundation/middlewares/base.py,sha256=iGc_4JZYxE0k47Dty4aFOvpgXjQY_W_4tgqYndhq3V8,10991
 maleo_foundation/middlewares/cors.py,sha256=9uvBvY2N6Vxa9RP_YtESxcWo6Doi6uS0lzAG9iLY7Uc,2288
 maleo_foundation/models/__init__.py,sha256=AaKehO7c1HyKhoTGRmNHDddSeBXkW-_YNrpOGBu8Ms8,246
 maleo_foundation/models/responses.py,sha256=Ka9Peb1fVuQKaxyy11FVkUPtGtzyEm_9Xfe8Vla3ml0,4764
@@ -54,16 +54,16 @@ maleo_foundation/models/transfers/results/service/controllers/__init__.py,sha256
 maleo_foundation/models/transfers/results/service/controllers/rest.py,sha256=wCuFyOTQkuBs2cqjPsWnPy0XIsCfMqGByhrSy57qp7Y,1107
 maleo_foundation/services/__init__.py,sha256=Ho5zJSA89xdGFKIwOdzjmd8sm23cIuwrqYAxCEBBTIU,120
 maleo_foundation/services/token.py,sha256=ZqRqOdGUnaSIam6-JHVdAW1UST-2EDtcVN0fpbPmXY4,1638
-maleo_foundation/utils/__init__.py,sha256=FavmL5XYGCm955EAKiWWcXYeU15p5rSzfcglpV2yI6c,387
+maleo_foundation/utils/__init__.py,sha256=eEnPPeA6la0mu7535EFEKUB02C1IO_R8JgYcohvf1qU,471
 maleo_foundation/utils/controller.py,sha256=ECzPzpw36zBAjKcWcDbUAhIJGbc6UpeypdUUX6ipXBg,6396
 maleo_foundation/utils/exceptions.py,sha256=LPPcU-6_3NbRIBZg2Nr2Ac5HF1qZJbHbMVnwfIfZg6g,3702
-maleo_foundation/utils/extractor.py,sha256=BOYkEiEJZTixScd_mEiLt2svKZ4gXBgD2WDlU6giI3w,718
-maleo_foundation/utils/keyloader.py,sha256=g7LYypj7UolmSgHRGXMFgVaWr55UayMdtKXR5NmB7VM,2341
+maleo_foundation/utils/extractor.py,sha256=SZXVYDHWGaA-Dd1BUydwF2HHdZqexEielS4CjL0Ceng,814
+maleo_foundation/utils/keyloader.py,sha256=TOKgKLqvUV27MYkej9d_MQB9O8bOJ_WzaXlqHorkmpo,2581
 maleo_foundation/utils/logging.py,sha256=MwvZmZSA8SIdfq-knEvpYIgqnSpHcyHrZY9TVHWVHJA,9023
 maleo_foundation/utils/query.py,sha256=ODQ3adOYQNj5E2cRW9ytbjBz56nEDcnfq8mQ6YZbCCM,4375
 maleo_foundation/utils/formatter/__init__.py,sha256=iKf5YCbEdg1qKnFHyKqqcQbqAqEeRUf8mhI3v3dQoj8,78
 maleo_foundation/utils/formatter/case.py,sha256=TmvvlfzGdC_omMTB5vAa40TZBxQ3hnr-SYeo0M52Rlg,1352
-maleo_foundation-0.1.36.dist-info/METADATA,sha256=XkamA11MYU7rbddrU-0vy_Lzhaq1SsdiJ9G7xsT4JbA,3190
-maleo_foundation-0.1.36.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-maleo_foundation-0.1.36.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
-maleo_foundation-0.1.36.dist-info/RECORD,,
+maleo_foundation-0.1.37.dist-info/METADATA,sha256=G4M-2SvG4uuTt1hiIP7g0UnQmI4-SQUWbxb_OGm5tjc,3190
+maleo_foundation-0.1.37.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+maleo_foundation-0.1.37.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
+maleo_foundation-0.1.37.dist-info/RECORD,,