GeneralManager 0.87.0__tar.gz → 0.87.2__tar.gz

{generalmanager-0.87.0/src/GeneralManager.egg-info → generalmanager-0.87.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.87.0
+Version: 0.87.2
 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
@@ -47,7 +47,7 @@ License-File: LICENSE
 Requires-Dist: asgiref>=3.8.1
 Requires-Dist: celery<6.0.0,>=5.3.6
 Requires-Dist: channels>=4.1.0
-Requires-Dist: Django>=5.2.16
+Requires-Dist: Django>=5.2.17
 Requires-Dist: django-simple-history>=3.8.0
 Requires-Dist: exrex>=0.12.0
 Requires-Dist: factory_boy>=3.3.3
@@ -55,14 +55,14 @@ Requires-Dist: Faker>=37.1.0
 Requires-Dist: flexcache>=0.3
 Requires-Dist: flexparser>=0.4
 Requires-Dist: gitdb>=4.0.12
-Requires-Dist: GitPython>=3.1.58
+Requires-Dist: GitPython>=3.2.1
 Requires-Dist: graphene>=3.4.3
 Requires-Dist: graphene-django>=3.2.3
 Requires-Dist: graphql-core>=3.2.13
 Requires-Dist: graphql-relay>=3.2.0
 Requires-Dist: numpy>=2.2.5
 Requires-Dist: openpyxl<3.2.0,>=3.1.5
-Requires-Dist: filelock<4,>=3.24.3
+Requires-Dist: filelock<5,>=4.2.1
 Requires-Dist: Pint>=0.24.4
 Requires-Dist: platformdirs>=4.3.7
 Requires-Dist: promise>=2.3

{generalmanager-0.87.0 → generalmanager-0.87.2}/pyproject.toml

@@ -1,10 +1,10 @@
 [build-system]
-requires = ["setuptools>=83.0.0", "wheel"]
+requires = ["setuptools>=84.1.0", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "GeneralManager"
-version = "0.87.0"
+version = "0.87.2"
 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" }]
@@ -35,7 +35,7 @@ dependencies = [
     "asgiref>=3.8.1",
     "celery>=5.3.6,<6.0.0",  # async search indexing (docs/concepts/search.md)
     "channels>=4.1.0",
-    "Django>=5.2.16",
+    "Django>=5.2.17",
     "django-simple-history>=3.8.0",
     "exrex>=0.12.0",
     "factory_boy>=3.3.3",
@@ -43,14 +43,14 @@ dependencies = [
     "flexcache>=0.3",
     "flexparser>=0.4",
     "gitdb>=4.0.12",
-    "GitPython>=3.1.58",
+    "GitPython>=3.2.1",
     "graphene>=3.4.3",
     "graphene-django>=3.2.3",
     "graphql-core>=3.2.13",
     "graphql-relay>=3.2.0",
     "numpy>=2.2.5",
     "openpyxl>=3.1.5,<3.2.0",  # Excel workbook IO
-    "filelock>=3.24.3,<4",  # portable process-safe Excel workbook locks
+    "filelock>=4.2.1,<5",  # portable process-safe Excel workbook locks
     "Pint>=0.24.4",
     "platformdirs>=4.3.7",
     "promise>=2.3",

{generalmanager-0.87.0 → generalmanager-0.87.2/src/GeneralManager.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.87.0
+Version: 0.87.2
 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
@@ -47,7 +47,7 @@ License-File: LICENSE
 Requires-Dist: asgiref>=3.8.1
 Requires-Dist: celery<6.0.0,>=5.3.6
 Requires-Dist: channels>=4.1.0
-Requires-Dist: Django>=5.2.16
+Requires-Dist: Django>=5.2.17
 Requires-Dist: django-simple-history>=3.8.0
 Requires-Dist: exrex>=0.12.0
 Requires-Dist: factory_boy>=3.3.3
@@ -55,14 +55,14 @@ Requires-Dist: Faker>=37.1.0
 Requires-Dist: flexcache>=0.3
 Requires-Dist: flexparser>=0.4
 Requires-Dist: gitdb>=4.0.12
-Requires-Dist: GitPython>=3.1.58
+Requires-Dist: GitPython>=3.2.1
 Requires-Dist: graphene>=3.4.3
 Requires-Dist: graphene-django>=3.2.3
 Requires-Dist: graphql-core>=3.2.13
 Requires-Dist: graphql-relay>=3.2.0
 Requires-Dist: numpy>=2.2.5
 Requires-Dist: openpyxl<3.2.0,>=3.1.5
-Requires-Dist: filelock<4,>=3.24.3
+Requires-Dist: filelock<5,>=4.2.1
 Requires-Dist: Pint>=0.24.4
 Requires-Dist: platformdirs>=4.3.7
 Requires-Dist: promise>=2.3

{generalmanager-0.87.0 → generalmanager-0.87.2}/src/GeneralManager.egg-info/SOURCES.txt

@@ -40,6 +40,7 @@ src/general_manager/api/graphql_mutations.py
 src/general_manager/api/graphql_ordering.py
 src/general_manager/api/graphql_output.py
 src/general_manager/api/graphql_prefetch.py
+src/general_manager/api/graphql_query_permissions.py
 src/general_manager/api/graphql_relations.py
 src/general_manager/api/graphql_resolvers.py
 src/general_manager/api/graphql_search.py

{generalmanager-0.87.0 → generalmanager-0.87.2}/src/GeneralManager.egg-info/requires.txt

@@ -1,7 +1,7 @@
 asgiref>=3.8.1
 celery<6.0.0,>=5.3.6
 channels>=4.1.0
-Django>=5.2.16
+Django>=5.2.17
 django-simple-history>=3.8.0
 exrex>=0.12.0
 factory_boy>=3.3.3
@@ -9,14 +9,14 @@ Faker>=37.1.0
 flexcache>=0.3
 flexparser>=0.4
 gitdb>=4.0.12
-GitPython>=3.1.58
+GitPython>=3.2.1
 graphene>=3.4.3
 graphene-django>=3.2.3
 graphql-core>=3.2.13
 graphql-relay>=3.2.0
 numpy>=2.2.5
 openpyxl<3.2.0,>=3.1.5
-filelock<4,>=3.24.3
+filelock<5,>=4.2.1
 Pint>=0.24.4
 platformdirs>=4.3.7
 promise>=2.3

{generalmanager-0.87.0 → generalmanager-0.87.2}/src/general_manager/api/graphql.py

@@ -36,6 +36,9 @@ import graphene
 from asgiref.sync import async_to_sync
 from channels.layers import BaseChannelLayer
 from django.core.exceptions import ObjectDoesNotExist
+
+from general_manager.interface.requests import RequestNotFoundError
+from general_manager.manager.meta import AttributeEvaluationError
 from django.db import DEFAULT_DB_ALIAS, models, transaction
 from django.utils.module_loading import import_string
 
@@ -120,6 +123,7 @@ from general_manager.api.graphql_resolvers import (
     check_read_permission as _check_read_permission_fn,
     check_read_permission_for_user as _check_read_permission_for_user_fn,
     can_read_instance_for_user as _can_read_instance_for_user_fn,
+    can_read_class_for_user as _can_read_class_for_user_fn,
     create_measurement_resolver as _create_measurement_resolver_fn,
     create_normal_resolver as _create_normal_resolver_fn,
     create_list_resolver as _create_list_resolver_fn,
@@ -2260,17 +2264,32 @@ class GraphQL:
 
         def resolver(
             self: GeneralManager, info: GraphQLResolveInfo, **identification: object
-        ) -> GeneralManager:
+        ) -> GeneralManager | None:
             """
-            Instantiate and return a GeneralManager for the provided identification arguments.
+            Instantiate and authorize a manager before exposing its existence.
 
             Parameters:
                 identification (dict): Mapping of identification argument names to values passed to the manager constructor.
 
             Returns:
-                GeneralManager: The manager instance identified by the provided arguments.
+                GeneralManager | None: The readable manager, or None for missing
+                or unreadable targets.
             """
-            return generalManagerClass(**identification)
+            try:
+                instance = generalManagerClass(**identification)
+            except (ObjectDoesNotExist, RequestNotFoundError):
+                # Missing and unreadable targets share the same public response.
+                return None
+            try:
+                readable = _can_read_instance_for_user_fn(instance, info.context.user)
+            except RequestNotFoundError:
+                return None
+            except AttributeEvaluationError as error:
+                # Request-backed fields hydrate lazily during the row gate.
+                if isinstance(error.__cause__, RequestNotFoundError):
+                    return None
+                raise
+            return instance if readable else None
 
         cls._query_fields[item_field_name] = item_field
         cls._query_fields[f"resolve_{item_field_name}"] = resolver
@@ -2658,6 +2677,12 @@ class GraphQL:
                             continue
                         identification = message.get("identification")
                         if action == "refresh" and identification is None:
+                            if not await asyncio.to_thread(
+                                _can_read_class_for_user_fn,
+                                generalManagerClass,
+                                subscription_user,
+                            ):
+                                continue
                             clear_capability_context(info)
                             yield SubscriptionEvent(item=None, action=action)
                             continue

generalmanager-0.87.2/src/general_manager/api/graphql_query_permissions.py

@@ -0,0 +1,168 @@
+"""Authorize query operands before they influence membership or ordering."""
+
+from __future__ import annotations
+
+from collections.abc import Iterable
+from typing import TYPE_CHECKING
+
+from graphql import GraphQLError
+
+from general_manager.bucket.base_bucket import Bucket
+from general_manager.bucket.request_bucket import RequestBucket
+from general_manager.manager.general_manager import GeneralManager
+
+if TYPE_CHECKING:
+    from graphene import ResolveInfo
+
+
+class QueryFieldPermissionError(GraphQLError):
+    """A requested operand is not authorized on the candidate scope."""
+
+    def __init__(self, field: str) -> None:
+        super().__init__(f"Permission denied to use query field '{field}'.")
+
+
+_LIMIT_ERROR = "Query field authorization candidate limit exceeded."
+_AMBIGUOUS_ERROR = "Cannot authorize ambiguous query relation."
+_RELATION_ERROR = "Permission denied to traverse query relation."
+INCOMPLETE_ERROR = "Query field authorization requires a complete candidate set."
+CUSTOM_PROJECTION_ERROR = (
+    "Cannot authorize fields of a custom search document projection."
+)
+
+# Bound field/path decisions; bucket materialization and row checks precede this.
+MAX_QUERY_PERMISSION_CANDIDATES = 1000
+_LOOKUPS = {
+    "exact",
+    "iexact",
+    "in",
+    "isnull",
+    "lt",
+    "lte",
+    "gt",
+    "gte",
+    "contains",
+    "icontains",
+    "startswith",
+    "istartswith",
+    "endswith",
+    "iendswith",
+    "range",
+}
+
+
+def authorize_query_fields(
+    candidates: Iterable[GeneralManager], info: ResolveInfo, paths: Iterable[str]
+) -> None:
+    """Check all operands against every row-visible candidate, never just hits.
+
+    Related rows require their own row permission as well as field permission.
+    Failure leaves the original candidate set unchanged and rejects the query.
+    """
+    from general_manager.api.graphql_relations import (
+        resolve_general_manager_type,
+        get_graphql_manager_registry,
+    )
+    from general_manager.api.graphql_resolvers import (
+        can_read_instance,
+        check_read_permission,
+        relation_id_alias_field,
+    )
+
+    normalized = set()
+    for path in paths:
+        parts = path.split("__")
+        if parts:
+            normalized.add(tuple(parts))
+    if not normalized:
+        return
+    decisions = 0
+
+    def check(instance: GeneralManager, parts: tuple[str, ...]) -> None:
+        nonlocal decisions
+        decisions += 1
+        if decisions > MAX_QUERY_PERMISSION_CANDIDATES:
+            raise GraphQLError(_LIMIT_ERROR)
+        field, *rest = parts
+        attributes = instance.Interface.get_attribute_types()
+        # Backend collection lookup names can differ from public manager names.
+        aliases = [
+            name
+            for name, metadata in attributes.items()
+            if metadata.get("filter_lookup", name) == field
+        ]
+        names = set(aliases or [field])
+        for name in tuple(names):
+            relation = relation_id_alias_field(type(instance), name)
+            if relation is None and name.endswith("_id"):
+                alias = name.removesuffix("_id")
+                metadata: dict[str, object] = dict(attributes.get(alias, {}))
+                if (
+                    resolve_general_manager_type(
+                        metadata.get("type"), get_graphql_manager_registry()
+                    )
+                    is not None
+                ):
+                    relation = alias
+            if relation is not None:
+                names.add(relation)
+        known_fields = set(attributes) | set(instance.identification)
+        known_fields.update(instance.Interface.get_graph_ql_properties())
+        known_fields.update(instance.Interface.get_attributes())
+        if not names.intersection(known_fields):
+            raise QueryFieldPermissionError(field)
+        if any(not check_read_permission(instance, info, name) for name in names):
+            raise QueryFieldPermissionError(field)
+        if not rest:
+            return
+        if len(aliases) > 1:
+            raise GraphQLError(_AMBIGUOUS_ERROR)
+        field_metadata: dict[str, object] = dict(
+            attributes.get(aliases[0] if aliases else field, {})
+        )
+        if (
+            len(rest) == 1
+            and rest[0] in _LOOKUPS
+            and (
+                (field.endswith("_id") and len(names) > 1)
+                or (
+                    field_metadata.get("type") is not None
+                    and resolve_general_manager_type(
+                        field_metadata.get("type"), get_graphql_manager_registry()
+                    )
+                    is None
+                    and field_metadata.get("relation_kind")
+                    not in {"direct", "collection"}
+                )
+            )
+        ):
+            return
+        related_type = resolve_general_manager_type(
+            field_metadata.get("type"), get_graphql_manager_registry()
+        )
+        if len(rest) == 1 and rest[0] in _LOOKUPS and related_type is not None:
+            related_fields = set(related_type.Interface.get_attribute_types())
+            related_fields.update(related_type.Interface.get_attributes())
+            related_fields.update(related_type.Interface.get_graph_ql_properties())
+            if rest[0] not in related_fields:
+                return
+        value = getattr(instance, aliases[0] if aliases else field)
+        if value is None:
+            return
+        related = value if isinstance(value, (Bucket, list, tuple, set)) else [value]
+        for member in related:
+            if not isinstance(member, GeneralManager):
+                # A lookup is an operator only after resolving its preceding
+                # scalar field. A relation's field named "contains" is a field.
+                if len(rest) == 1 and rest[0] in _LOOKUPS:
+                    continue
+                raise GraphQLError(_RELATION_ERROR)
+            if not can_read_instance(member, info):
+                raise GraphQLError(_RELATION_ERROR)
+            check(member, tuple(rest))
+
+    for candidate in candidates:
+        for normalized_parts in sorted(normalized):
+            check(candidate, normalized_parts)
+    if isinstance(candidates, RequestBucket) and not candidates.response_is_complete:
+        raise GraphQLError(INCOMPLETE_ERROR)