GeneralManager 0.86.5__tar.gz → 0.86.6__tar.gz

{generalmanager-0.86.5/src/GeneralManager.egg-info → generalmanager-0.86.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.86.5
+Version: 0.86.6
 Summary: Modular Django-based data management framework with ORM, GraphQL, fine-grained permissions, rule validation, calculations and caching.
 Author-email: Tim Kleindick <tkleindick@yahoo.de>
 License: MIT License

{generalmanager-0.86.5 → generalmanager-0.86.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "GeneralManager"
-version = "0.86.5"
+version = "0.86.6"
 description = "Modular Django-based data management framework with ORM, GraphQL, fine-grained permissions, rule validation, calculations and caching."
 readme = "README.md"
 authors = [{ name = "Tim Kleindick", email = "tkleindick@yahoo.de" }]

{generalmanager-0.86.5 → generalmanager-0.86.6/src/GeneralManager.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.86.5
+Version: 0.86.6
 Summary: Modular Django-based data management framework with ORM, GraphQL, fine-grained permissions, rule validation, calculations and caching.
 Author-email: Tim Kleindick <tkleindick@yahoo.de>
 License: MIT License

{generalmanager-0.86.5 → generalmanager-0.86.6}/src/GeneralManager.egg-info/SOURCES.txt

@@ -50,6 +50,7 @@ src/general_manager/api/graphql_warmup.py
 src/general_manager/api/graphql_warmup_registry.py
 src/general_manager/api/graphql_warmup_tasks.py
 src/general_manager/api/mutation.py
+src/general_manager/api/mutation_controls.py
 src/general_manager/api/notification_batching.py
 src/general_manager/api/property.py
 src/general_manager/api/registry.py

{generalmanager-0.86.5 → generalmanager-0.86.6}/src/general_manager/api/graphql_mutations.py

@@ -21,6 +21,7 @@ from django.db import models
 from django.core.exceptions import FieldDoesNotExist
 
 from general_manager.interface.base_interface import AttributeTypedDict, InterfaceBase
+from general_manager.api.mutation_controls import MUTATION_CONTROL_KEYS
 from general_manager.api.graphql_relations import (
     get_graphql_manager_registry,
     resolve_general_manager_type,
@@ -55,6 +56,33 @@ class _UnsetHistoryComment:
 _HISTORY_COMMENT_UNSET = _UnsetHistoryComment()
 
 
+class ReservedMutationControlFieldError(ValueError):
+    """Raised when an editable field collides with manager execution metadata."""
+
+    def __init__(self, field_name: str) -> None:
+        super().__init__(
+            f"Editable GraphQL field {field_name!r} collides with a reserved "
+            "manager mutation control. Rename the field or make it read-only."
+        )
+
+
+class ReservedMutationControlInputError(GraphQLError):
+    """Report client input attempting to override trusted authorization metadata."""
+
+    def __init__(self, key: str) -> None:
+        super().__init__(
+            f"Mutation input cannot include reserved key {key!r}.",
+            extensions={"code": "BAD_USER_INPUT"},
+        )
+
+
+def _reject_mutation_authorization_controls(kwargs: MutationPayload) -> None:
+    """Allow audit comments but reject client-controlled authorization metadata."""
+    for key in sorted(MUTATION_CONTROL_KEYS - {"history_comment"}):
+        if key in kwargs:
+            raise ReservedMutationControlInputError(key)
+
+
 class _EditableGrapheneField(Protocol):
     """Graphene field instance carrying GeneralManager's dynamic editability flag."""
 
@@ -168,8 +196,10 @@ def _normalize_mutation_kwargs_for_manager(
     ORM mutation capabilities expect ``field_id``/``field_id_list`` for manager
     relations. Structured references pass through their manager constructor so
     all declared inputs are validated. Scalar reference values stay unchanged.
-    Unknown keys and already-normalized keys are preserved.
+    Unknown keys and already-normalized keys are preserved, except reserved
+    authorization controls, which are rejected before and after normalization.
     """
+    _reject_mutation_authorization_controls(kwargs)
     interface_cls = getattr(general_manager_class, "Interface", None)
     if interface_cls is None:
         return dict(kwargs)
@@ -233,6 +263,7 @@ def _normalize_mutation_kwargs_for_manager(
                     )
                 normalized.pop(key, None)
 
+    _reject_mutation_authorization_controls(normalized)
     return normalized
 
 
@@ -351,6 +382,10 @@ def create_write_fields(
         Mapping from attribute name to a Graphene input field instance. Returned
         fields carry a dynamic maintainer-facing ``editable`` flag used by the
         generated mutation class builders.
+
+    Raises:
+        ReservedMutationControlFieldError: An editable field or its normalized
+            relation alias collides with reserved manager mutation metadata.
     """
     fields: GrapheneFieldMap = {}
     attribute_types = interface_cls.get_attribute_types()
@@ -360,6 +395,8 @@ def create_write_fields(
             continue
         if info["is_derived"]:
             continue
+        if info["is_editable"] and name in MUTATION_CONTROL_KEYS:
+            raise ReservedMutationControlFieldError(name)
         if _is_direct_relation_raw_id_alias(
             name,
             attribute_types,
@@ -375,6 +412,13 @@ def create_write_fields(
         if default is NOT_PROVIDED or callable(default):
             default = Undefined
         manager_type = resolve_general_manager_type(typ, manager_registry)
+        if (
+            info["is_editable"]
+            and manager_type is not None
+            and not name.endswith(("_id", "_list"))
+            and f"{name}_id" in MUTATION_CONTROL_KEYS
+        ):
+            raise ReservedMutationControlFieldError(name)
 
         fld: object
         if info.get("orm_field_kind") in {"file", "image"}:
@@ -477,6 +521,7 @@ def generate_create_mutation_class(
                 for field_name, value in kwargs.items()
                 if value is not NOT_PROVIDED
             }
+            _reject_mutation_authorization_controls(kwargs)
             _preflight_mutation_uploads(
                 info=info,
                 general_manager_class=generalManagerClass,
@@ -488,12 +533,14 @@ def generate_create_mutation_class(
             kwargs = _normalize_mutation_kwargs_for_manager(generalManagerClass, kwargs)
             history_comment = _pop_history_comment(kwargs)
             create = cast(_ManagerCreateMethod, generalManagerClass.create)
-            create_kwargs = {"creator_id": info.context.user.id, **kwargs}
             if isinstance(history_comment, _UnsetHistoryComment):
-                instance = create(**create_kwargs)
+                instance = create(creator_id=info.context.user.id, **kwargs)
             else:
-                create_kwargs["history_comment"] = history_comment
-                instance = create(**create_kwargs)
+                instance = create(
+                    creator_id=info.context.user.id,
+                    history_comment=history_comment,
+                    **kwargs,
+                )
         except GraphQLError:
             raise
         except Exception as error:
@@ -587,6 +634,7 @@ def generate_update_mutation_class(
                 for field_name, value in kwargs.items()
                 if value is not NOT_PROVIDED
             }
+            _reject_mutation_authorization_controls(kwargs)
             _preflight_mutation_uploads(
                 info=info,
                 general_manager_class=generalManagerClass,
@@ -600,12 +648,14 @@ def generate_update_mutation_class(
             update = cast(
                 _ManagerUpdateMethod, generalManagerClass(**identification).update
             )
-            update_kwargs = {"creator_id": info.context.user.id, **kwargs}
             if isinstance(history_comment, _UnsetHistoryComment):
-                instance = update(**update_kwargs)
+                instance = update(creator_id=info.context.user.id, **kwargs)
             else:
-                update_kwargs["history_comment"] = history_comment
-                instance = update(**update_kwargs)
+                instance = update(
+                    creator_id=info.context.user.id,
+                    history_comment=history_comment,
+                    **kwargs,
+                )
         except GraphQLError:
             raise
         except Exception as error:

generalmanager-0.86.6/src/general_manager/api/mutation_controls.py

@@ -0,0 +1,5 @@
+"""Manager execution metadata reserved across public mutation transports."""
+
+MUTATION_CONTROL_KEYS = frozenset(
+    {"ignore_permission", "creator_id", "history_comment"}
+)

{generalmanager-0.86.5 → generalmanager-0.86.6}/src/general_manager/api/remote_api.py

@@ -16,6 +16,7 @@ from django.http import HttpRequest, HttpResponse, JsonResponse
 from django.urls import URLPattern, path
 
 from general_manager.logging import get_logger
+from general_manager.api.mutation_controls import MUTATION_CONTROL_KEYS
 from general_manager.bucket._ordering import normalize_ordering
 from general_manager.bucket.request_bucket import RequestBucket
 
@@ -25,9 +26,6 @@ if TYPE_CHECKING:
 logger = get_logger("api.remote")
 
 _SEGMENT_RE = re.compile(r"^[a-z0-9]+(?:-[a-z0-9]+)*$")
-_MUTATION_CONTROL_KEYS = frozenset(
-    {"ignore_permission", "creator_id", "history_comment"}
-)
 _MUTATION_METADATA_KEY = "__metadata__"
 _MUTATION_METADATA_FIELDS = frozenset({"history_comment"})
 RemoteAPIView = Callable[[HttpRequest], HttpResponse]
@@ -432,7 +430,7 @@ def _parse_json_body(request: HttpRequest) -> RemoteJSONPayload:
 def _parse_mutation_body(request: HttpRequest) -> tuple[RemoteJSONPayload, str | None]:
     """Separate schema values from supported remote mutation metadata."""
     payload = _parse_json_body(request)
-    for control_key in _MUTATION_CONTROL_KEYS:
+    for control_key in MUTATION_CONTROL_KEYS:
         if control_key in payload:
             raise RemoteAPIRequestError.reserved_mutation_control(control_key)