plugin-scanner 2.0.987__tar.gz → 2.0.988__tar.gz

{plugin_scanner-2.0.987 → plugin_scanner-2.0.988}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plugin-scanner
-Version: 2.0.987
+Version: 2.0.988
 Summary: Protect local AI harnesses with HOL Guard and run scanner checks for Codex, Claude, Cursor, Gemini, OpenCode, and Pi.
 Project-URL: Homepage, https://github.com/hashgraph-online/hol-guard
 Project-URL: Repository, https://github.com/hashgraph-online/hol-guard

{plugin_scanner-2.0.987 → plugin_scanner-2.0.988}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "plugin-scanner"
-version = "2.0.987"
+version = "2.0.988"
 description = "Protect local AI harnesses with HOL Guard and run scanner checks for Codex, Claude, Cursor, Gemini, OpenCode, and Pi."
 readme = "README.md"
 license = "Apache-2.0"

{plugin_scanner-2.0.987 → plugin_scanner-2.0.988}/pyproject.toml.bak

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "hol-guard"
-version = "2.0.987"
+version = "2.0.988"
 description = "Protect local AI harnesses with HOL Guard and run scanner checks for Codex, Claude, Cursor, Gemini, OpenCode, and Pi."
 readme = "README.md"
 license = "Apache-2.0"

{plugin_scanner-2.0.987 → plugin_scanner-2.0.988}/src/codex_plugin_scanner/guard/review_contracts.py

@@ -26,7 +26,7 @@ from .policy_bundle_trusted_keys import (
 _LOCAL_REVIEW_REQUEST_CONTRACT_VERSION = "guard.local-review-request.v1"
 _REMOTE_APPROVAL_CONTRACT_VERSION = "guard.remote-approval.v1"
 _DECISION_MEMORY_BUNDLE_CONTRACT_VERSION = "guard.decision-memory-bundle.v1"
-_REMOTE_APPROVAL_REQUIRED_SCOPE = "artifact"
+_REMOTE_APPROVAL_ALLOWED_SCOPES = frozenset(("artifact", "one-time"))
 _REMOTE_APPROVAL_SIGNATURE_ALGORITHM = "rsa-pss-sha256"
 _DECISION_MEMORY_SIGNATURE_ALGORITHM = "rsa-pss-sha256"
 _CLAIM_HASH_KEYS = ("claimHash",)
@@ -363,7 +363,7 @@ def payload_hash_for_remote_approval_envelope(envelope: dict[str, object]) -> st
 def validated_remote_approval_envelope(envelope: dict[str, object], *, store) -> dict[str, object]:
     if envelope.get("contractVersion") != _REMOTE_APPROVAL_CONTRACT_VERSION:
         raise GuardReviewContractError("unsupported_remote_approval_contract")
-    if envelope.get("scope") != _REMOTE_APPROVAL_REQUIRED_SCOPE:
+    if envelope.get("scope") not in _REMOTE_APPROVAL_ALLOWED_SCOPES:
         raise GuardReviewContractError("invalid_remote_approval_scope")
     issued_at = _parse_iso_timestamp(envelope.get("issuedAt"), field_name="issued_at")
     expires_at = _parse_iso_timestamp(envelope.get("expiresAt"), field_name="expires_at")
@@ -408,6 +408,10 @@ def validate_remote_approval_request_binding(
     expected_claim = build_local_review_request_claim(request_row=request_row, oauth=oauth, store=store)
     if _non_empty_string(envelope.get("sourceClaimHash")) != _non_empty_string(expected_claim.get("claimHash")):
         raise GuardReviewContractError("remote_approval_claim_hash_mismatch")
+    envelope_scope = _non_empty_string(envelope.get("scope"))
+    request_scope = _non_empty_string(request_row.get("recommended_scope"))
+    if envelope_scope != request_scope:
+        raise GuardReviewContractError("remote_approval_scope_mismatch")
 
 
 def payload_hash_for_decision_memory_bundle(bundle: dict[str, object]) -> str:

{plugin_scanner-2.0.987 → plugin_scanner-2.0.988}/src/codex_plugin_scanner/version.py

@@ -1,3 +1,3 @@
 """Single source of truth for tool version."""
 
-__version__ = "2.0.987"
+__version__ = "2.0.988"

{plugin_scanner-2.0.987 → plugin_scanner-2.0.988}/tests/test_guard_command_queue.py

@@ -18,10 +18,13 @@ from codex_plugin_scanner.guard.daemon.command_queue_worker import (
     start_command_queue_worker,
 )
 from codex_plugin_scanner.guard.review_contracts import (
+    GuardReviewContractError,
     build_local_review_request_claim,
     guard_review_oauth_metadata,
     payload_hash_for_decision_memory_bundle,
     payload_hash_for_remote_approval_envelope,
+    validate_remote_approval_request_binding,
+    validated_remote_approval_envelope,
 )
 from codex_plugin_scanner.guard.runtime import command_executors, command_queue
 from codex_plugin_scanner.guard.runtime import runner as guard_runner_module
@@ -153,6 +156,7 @@ def _signed_remote_approval(
     *,
     decision: str = "allow_once",
     receipt_id: str = "cloud-receipt-1",
+    scope: str | None = None,
 ) -> dict[str, object]:
     oauth = guard_review_oauth_metadata(store)
     claim = build_local_review_request_claim(
@@ -185,7 +189,7 @@ def _signed_remote_approval(
         "reviewerUserId": "user-1",
         "riskCategory": claim["riskCategory"],
         "runtimeGrantId": claim["runtimeGrantId"],
-        "scope": "artifact",
+        "scope": scope if scope is not None else str(request_row.get("recommended_scope") or "artifact"),
         "sourceClaimHash": claim["claimHash"],
         "stepUpChallengeId": None,
         "workspaceId": claim["workspaceId"],
@@ -2495,8 +2499,7 @@ def test_executor_rejects_remote_approval_for_unsupported_scope(tmp_path: Path)
         store=store,  # type: ignore[arg-type]
         now=lambda: "2026-06-13T00:00:00+00:00",
     )
-
-    assert result["failureCode"] == "remote_approval_not_permitted"
+    assert result["failureCode"] == "invalid_remote_approval_scope"
     assert store.claimed_receipts == []
     assert store.resolved == []
 
@@ -2645,3 +2648,140 @@ def test_executor_resolves_one_time_scope_with_block(tmp_path: Path) -> None:
         }
     ]
     assert len(store.claimed_receipts) == 1
+def test_validated_remote_approval_envelope_accepts_one_time_scope(tmp_path: Path) -> None:
+    """The envelope validator must accept scope='one-time', not just 'artifact'."""
+
+    class OneTimeEnvelopeStore(FakeStore):
+        def __init__(self, guard_home: Path) -> None:
+            super().__init__(guard_home)
+            self.request_row = _approval_request_row(
+                "request-ot-envelope",
+                policy_action="require-reapproval",
+                recommended_scope="one-time",
+            )
+
+        def get_approval_request(self, request_id: str) -> dict[str, object] | None:
+            return self.request_row if request_id == "request-ot-envelope" else None
+
+    store = OneTimeEnvelopeStore(tmp_path)
+    envelope = _signed_remote_approval(store, store.request_row)
+    assert envelope["scope"] == "one-time"
+
+    validated = validated_remote_approval_envelope(envelope, store=store)
+    assert validated["scope"] == "one-time"
+
+
+def test_validated_remote_approval_envelope_rejects_unsupported_scope(tmp_path: Path) -> None:
+    """The envelope validator must reject scopes outside artifact/one-time."""
+
+    class WorkspaceEnvelopeStore(FakeStore):
+        def __init__(self, guard_home: Path) -> None:
+            super().__init__(guard_home)
+            self.request_row = _approval_request_row(
+                "request-bad-envelope",
+                policy_action="require-reapproval",
+                recommended_scope="workspace",
+            )
+
+        def get_approval_request(self, request_id: str) -> dict[str, object] | None:
+            return self.request_row if request_id == "request-bad-envelope" else None
+
+    store = WorkspaceEnvelopeStore(tmp_path)
+    envelope = _signed_remote_approval(store, store.request_row)
+    with pytest.raises(GuardReviewContractError, match="invalid_remote_approval_scope"):
+        validated_remote_approval_envelope(envelope, store=store)
+
+
+def test_binding_rejects_remote_approval_envelope_scope_mismatch(tmp_path: Path) -> None:
+    """A signed envelope whose scope differs from the request recommended_scope is rejected."""
+
+    class MismatchScopeStore(FakeStore):
+        def __init__(self, guard_home: Path) -> None:
+            super().__init__(guard_home)
+            self.request_row = _approval_request_row(
+                "request-scope-mismatch",
+                policy_action="require-reapproval",
+                recommended_scope="artifact",
+            )
+
+        def get_approval_request(self, request_id: str) -> dict[str, object] | None:
+            return self.request_row if request_id == "request-scope-mismatch" else None
+
+    store = MismatchScopeStore(tmp_path)
+    # Build a validly-signed envelope with scope='one-time' against an 'artifact' request.
+    envelope = _signed_remote_approval(store, store.request_row, scope="one-time")
+    oauth = guard_review_oauth_metadata(store)
+    with pytest.raises(GuardReviewContractError, match="remote_approval_scope_mismatch"):
+        validate_remote_approval_request_binding(
+            envelope=envelope,
+            request_row=store.request_row,
+            oauth=oauth,
+            store=store,
+        )
+
+
+def test_executor_rejects_remote_approval_envelope_scope_mismatch(tmp_path: Path) -> None:
+    """A one-time envelope cannot bind to an artifact request through the executor path."""
+
+    class MismatchScopeExecutorStore(FakeStore):
+        def __init__(self, guard_home: Path) -> None:
+            super().__init__(guard_home)
+            self.claimed_receipts: list[str] = []
+            self.resolved: list[dict[str, object]] = []
+            self.request_row = _approval_request_row(
+                "request-scope-mismatch-exec",
+                policy_action="require-reapproval",
+                recommended_scope="artifact",
+            )
+
+        def get_approval_request(self, request_id: str) -> dict[str, object] | None:
+            return self.request_row if request_id == "request-scope-mismatch-exec" else None
+
+        def claim_remote_once_receipt(
+            self,
+            receipt_id: str,
+            *,
+            request_id: str,
+            claimed_at: str,
+        ) -> bool:
+            del request_id, claimed_at
+            self.claimed_receipts.append(receipt_id)
+            return True
+
+        def resolve_request_with_signed_remote_result(
+            self,
+            request_id: str,
+            *,
+            resolution_action: str,
+            resolution_scope: str,
+            reason: str | None,
+            signed_remote_result: dict[str, object],
+        ) -> dict[str, object]:
+            del resolution_action, resolution_scope, reason, signed_remote_result
+            self.resolved.append({"request_id": request_id})
+            return {"resolved": True, "resolved_request": {"request_id": request_id}}
+
+    store = MismatchScopeExecutorStore(tmp_path / "guard-home")
+    # Envelope scope is 'one-time' but the request recommends 'artifact'.
+    remote_approval = _signed_remote_approval(
+        store,
+        store.request_row,
+        receipt_id="cloud-receipt-scope-mismatch",
+        scope="one-time",
+    )
+    result = command_executors.execute_guard_command_job(
+        {
+            "operation": "guard.approval.resolve",
+            "payload": {
+                "localRequestId": "request-scope-mismatch-exec",
+                "action": "allow_once",
+                "remoteApproval": remote_approval,
+            },
+        },
+        context=_context(tmp_path),
+        store=store,  # type: ignore[arg-type]
+        now=lambda: "2026-06-13T00:00:00+00:00",
+    )
+    assert result["failureCode"] == "remote_approval_scope_mismatch"
+    assert store.claimed_receipts == []
+    assert store.resolved == []

{plugin_scanner-2.0.987 → plugin_scanner-2.0.988}/uv.lock

@@ -1162,7 +1162,7 @@ wheels = [
 
 [[package]]
 name = "hol-guard"
-version = "2.0.987"
+version = "2.0.988"
 source = { editable = "." }
 dependencies = [
     { name = "cisco-ai-skill-scanner", marker = "python_full_version < '3.14'" },