Merge pull request #131 from bento-platform/chore/mark-authz-done-mixin

chore: move mark authz done fn into mixin for use in authz service

bento_lib/auth/middleware/base.py

@@ -6,14 +6,13 @@
 from typing import Any, Callable, Iterable
 
 from ..exceptions import BentoAuthException
+from ..types import EvaluationResultMatrix
+from .mark_authz_done_mixin import MarkAuthzDoneMixin
 
-__all__ = ["EvaluationResultMatrix", "BaseAuthMiddleware"]
+__all__ = ["BaseAuthMiddleware"]
 
 
-EvaluationResultMatrix = tuple[tuple[bool, ...], ...]
-
-
-class BaseAuthMiddleware(ABC):
+class BaseAuthMiddleware(ABC, MarkAuthzDoneMixin):
     def __init__(
         self,
         bento_authz_service_url: str,
@@ -192,11 +191,6 @@ async def async_evaluate_one(
             )
         )[0][0]
 
-    @staticmethod
-    @abstractmethod
-    def mark_authz_done(request: Any):  # pragma: no cover
-        pass
-
     def check_authz_evaluate(
         self,
         request: Any,

bento_lib/auth/middleware/mark_authz_done_mixin.py

@@ -0,0 +1,12 @@
+from abc import abstractmethod
+from typing import Any
+
+
+__all__ = ["MarkAuthzDoneMixin"]
+
+
+class MarkAuthzDoneMixin:
+    @staticmethod
+    @abstractmethod
+    def mark_authz_done(request: Any):  # pragma: no cover
+        pass

bento_lib/auth/types.py

@@ -0,0 +1,13 @@
+from typing import Type
+
+from ..auth.middleware.mark_authz_done_mixin import MarkAuthzDoneMixin
+
+__all__ = [
+    "EvaluationResultMatrix",
+    "MarkAuthzDoneType",
+]
+
+EvaluationResultMatrix = tuple[tuple[bool, ...], ...]
+
+# Allow subclass OR instance, since mark_authz_done is a static method:
+MarkAuthzDoneType = MarkAuthzDoneMixin | Type[MarkAuthzDoneMixin]

bento_lib/package.cfg

@@ -1,5 +1,5 @@
 [package]
 name = bento_lib
-version = 9.0.0a2
+version = 9.0.0a3
 authors = David Lougheed, Paul Pillot
 author_emails = [email protected], [email protected]

bento_lib/responses/fastapi_errors.py

@@ -8,8 +8,8 @@
 from starlette.responses import Response
 from typing import Callable
 
-from ..auth.middleware.fastapi import FastApiAuthMiddleware
 from ..auth.exceptions import BentoAuthException
+from ..auth.types import MarkAuthzDoneType
 from .errors import http_error
 
 __all__ = [
@@ -26,7 +26,7 @@ def _log_if_500(logger: logging.Logger, code: int, exc: Exception) -> None:
 
 def http_exception_handler_factory(
     logger: logging.Logger,
-    authz: FastApiAuthMiddleware | None = None,
+    authz: MarkAuthzDoneType | None = None,
     **kwargs,
 ) -> Callable[[Request, HTTPException], Response]:
     def http_exception_handler(request: Request, exc: HTTPException) -> JSONResponse:
@@ -41,7 +41,7 @@ def http_exception_handler(request: Request, exc: HTTPException) -> JSONResponse
 
 def bento_auth_exception_handler_factory(
     logger: logging.Logger,
-    authz: FastApiAuthMiddleware | None = None,
+    authz: MarkAuthzDoneType | None = None,
     **kwargs,
 ) -> Callable[[Request, BentoAuthException], Response]:
     def bento_auth_exception_handler(request: Request, exc: BentoAuthException) -> JSONResponse:
@@ -55,7 +55,7 @@ def bento_auth_exception_handler(request: Request, exc: BentoAuthException) -> J
 
 
 def validation_exception_handler_factory(
-    authz: FastApiAuthMiddleware | None = None,
+    authz: MarkAuthzDoneType | None = None,
     **kwargs,
 ) -> Callable[[Request, RequestValidationError], Response]:
     def validation_exception_handler(request: Request, exc: RequestValidationError) -> JSONResponse:

bento_lib/responses/flask_errors.py

@@ -5,8 +5,8 @@
 from functools import partial
 from typing import Callable
 
-from bento_lib.auth.middleware.flask import FlaskAuthMiddleware
-from bento_lib.responses import errors
+from ..auth.types import MarkAuthzDoneType
+from ..responses import errors
 
 
 __all__ = [
@@ -38,7 +38,7 @@ def flask_error_wrap_with_traceback(fn: Callable, *args, **kwargs) -> Callable:
     service_name = kwargs.pop("service_name", "Bento Service")
 
     logger = kwargs.pop("logger", None)
-    authz: FlaskAuthMiddleware | None = kwargs.pop("authz", None)
+    authz: MarkAuthzDoneType | None = kwargs.pop("authz", None)
 
     def handle_error(e):
         if logger:
@@ -62,7 +62,7 @@ def flask_error_wrap(fn: Callable, *args, **kwargs) -> Callable:
     :return: The wrapped function
     """
 
-    authz: FlaskAuthMiddleware | None = kwargs.pop("authz", None)
+    authz: MarkAuthzDoneType | None = kwargs.pop("authz", None)
 
     def handle_error(e):
         if authz: