aiohttp-msal 0.6.5__tar.gz → 0.6.6__tar.gz

{aiohttp_msal-0.6.5 → aiohttp_msal-0.6.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aiohttp_msal
-Version: 0.6.5
+Version: 0.6.6
 Summary: Helper Library to use the Microsoft Authentication Library (MSAL) with aiohttp
 Home-page: https://github.com/kellerza/aiohttp_msal
 Author: Johann Kellerman

{aiohttp_msal-0.6.5 → aiohttp_msal-0.6.6}/aiohttp_msal/__init__.py

@@ -8,12 +8,12 @@ from aiohttp import ClientSession, web
 from aiohttp_session import get_session
 from aiohttp_session import setup as _setup
 
-from .msal_async import AsyncMSAL
-from .settings import ENV
+from aiohttp_msal.msal_async import AsyncMSAL
+from aiohttp_msal.settings import ENV
 
 _LOGGER = logging.getLogger(__name__)
 
-VERSION = "0.6.5"
+VERSION = "0.6.6"
 
 
 def msal_session(*args: Callable[[AsyncMSAL], Union[Any, Awaitable[Any]]]) -> Callable:

{aiohttp_msal-0.6.5 → aiohttp_msal-0.6.6}/aiohttp_msal/msal_async.py

@@ -14,7 +14,7 @@ from aiohttp.client import ClientResponse, ClientSession, _RequestContextManager
 from aiohttp_session import Session
 from msal import ConfidentialClientApplication, SerializableTokenCache
 
-from .settings import ENV
+from aiohttp_msal.settings import ENV
 
 HTTP_GET = "get"
 HTTP_POST = "post"

{aiohttp_msal-0.6.5 → aiohttp_msal-0.6.6}/aiohttp_msal/redis_tools.py

@@ -42,10 +42,13 @@ async def session_iter(
     match: Filter based on session content (i.e. mail/name)
     key_match: Filter the Redis keys. Defaults to ENV.cookie_name
     """
+    if match and not all(isinstance(v, str) for v in match.values()):
+        raise ValueError("match values must be strings")
     async for key in redis.scan_iter(
         count=100, match=key_match or f"{ENV.COOKIE_NAME}*"
     ):
         sval = await redis.get(key)
+        _LOGGER.debug("Session: %s = %s", key, sval)
         created, ses = 0, {}
         try:
             val = json.loads(sval)  # type: ignore
@@ -55,7 +58,12 @@ async def session_iter(
             pass
         if match:
             # Ensure we match all the supplied terms
-            if not all(k in ses and v in ses[k] for k, v in match.items()):
+            matches = 0
+            for mkey, mval in match.items():
+                if not (isinstance(ses.get(mkey), str) and mval in ses[mkey]):
+                    break
+                matches += 1
+            if matches != len(match):
                 continue
         yield key, created, ses
 

{aiohttp_msal-0.6.5 → aiohttp_msal-0.6.6}/aiohttp_msal/routes.py

@@ -7,19 +7,16 @@ from urllib.parse import urljoin
 from aiohttp import web
 from aiohttp_session import get_session, new_session
 
+from aiohttp_msal import _LOGGER, ENV, authenticated, msal_session
+from aiohttp_msal.msal_async import FLOW_CACHE, AsyncMSAL
 from aiohttp_msal.user_info import get_manager_info, get_user_info
 
-from . import _LOGGER, ENV, authenticated, msal_session
-from .msal_async import FLOW_CACHE, AsyncMSAL
-
 ROUTES = web.RouteTableDef()
 
 URI_USER_LOGIN = "/user/login"
 URI_USER_AUTHORIZED = "/user/authorized"
 SESSION_REDIRECT = "redirect"
 
-# ic.disable()  # remove debug prints
-
 
 def get_route(request: web.Request, url: str) -> str:
     """Retrieve server route from request.
@@ -70,14 +67,12 @@ async def user_authorized(request: web.Request) -> web.Response:
         )
 
     if not request.cookies.get(ENV.COOKIE_NAME):
-        # ic(request.cookies.keys())
         cookies = dict(request.cookies.items())
         msg.append(f"<b>Expecting '{ENV.COOKIE_NAME}' in cookies</b>")
         _LOGGER.fatal("Cookie should be set with Samesite:None")
         msg.append(html_table(cookies))
 
     elif not session.get(FLOW_CACHE):
-        # ic(session)
         msg.append(f"<b>Expecting '{FLOW_CACHE}' in session</b>")
         msg.append(f"- Session.new: {session.new}")
         msg.append(html_table(session))
@@ -145,7 +140,6 @@ async def user_debug(request: web.Request) -> web.Response:
             "X-Forw-For IP": request.headers.get("X-Forwarded-For", ""),
         },
     }
-    # ic(debug)
     session["debug_previous"] = time.time()
     return web.json_response(debug)
 

{aiohttp_msal-0.6.5 → aiohttp_msal-0.6.6}/aiohttp_msal/settings.py

@@ -1,7 +1,7 @@
 """Settings."""
 from typing import Any, Awaitable, Callable, Union
 
-from .settings_base import SettingsBase, Var
+from aiohttp_msal.settings_base import SettingsBase, Var
 
 
 class MSALSettings(SettingsBase):

{aiohttp_msal-0.6.5 → aiohttp_msal-0.6.6}/aiohttp_msal/user_info.py

@@ -3,7 +3,7 @@ import asyncio
 from functools import wraps
 from typing import Any, Callable
 
-from .msal_async import AsyncMSAL
+from aiohttp_msal.msal_async import AsyncMSAL
 
 
 def retry(func: Callable) -> Callable:

{aiohttp_msal-0.6.5 → aiohttp_msal-0.6.6}/aiohttp_msal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aiohttp-msal
-Version: 0.6.5
+Version: 0.6.6
 Summary: Helper Library to use the Microsoft Authentication Library (MSAL) with aiohttp
 Home-page: https://github.com/kellerza/aiohttp_msal
 Author: Johann Kellerman

{aiohttp_msal-0.6.5 → aiohttp_msal-0.6.6}/aiohttp_msal.egg-info/SOURCES.txt

@@ -19,4 +19,5 @@ aiohttp_msal.egg-info/zip-safe
 tests/__init__.py
 tests/test_init.py
 tests/test_msal_async.py
+tests/test_redis_tools.py
 tests/test_settings.py

{aiohttp_msal-0.6.5 → aiohttp_msal-0.6.6}/pyproject.toml

@@ -1,4 +1,4 @@
 [tool.ruff]
-line-length = 88
+line-length = 121
 # pyflakes, pycodestyle, isort
 select = ["F", "E", "W", "I001"]

{aiohttp_msal-0.6.5 → aiohttp_msal-0.6.6}/tests/test_msal_async.py

@@ -1,3 +1,4 @@
+"""Test the AsyncMSAL class."""
 from aiohttp_msal.msal_async import AsyncMSAL, Session
 
 

aiohttp_msal-0.6.6/tests/test_redis_tools.py

@@ -0,0 +1,59 @@
+"""Test redis tools."""
+from json import dumps
+from typing import AsyncGenerator
+from unittest.mock import AsyncMock, MagicMock, Mock, call
+
+import pytest
+
+from aiohttp_msal.redis_tools import Redis, session_iter
+
+
+@pytest.fixture
+def redis() -> Redis:
+    """Get a redis Mock instance."""
+    testdata = {
+        "a": dumps({"created": 1, "session": {"key": "a", "a": 1, "b": "2a"}}),
+        "b": dumps({"created": 2, "session": {"key": "b", "a": 1, "b": "2b"}}),
+        "c": dumps({"created": 3, "session": {"key": "c", "a": 5, "b": "6c"}}),
+    }
+
+    async def scan_iter(*, count: int, match: str) -> AsyncGenerator[str, None]:
+        """Mock keys."""
+        assert count == 100
+        assert match == "a*"
+        for key in testdata:
+            yield key
+
+    red = Mock()
+    red.scan_iter = MagicMock(side_effect=scan_iter)
+    red.get = AsyncMock(side_effect=list(testdata.values()))
+    return red
+
+
+@pytest.mark.asyncio
+async def test_session_iter_fail(redis: Redis) -> None:
+    """Test session iter."""
+    match = {"a": 1}
+    with pytest.raises(ValueError):
+        async for _ in session_iter(redis, match=match, key_match="a*"):
+            pass
+
+    match = {"a": "1"}
+    async for _ in session_iter(redis, match=match, key_match="a*"):
+        assert False, "no match expected"
+
+
+@pytest.mark.asyncio
+async def test_session_iter(redis: Redis) -> None:
+    """Test session iter."""
+    match = {"b": "2"}
+    expected = ["a", "b"]
+    async for key, created, ses in session_iter(redis, match=match, key_match="a*"):
+        assert expected.pop(0) == key
+        assert key == ses["key"]
+        assert created in (1, 2)
+        assert key in ("a", "b")
+
+    assert redis.scan_iter.call_args[1]["match"] == "a*"
+    assert redis.scan_iter.call_args[1]["count"] == 100
+    assert redis.scan_iter.call_args_list == [call(count=100, match="a*")]