python3-commons 0.18.19__tar.gz → 0.18.20__tar.gz

{python3_commons-0.18.19/src/python3_commons.egg-info → python3_commons-0.18.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-commons
-Version: 0.18.19
+Version: 0.18.20
 Summary: Re-usable Python3 code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
 License-Expression: GPL-3.0

{python3_commons-0.18.19 → python3_commons-0.18.20}/src/python3_commons/auth.py

@@ -5,6 +5,10 @@ from collections.abc import Sequence
 from http import HTTPStatus
 from typing import Self, TypeVar
 
+from pydantic import HttpUrl
+
+from python3_commons.helpers import replace_origin
+
 try:
     import aiohttp
 except ImportError as e:
@@ -45,9 +49,6 @@ class TokenData(msgspec.Struct):
 
 
 T = TypeVar('T', bound=TokenData)
-OIDC_CONFIG_URL = (
-    f'{oidc_settings.authority_internal_url or oidc_settings.authority_url}/.well-known/openid-configuration'
-)
 
 
 class OIDCTokenResponse(msgspec.Struct):
@@ -65,7 +66,16 @@ async def fetch_openid_config() -> dict:
     """
     Fetch the OpenID configuration (including JWKS URI) from OIDC authority.
     """
-    async with aiohttp.ClientSession() as session, session.get(OIDC_CONFIG_URL) as response:
+    if (authority_url := oidc_settings.authority_url) is None:
+        msg = 'OIDC authority URL is required'
+        raise ValueError(msg)
+
+    if oidc_settings.authority_internal_host:
+        authority_url = replace_origin(authority_url, oidc_settings.authority_internal_host)
+
+    oidc_config_url = f'{authority_url}/.well-known/openid-configuration'
+
+    async with aiohttp.ClientSession() as session, session.get(oidc_config_url) as response:
         if response.status != HTTPStatus.OK:
             _msg = 'Failed to fetch OpenID configuration'
 
@@ -78,10 +88,10 @@ async def fetch_jwks(jwks_uri: str) -> dict:
     """
     Fetch the JSON Web Key Set (JWKS) for validating the token's signature.
     """
-    if oidc_settings.authority_internal_url:
+    if authority_internal_host := oidc_settings.authority_internal_host:
         logger.debug('Received jwks_uri: %s', jwks_uri)
-        logger.debug('Replacing OIDC authority host with: %s', oidc_settings.authority_internal_url)
-        jwks_uri = jwks_uri.replace(str(oidc_settings.authority_url), str(oidc_settings.authority_internal_url))
+        logger.debug('Replacing OIDC authority host with: %s', authority_internal_host)
+        jwks_uri = str(replace_origin(HttpUrl(jwks_uri), authority_internal_host))
         logger.debug('Modified jwks_uri: %s', jwks_uri)
 
     async with aiohttp.ClientSession() as session, session.get(jwks_uri) as response:

{python3_commons-0.18.19 → python3_commons-0.18.20}/src/python3_commons/conf.py

@@ -18,8 +18,8 @@ class CommonSettings(BaseSettings):
 class OIDCSettings(BaseSettings):
     model_config = SettingsConfigDict(env_prefix='OIDC_')
 
-    authority_url: HttpUrl | None = None
-    authority_internal_url: HttpUrl | None = None
+    authority_url: HttpUrl | None = None  # https://login.externaldomain.com/realm/app
+    authority_internal_host: HttpUrl | None = None  # http://localhost:8080/ which will substitute host in authority_url
     client_id: str | None = None
     client_secret: SecretStr = SecretStr('')
     redirect_uri: str | None = None

{python3_commons-0.18.19 → python3_commons-0.18.20}/src/python3_commons/helpers.py

@@ -15,6 +15,8 @@ from json import dumps
 from typing import ClassVar, Literal
 from urllib.parse import urlencode
 
+from pydantic import HttpUrl
+
 from python3_commons.serializers.json import CustomJSONEncoder
 
 logger = logging.getLogger(__name__)
@@ -159,3 +161,18 @@ def parse_string_list(v: str | Sequence[str]) -> Sequence[str]:
         return tuple(map(str.strip, v.split(',')))
 
     return v
+
+
+def replace_origin(url: HttpUrl, host_url: HttpUrl) -> HttpUrl:
+    if host_url.host is None:
+        msg = 'Host URL must have a host'
+        raise ValueError(msg)
+
+    return HttpUrl.build(
+        scheme=host_url.scheme,
+        host=host_url.host,
+        port=host_url.port,
+        path=url.path,
+        query=url.query,
+        fragment=url.fragment,
+    )

{python3_commons-0.18.19 → python3_commons-0.18.20}/src/python3_commons/object_storage.py

@@ -140,7 +140,7 @@ async def list_objects(bucket_name: str, prefix: str, *, recursive: bool = True)
 
 
 async def get_object_streams(
-        bucket_name: str, path: str, *, recursive: bool = True
+    bucket_name: str, path: str, *, recursive: bool = True
 ) -> AsyncGenerator[tuple[str, datetime, StreamingBody]]:
     async for obj in list_objects(bucket_name, path, recursive=recursive):
         object_name = obj['Key']
@@ -151,7 +151,7 @@ async def get_object_streams(
 
 
 async def get_objects(
-        bucket_name: str, path: str, *, recursive: bool = True
+    bucket_name: str, path: str, *, recursive: bool = True
 ) -> AsyncGenerator[tuple[str, datetime, bytes]]:
     async for object_name, last_modified, stream in get_object_streams(bucket_name, path, recursive=recursive):
         data = await stream.read()
@@ -174,7 +174,7 @@ async def remove_object(bucket_name: str, path: str) -> None:
 
 
 async def remove_objects(
-        bucket_name: str, prefix: str | None = None, object_names: Iterable[str] | None = None
+    bucket_name: str, prefix: str | None = None, object_names: Iterable[str] | None = None
 ) -> Sequence[Mapping] | None:
     storage = ObjectStorage(s3_settings)
 
@@ -197,7 +197,7 @@ async def remove_objects(
             chunk_size = 1000
 
             for i in range(0, len(objects_to_delete), chunk_size):
-                chunk = objects_to_delete[i: i + chunk_size]
+                chunk = objects_to_delete[i : i + chunk_size]
 
                 response = await s3_client.delete_objects(Bucket=bucket_name, Delete={'Objects': chunk})
 

{python3_commons-0.18.19 → python3_commons-0.18.20}/src/python3_commons/soap_client.py

@@ -145,28 +145,30 @@ class AsyncTransport(Transport):
             return b''
 
         async def _fetch() -> bytes:
-            async with ClientSession(
+            async with (
+                ClientSession(
                     connector=TCPConnector(ssl=_make_ssl_context(verify=self._config.verify_ssl)),
                     timeout=ClientTimeout(total=self._config.timeout),
                     headers={'User-Agent': f'Zeep/{get_version()} (www.python-zeep.org)'},
-            ) as session:
-                async with session.get(url, proxy=self._config.proxy) as resp:
-                    body = await resp.read()
-                    if resp.status >= 400:
-                        raise TransportError(
-                            status_code=resp.status,
-                            message=body.decode(errors='ignore'),
-                        )
-                    return body
+                ) as session,
+                session.get(url, proxy=self._config.proxy) as resp,
+            ):
+                body = await resp.read()
+                if resp.status >= 400:
+                    raise TransportError(
+                        status_code=resp.status,
+                        message=body.decode(errors='ignore'),
+                    )
+                return body
 
         with concurrent.futures.ThreadPoolExecutor(max_workers=1) as pool:
             return pool.submit(asyncio.run, _fetch()).result()
 
     async def post_xml(
-            self,
-            address: str,
-            envelope: Any,
-            headers: dict[str, str],
+        self,
+        address: str,
+        envelope: Any,
+        headers: dict[str, str],
     ) -> Response:
         return await self.post(address, etree_to_string(envelope), headers)
 

{python3_commons-0.18.19 → python3_commons-0.18.20/src/python3_commons.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-commons
-Version: 0.18.19
+Version: 0.18.20
 Summary: Re-usable Python3 code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
 License-Expression: GPL-3.0