From ee554d22a327723c29382c174eea719b957e4de5 Mon Sep 17 00:00:00 2001 From: Seongho Bae Date: Tue, 8 Sep 2026 13:13:17 +0900 Subject: [PATCH 1/9] test(scanner): fail closed on plugin aws gcloud and az deploy Lock executable aws cloudformation deploy, aws deploy create-deployment, gcloud run/app/functions deploy, and az webapp deploy. Keep reads, comments, echo lookalikes, and vercel on their existing classes. Relates to #1099. --- tests/test_claude_plugin_cloud_deploy.py | 216 +++++++++++++++++++++++ 1 file changed, 216 insertions(+) create mode 100644 tests/test_claude_plugin_cloud_deploy.py diff --git a/tests/test_claude_plugin_cloud_deploy.py b/tests/test_claude_plugin_cloud_deploy.py new file mode 100644 index 00000000..caf5b13d --- /dev/null +++ b/tests/test_claude_plugin_cloud_deploy.py @@ -0,0 +1,216 @@ +"""Hook aws/gcloud/az deploy writes fail closed; reads stay inventory.""" + +from __future__ import annotations + +import json +from pathlib import Path + +from appguardrail_core.claude_plugin_detector import ( + _collect_plugin_hits, + build_claude_plugin_scan_receipt, + inspect_claude_plugin_file, + inventory_claude_plugin_capabilities, +) + + +_PINNED_COMMIT = "a727be1c7bd6064419b6f60d71993a19198adc17" +_AWS_RULE = "claude-plugin-aws-deploy-command" +_GCLOUD_RULE = "claude-plugin-gcloud-deploy-command" +_AZ_RULE = "claude-plugin-az-deploy-command" +_VERCEL_RULE = "claude-plugin-vercel-deploy-command" +_SECRET = "sk-cloud-must-not-leak" +_BIDI = "\u202e" +_THIS_CLASS = frozenset({_AWS_RULE, _GCLOUD_RULE, _AZ_RULE}) + + +def _write_json(path: Path, payload: dict) -> None: + """Write one JSON document under ``path``.""" + path.parent.mkdir(parents=True, exist_ok=True) + path.write_text(json.dumps(payload, indent=2) + "\n", encoding="utf-8") + + +def _licensed_plugin(root: Path, hook_body: str = "#!/bin/sh\necho hello\n") -> Path: + """Write a pinned licensed plugin with one declared shell hook.""" + _write_json( + root / ".claude-plugin" / "plugin.json", + { + "name": "safe-plugin", + "version": "1.0.0", + "source": { + "source": "github", + "repo": "example/safe-plugin", + "ref": _PINNED_COMMIT, + }, + "hooks": {"PreToolUse": [{"command": "hooks/session.sh"}]}, + }, + ) + hook = root / "hooks" / "session.sh" + hook.parent.mkdir(parents=True, exist_ok=True) + hook.write_text(hook_body, encoding="utf-8") + hook.chmod(0o755) + (root / "LICENSE").write_text("MIT\n", encoding="utf-8") + return root + + +def _hits(root: Path, rule_id: str): + """Return receipt-path hits for one rule identity.""" + return [hit for hit in _collect_plugin_hits(root) if hit.rule_id == rule_id] + + +def test_hook_aws_cloudformation_deploy_fails_admission(tmp_path: Path) -> None: + """``aws cloudformation deploy`` on a hook is cloud write authority.""" + root = _licensed_plugin( + tmp_path, "#!/bin/sh\naws cloudformation deploy --stack-name app\n" + ) + hits = _hits(root, _AWS_RULE) + receipt = build_claude_plugin_scan_receipt(root) + inventory = inventory_claude_plugin_capabilities(root) + + assert hits + assert all(hit.snippet == "aws cloudformation deploy" for hit in hits) + assert receipt.scan_result == "fail" + assert _AWS_RULE in receipt.finding_summary + assert _GCLOUD_RULE not in receipt.finding_summary + assert inventory["deployment_write"] is True + + +def test_hook_gcloud_run_deploy_fails_admission(tmp_path: Path) -> None: + """``gcloud run deploy`` on a hook is cloud write authority.""" + root = _licensed_plugin(tmp_path, "#!/bin/sh\ngcloud run deploy app --image img\n") + hits = _hits(root, _GCLOUD_RULE) + receipt = build_claude_plugin_scan_receipt(root) + + assert hits + assert all(hit.snippet == "gcloud run deploy" for hit in hits) + assert receipt.scan_result == "fail" + assert _GCLOUD_RULE in receipt.finding_summary + assert _AWS_RULE not in receipt.finding_summary + + +def test_hook_az_webapp_deploy_fails_admission(tmp_path: Path) -> None: + """``az webapp deploy`` on a hook is cloud write authority.""" + root = _licensed_plugin(tmp_path, "#!/bin/sh\naz webapp deploy --name app\n") + hits = _hits(root, _AZ_RULE) + receipt = build_claude_plugin_scan_receipt(root) + + assert hits + assert all(hit.snippet == "az webapp deploy" for hit in hits) + assert receipt.scan_result == "fail" + assert _AZ_RULE in receipt.finding_summary + + +def test_aws_s3_ls_and_gcloud_config_stay_inventory(tmp_path: Path) -> None: + """Read-only cloud CLIs stay inventory, not this class.""" + root = _licensed_plugin( + tmp_path, + "#!/bin/sh\naws s3 ls\ngcloud config list\naz account show\n", + ) + receipt = build_claude_plugin_scan_receipt(root) + + assert _THIS_CLASS.isdisjoint(receipt.finding_summary) + assert receipt.scan_result == "pass" + + +def test_comment_and_echo_cloud_deploy_are_not_this_class(tmp_path: Path) -> None: + """Unquoted comments and echo lookalikes are not executable cloud deploys.""" + root = _licensed_plugin( + tmp_path, + '#!/bin/sh\n# aws cloudformation deploy\necho "gcloud run deploy"\n', + ) + receipt = build_claude_plugin_scan_receipt(root) + assert _THIS_CLASS.isdisjoint(receipt.finding_summary) + assert receipt.scan_result == "pass" + + +def test_readme_gcloud_deploy_is_not_this_class(tmp_path: Path) -> None: + """README cloud-deploy wording is repository guidance, not a hook command.""" + root = _licensed_plugin(tmp_path) + (root / "README.md").write_text("gcloud run deploy app --image img\n", encoding="utf-8") + receipt = build_claude_plugin_scan_receipt(root) + inventory = inventory_claude_plugin_capabilities(root) + + assert _hits(root, _GCLOUD_RULE) == [] + assert receipt.scan_result == "pass" + assert inventory["deployment_write"] is True + + +def test_three_clouds_on_one_hook_are_distinct_findings(tmp_path: Path) -> None: + """One hook can fail closed on aws, gcloud, and az deploy writes.""" + root = _licensed_plugin( + tmp_path, + "#!/bin/sh\n" + "aws cloudformation deploy --stack-name app\n" + "gcloud app deploy\n" + "az webapp deploy --name app\n", + ) + receipt = build_claude_plugin_scan_receipt(root) + assert _hits(root, _AWS_RULE) + assert _hits(root, _GCLOUD_RULE) + assert _hits(root, _AZ_RULE) + assert receipt.scan_result == "fail" + assert _VERCEL_RULE not in receipt.finding_summary + + +def test_aws_deploy_create_deployment_fails_admission() -> None: + """``aws deploy create-deployment`` is the same aws-deploy class.""" + body = "#!/bin/sh\naws deploy create-deployment --application-name app\n" + hits = inspect_claude_plugin_file("session.sh", "hooks/session.sh", body) + assert any( + hit.rule_id == _AWS_RULE and hit.snippet == "aws deploy create-deployment" + for hit in hits + ) + + +def test_gcloud_functions_deploy_canonicalizes_snippet() -> None: + """``gcloud functions deploy`` keeps the service token in the snippet.""" + body = "#!/bin/sh\ngcloud functions deploy fn --runtime python312\n" + hits = inspect_claude_plugin_file("session.sh", "hooks/session.sh", body) + assert any( + hit.rule_id == _GCLOUD_RULE and hit.snippet == "gcloud functions deploy" + for hit in hits + ) + + +def test_snippets_are_command_labels_not_secrets(tmp_path: Path) -> None: + """Snippets name the CLI command and omit secrets and bidi.""" + body = f"#!/bin/sh\naws cloudformation deploy --parameter-overrides t={_SECRET}{_BIDI}\n" + root = _licensed_plugin(tmp_path, body) + hits = inspect_claude_plugin_file("session.sh", "hooks/session.sh", body) + aws_hits = [hit for hit in hits if hit.rule_id == _AWS_RULE] + payload = json.dumps(build_claude_plugin_scan_receipt(root).as_dict()) + + assert aws_hits + for hit in aws_hits: + assert hit.snippet == "aws cloudformation deploy" + assert _SECRET not in hit.snippet + assert _BIDI not in hit.snippet + assert _SECRET not in hit.message + assert _SECRET not in payload + assert _BIDI not in payload + + +def test_plugin_manifest_az_webapp_deploy_fails_admission(tmp_path: Path) -> None: + """A plugin.json command string that deploys to Azure is the az class.""" + root = _licensed_plugin(tmp_path) + manifest = json.loads( + (root / ".claude-plugin" / "plugin.json").read_text(encoding="utf-8") + ) + manifest["hooks"] = { + "PostToolUse": [{"command": "az webapp deploy --name app"}], + } + _write_json(root / ".claude-plugin" / "plugin.json", manifest) + receipt = build_claude_plugin_scan_receipt(root) + assert _hits(root, _AZ_RULE) + assert receipt.scan_result == "fail" + + +def test_vercel_deploy_without_cloud_stays_the_vercel_class() -> None: + """Hosted vercel deploy without aws/gcloud/az stays the vercel class.""" + hits = inspect_claude_plugin_file( + "session.sh", + "hooks/session.sh", + "#!/bin/sh\nvercel deploy --prod\n", + ) + rule_ids = {hit.rule_id for hit in hits} + assert _VERCEL_RULE in rule_ids + assert _THIS_CLASS.isdisjoint(rule_ids) From af6aa91a2e2eed8ddbb30677b5af780eff52e19b Mon Sep 17 00:00:00 2001 From: Seongho Bae Date: Tue, 8 Sep 2026 13:13:18 +0900 Subject: [PATCH 2/9] feat(scanner): reject plugin aws gcloud and az deploy writes Fail closed on executable aws cloudformation deploy and aws deploy create-deployment as claude-plugin-aws-deploy-command, gcloud run/app/functions deploy as claude-plugin-gcloud-deploy-command, and az webapp deploy as claude-plugin-az-deploy-command. Reads, comments, and echo lookalikes stay inventory. Relates to #1099. --- .../1099-claude-plugin-supply-chain.md | 10 +- appguardrail_core/claude_plugin_detector.py | 115 +++++++++++++++++- docs/TRACEABILITY.md | 2 +- docs/sast-dast-rule-research.md | 8 +- 4 files changed, 126 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.d/1099-claude-plugin-supply-chain.md b/CHANGELOG.d/1099-claude-plugin-supply-chain.md index 36d34743..44520912 100644 --- a/CHANGELOG.d/1099-claude-plugin-supply-chain.md +++ b/CHANGELOG.d/1099-claude-plugin-supply-chain.md @@ -145,10 +145,16 @@ ``helm install`` fails as `claude-plugin-helm-install-command`. ``vercel deploy`` fails as `claude-plugin-vercel-deploy-command`. ``fly deploy`` and ``flyctl deploy`` fail as - `claude-plugin-fly-deploy-command`. Hook comments and + `claude-plugin-fly-deploy-command`. ``aws cloudformation deploy`` + and ``aws deploy create-deployment`` fail as + `claude-plugin-aws-deploy-command`. ``gcloud run|app|functions + deploy`` fails as `claude-plugin-gcloud-deploy-command`. + ``az webapp deploy`` fails as `claude-plugin-az-deploy-command`. + Hook comments and ``echo``/``printf`` lookalikes are not those classes. ``terraform plan``, ``helm list``, - ``vercel ls``, and ``fly status`` + ``vercel ls``, ``fly status``, ``aws s3 ls``, ``gcloud config list``, + and ``az account show`` stay inventory. Hardcoded PATs stay `claude-plugin-github-write-token`. Snippets are command labels, not tokens. diff --git a/appguardrail_core/claude_plugin_detector.py b/appguardrail_core/claude_plugin_detector.py index d18477fa..0c9c93ea 100644 --- a/appguardrail_core/claude_plugin_detector.py +++ b/appguardrail_core/claude_plugin_detector.py @@ -24,9 +24,13 @@ deployment-write command findings. Hook or manifest ``terraform apply`` and ``helm install`` fail closed as infra-write command findings. Hook or manifest ``vercel deploy`` and ``fly deploy`` fail closed as -hosted-deploy command findings. Unquoted ``#`` comments and +hosted-deploy command findings. Hook or manifest ``aws cloudformation +deploy``, ``aws deploy create-deployment``, ``gcloud run|app|functions +deploy``, and ``az webapp deploy`` fail closed as cloud-deploy command +findings. Unquoted ``#`` comments and ``echo``/``printf``/``print`` lookalikes are not that class. -``terraform plan``, ``helm list``, ``vercel ls``, and ``fly status`` +``terraform plan``, ``helm list``, ``vercel ls``, ``fly status``, +``aws s3 ls``, ``gcloud config list``, and ``az account show`` stay inventory. Hook or manifest paths into ``~/.netrc``, ``~/.aws/credentials``, GitHub CLI hosts, Docker auth ``config.json``, cookie jars, and @@ -34,7 +38,8 @@ Chrome and Firefox profile stores stay browser-profile findings. Hardcoded PATs stay write-token findings. ``gh issue create``, ``gh pr review``, ``kubectl get``, ``docker ps``, -``terraform plan``, ``helm list``, ``vercel ls``, and ``fly status`` +``terraform plan``, ``helm list``, ``vercel ls``, ``fly status``, +``aws s3 ls``, ``gcloud config list``, and ``az account show`` stay inventory. Skill homoglyph, injection, exfiltration, and placeholder hits reuse #1036 rule identities. Skill, command, or agent text that hides tool use, rewrites @@ -276,6 +281,21 @@ "hosted platform is write authority. Remove the command. " "[CWE-250 - Execution with Unnecessary Privileges]" ) +CLAUDE_PLUGIN_AWS_DEPLOY_COMMAND_MESSAGE: Final = ( + "Claude plugin hook or manifest runs AWS deploy writes. CloudFormation " + "deploy and CodeDeploy create-deployment are write authority. Remove " + "the command. [CWE-269 - Improper Privilege Management]" +) +CLAUDE_PLUGIN_GCLOUD_DEPLOY_COMMAND_MESSAGE: Final = ( + "Claude plugin hook or manifest runs gcloud deploy. Publishing Cloud " + "Run, App Engine, or Functions is write authority. Remove the command. " + "[CWE-250 - Execution with Unnecessary Privileges]" +) +CLAUDE_PLUGIN_AZ_DEPLOY_COMMAND_MESSAGE: Final = ( + "Claude plugin hook or manifest runs az webapp deploy. Publishing an " + "Azure web app is write authority. Remove the command. " + "[CWE-269 - Improper Privilege Management]" +) CLAUDE_PLUGIN_DOCKER_SOCKET_MESSAGE: Final = ( "Claude plugin hook reaches the host Docker socket. Socket access is host " "control, not an image push. Remove the socket bind and keep builds " @@ -402,6 +422,15 @@ _HELM_INSTALL_COMMAND = re.compile(r"\bhelm\s+install\b", re.IGNORECASE) _VERCEL_DEPLOY_COMMAND = re.compile(r"\bvercel\s+deploy\b", re.IGNORECASE) _FLY_DEPLOY_COMMAND = re.compile(r"\b(?:fly|flyctl)\s+deploy\b", re.IGNORECASE) +_AWS_DEPLOY_COMMAND = re.compile( + r"\baws\s+(?:cloudformation\s+deploy|deploy\s+create-deployment)\b", + re.IGNORECASE, +) +_GCLOUD_DEPLOY_COMMAND = re.compile( + r"\bgcloud\s+(?Prun|app|functions)\s+deploy\b", + re.IGNORECASE, +) +_AZ_DEPLOY_COMMAND = re.compile(r"\baz\s+webapp\s+deploy\b", re.IGNORECASE) _REPORTING_BUILTINS: Final = frozenset({"echo", "printf", "print"}) _FIRST_SHELL_TOKEN = re.compile(r"\s*([A-Za-z0-9_./+-]+)") _DOCKER_SOCKET = re.compile( @@ -638,7 +667,9 @@ "deployment_write", re.compile( r"\b(?:kubectl\s+apply|terraform\s+apply|helm\s+install|" - r"vercel\s+deploy|fly(?:ctl)?\s+deploy|docker\s+push)\b", + r"vercel\s+deploy|fly(?:ctl)?\s+deploy|docker\s+push|" + r"aws\s+(?:cloudformation\s+deploy|deploy\s+create-deployment)|" + r"gcloud\s+(?:run|app|functions)\s+deploy|az\s+webapp\s+deploy)\b", re.IGNORECASE, ), ), @@ -894,6 +925,9 @@ def inspect_claude_plugin_file( hits.extend(_helm_install_command_hits(content)) hits.extend(_vercel_deploy_command_hits(content)) hits.extend(_fly_deploy_command_hits(content)) + hits.extend(_aws_deploy_command_hits(content)) + hits.extend(_gcloud_deploy_command_hits(content)) + hits.extend(_az_deploy_command_hits(content)) hits.extend(_docker_socket_hits(content)) hits.extend(_browser_profile_hits(content)) hits.extend(_credential_store_hits(content)) @@ -1865,6 +1899,79 @@ def _fly_deploy_command_hits(content: str) -> tuple[PluginHit, ...]: ) +def _aws_deploy_command_hits(content: str) -> tuple[PluginHit, ...]: + """Return AWS deploy-write findings with a command label, not secrets. + + Args: + content: Hook or manifest text. + + Returns: + One hit for executable ``aws cloudformation deploy`` or + ``aws deploy create-deployment``. ``aws s3 ls`` and echo + lookalikes are not this class. + """ + match = _executable_command_match(content, _AWS_DEPLOY_COMMAND) + if match is None: + return () + token = match.group(0).lower() + snippet = " ".join(token.split()) + return ( + PluginHit( + rule_id="claude-plugin-aws-deploy-command", + line=content[: match.start()].count("\n") + 1, + snippet=snippet, + message=CLAUDE_PLUGIN_AWS_DEPLOY_COMMAND_MESSAGE, + ), + ) + + +def _gcloud_deploy_command_hits(content: str) -> tuple[PluginHit, ...]: + """Return gcloud deploy findings with a service-qualified command label. + + Args: + content: Hook or manifest text. + + Returns: + One hit for executable ``gcloud run|app|functions deploy``. + ``gcloud config list`` is not this class. + """ + match = _executable_command_match(content, _GCLOUD_DEPLOY_COMMAND) + if match is None: + return () + service = match.group("service").lower() + return ( + PluginHit( + rule_id="claude-plugin-gcloud-deploy-command", + line=content[: match.start()].count("\n") + 1, + snippet=f"gcloud {service} deploy", + message=CLAUDE_PLUGIN_GCLOUD_DEPLOY_COMMAND_MESSAGE, + ), + ) + + +def _az_deploy_command_hits(content: str) -> tuple[PluginHit, ...]: + """Return Azure webapp deploy findings with a command label, not names. + + Args: + content: Hook or manifest text. + + Returns: + One hit for executable ``az webapp deploy``. ``az account show`` + is not this class. + """ + match = _executable_command_match(content, _AZ_DEPLOY_COMMAND) + if match is None: + return () + return ( + PluginHit( + rule_id="claude-plugin-az-deploy-command", + line=content[: match.start()].count("\n") + 1, + snippet="az webapp deploy", + message=CLAUDE_PLUGIN_AZ_DEPLOY_COMMAND_MESSAGE, + ), + ) + + def _dynamic_eval_hits(content: str) -> tuple[PluginHit, ...]: """Return findings for eval/exec/compile/Function on hook surfaces.""" match = _DYNAMIC_EVAL.search(content) diff --git a/docs/TRACEABILITY.md b/docs/TRACEABILITY.md index b98dabdc..5b14a3d6 100644 --- a/docs/TRACEABILITY.md +++ b/docs/TRACEABILITY.md @@ -22,7 +22,7 @@ | structural Semgrep-style `pattern:` execution by lightweight engine | built-in scanner | not implemented unless a real structural matcher is added; fixtures are not execution | | GitHub Actions transport-only polling loop (#1087, #938 vertical slice) | owned by PR #1088 / issue #1087; YAML rules and RED precision contracts | mapped-family only; this successor does not ship or close the detector | | Password/database-url/auth-comment precision and test-file context (#1106) | existing `_scan_file` rules `hardcoded-password`, `hardcoded-database-url`, `todo-skip-auth`, `_finding_context` | implemented-branch regression lock | -| Claude plugin marketplace/package supply chain (#1099) | `claude-plugin-floating-git-ref`, `claude-plugin-provider-secret`, `claude-plugin-pipe-to-shell`, `claude-plugin-unsigned-executable-download` (hooks and package.json lifecycle scripts), `claude-plugin-unpinned-package-install`, `claude-plugin-undeclared-executable`, `claude-plugin-symlink-escape`, `claude-plugin-archive-path-traversal`, `claude-plugin-unadmitted-submodule`, `claude-plugin-duplicate-json-member`, `claude-plugin-nonstandard-json-constant`, `claude-plugin-malformed-utf8`, `claude-plugin-inconsistent-normalized-name`, `claude-plugin-vendored-scope-undeclared`, `claude-plugin-conflicting-identity`, `claude-plugin-unbounded-mcp`, `claude-plugin-license-missing`, `claude-plugin-license-mismatch`, `claude-plugin-dynamic-eval`, `claude-plugin-hidden-undeclared-executable`, `claude-plugin-concealed-identity`, `claude-plugin-oversized-package`, `claude-plugin-source-mismatch`, `claude-plugin-github-write-token`, `claude-plugin-docker-socket`, `claude-plugin-browser-profile-access`, `claude-plugin-deceptive-description`, `claude-plugin-secret-to-network`, `claude-plugin-secret-to-prompt`, `claude-plugin-secret-to-mcp`, `claude-plugin-hide-actions-directive` / `claude-plugin-self-modify-directive` / `claude-plugin-goal-escalation-directive`, `claude-plugin-setuid-executable` / `claude-plugin-world-writable-executable`, `claude-plugin-decompression-bomb`, reused #1036 `skill-name-homoglyph-confusable` / `skill-manifest-prompt-injection-payload` / `skill-doc-exfiltration-endpoint-directive` / `skill-placeholder-template-unresolved` on plugin skill/agent/command surfaces, deterministic scan receipt with catalog repository/SHA bind, SARIF 2.1.0 `sarif_sha256` bound to the same finding rule_ids, `policy_provenance` bound to the AppGuardrail release plus exact scan-policy digest, and `sbom_sha256` of a deterministic CycloneDX 1.5 document, `claude-plugin-checksum-mismatch` when a first-party SHA256SUMS or sibling `*.sha256` disagrees with bytes on disk, `claude-plugin-unsigned-checksum` when checksum digest rows have no sibling Cosign/GPG signature file, `claude-plugin-excessive-path-depth` when a materialized file or archive member nests past 32 path components, `claude-plugin-github-merge-command` for hook or manifest `gh pr merge`, `claude-plugin-github-release-command` for `gh release create|upload|delete|edit`, `claude-plugin-kubectl-apply-command` for hook or manifest `kubectl apply`, `claude-plugin-docker-push-command` for `docker push`, `claude-plugin-terraform-apply-command` for `terraform apply`, `claude-plugin-helm-install-command` for `helm install`, `claude-plugin-vercel-deploy-command` for hook or manifest `vercel deploy`, `claude-plugin-fly-deploy-command` for `fly deploy`, `claude-plugin-credential-store-access` for host cookie and token stores that are not browser profiles, fail-closed receipt verification | implemented-branch | +| Claude plugin marketplace/package supply chain (#1099) | `claude-plugin-floating-git-ref`, `claude-plugin-provider-secret`, `claude-plugin-pipe-to-shell`, `claude-plugin-unsigned-executable-download` (hooks and package.json lifecycle scripts), `claude-plugin-unpinned-package-install`, `claude-plugin-undeclared-executable`, `claude-plugin-symlink-escape`, `claude-plugin-archive-path-traversal`, `claude-plugin-unadmitted-submodule`, `claude-plugin-duplicate-json-member`, `claude-plugin-nonstandard-json-constant`, `claude-plugin-malformed-utf8`, `claude-plugin-inconsistent-normalized-name`, `claude-plugin-vendored-scope-undeclared`, `claude-plugin-conflicting-identity`, `claude-plugin-unbounded-mcp`, `claude-plugin-license-missing`, `claude-plugin-license-mismatch`, `claude-plugin-dynamic-eval`, `claude-plugin-hidden-undeclared-executable`, `claude-plugin-concealed-identity`, `claude-plugin-oversized-package`, `claude-plugin-source-mismatch`, `claude-plugin-github-write-token`, `claude-plugin-docker-socket`, `claude-plugin-browser-profile-access`, `claude-plugin-deceptive-description`, `claude-plugin-secret-to-network`, `claude-plugin-secret-to-prompt`, `claude-plugin-secret-to-mcp`, `claude-plugin-hide-actions-directive` / `claude-plugin-self-modify-directive` / `claude-plugin-goal-escalation-directive`, `claude-plugin-setuid-executable` / `claude-plugin-world-writable-executable`, `claude-plugin-decompression-bomb`, reused #1036 `skill-name-homoglyph-confusable` / `skill-manifest-prompt-injection-payload` / `skill-doc-exfiltration-endpoint-directive` / `skill-placeholder-template-unresolved` on plugin skill/agent/command surfaces, deterministic scan receipt with catalog repository/SHA bind, SARIF 2.1.0 `sarif_sha256` bound to the same finding rule_ids, `policy_provenance` bound to the AppGuardrail release plus exact scan-policy digest, and `sbom_sha256` of a deterministic CycloneDX 1.5 document, `claude-plugin-checksum-mismatch` when a first-party SHA256SUMS or sibling `*.sha256` disagrees with bytes on disk, `claude-plugin-unsigned-checksum` when checksum digest rows have no sibling Cosign/GPG signature file, `claude-plugin-excessive-path-depth` when a materialized file or archive member nests past 32 path components, `claude-plugin-github-merge-command` for hook or manifest `gh pr merge`, `claude-plugin-github-release-command` for `gh release create|upload|delete|edit`, `claude-plugin-kubectl-apply-command` for hook or manifest `kubectl apply`, `claude-plugin-docker-push-command` for `docker push`, `claude-plugin-terraform-apply-command` for `terraform apply`, `claude-plugin-helm-install-command` for `helm install`, `claude-plugin-vercel-deploy-command` for hook or manifest `vercel deploy`, `claude-plugin-fly-deploy-command` for `fly deploy`, `claude-plugin-aws-deploy-command` for hook or manifest `aws cloudformation deploy`, `claude-plugin-gcloud-deploy-command` for `gcloud run deploy`, `claude-plugin-az-deploy-command` for `az webapp deploy`, `claude-plugin-credential-store-access` for host cookie and token stores that are not browser profiles, fail-closed receipt verification | implemented-branch | | Orphaned GitHub Actions registry identities (#929) | owned by PR #966 / issue #929; live registry DAST | mapped-family only; this successor does not ship or close the detector | | Org security-failure CI tickets without copied vuln evidence | documented non-detectable family | snapshot in `tests/fixtures/cwl-security-issue-inventory.json` | diff --git a/docs/sast-dast-rule-research.md b/docs/sast-dast-rule-research.md index 5b460923..f5f0c68c 100644 --- a/docs/sast-dast-rule-research.md +++ b/docs/sast-dast-rule-research.md @@ -106,14 +106,18 @@ files being scanned, then applies the union of relevant checks. Examples: `claude-plugin-terraform-apply-command` for ``terraform apply``, `claude-plugin-helm-install-command` for ``helm install``, `claude-plugin-vercel-deploy-command` for ``vercel deploy``, - `claude-plugin-fly-deploy-command` for ``fly deploy``, and + `claude-plugin-fly-deploy-command` for ``fly deploy``, + `claude-plugin-aws-deploy-command` for ``aws cloudformation deploy``, + `claude-plugin-gcloud-deploy-command` for ``gcloud run deploy``, + `claude-plugin-az-deploy-command` for ``az webapp deploy``, and `claude-plugin-credential-store-access` for host ``~/.netrc``, ``~/.aws/credentials``, GitHub CLI hosts, Docker auth, cookie jars, and SSH private keys. Chrome/Firefox profile stores stay `claude-plugin-browser-profile-access`. Hardcoded PATs stay `claude-plugin-github-write-token`. ``gh issue create``, ``gh pr review``, ``kubectl get``, ``docker ps``, ``terraform plan``, ``helm list``, - ``vercel ls``, and ``fly status`` stay inventory. + ``vercel ls``, ``fly status``, ``aws s3 ls``, ``gcloud config list``, + and ``az account show`` stay inventory. - Mapped, not owned here: GitHub Actions transport-only poll loops (#1087, PR #1088) and orphaned workflow registry DAST (#929, PR #966). - `tool-execute-parameters-passthrough`: Strix-observed dynamic tool execution From 481e171789a65647a86e0e6d6f10424143309e4c Mon Sep 17 00:00:00 2001 From: Seongho Bae Date: Tue, 8 Sep 2026 13:17:30 +0900 Subject: [PATCH 3/9] test(scanner): lock manifest cloud-deploy context --- tests/test_claude_plugin_cloud_deploy.py | 44 ++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/tests/test_claude_plugin_cloud_deploy.py b/tests/test_claude_plugin_cloud_deploy.py index caf5b13d..01fb690d 100644 --- a/tests/test_claude_plugin_cloud_deploy.py +++ b/tests/test_claude_plugin_cloud_deploy.py @@ -214,3 +214,47 @@ def test_vercel_deploy_without_cloud_stays_the_vercel_class() -> None: rule_ids = {hit.rule_id for hit in hits} assert _VERCEL_RULE in rule_ids assert _THIS_CLASS.isdisjoint(rule_ids) + + +def test_manifest_cloud_prose_and_reporting_commands_are_not_this_class( + tmp_path: Path, +) -> None: + """Manifest prose and reporting-only values are not cloud deploy writes.""" + root = _licensed_plugin(tmp_path) + manifest_path = root / ".claude-plugin" / "plugin.json" + manifest = json.loads(manifest_path.read_text(encoding="utf-8")) + manifest["description"] = "operators may later run gcloud run deploy" + manifest["hooks"] = { + "PostToolUse": [ + {"command": 'echo "aws cloudformation deploy"'}, + {"command": "printf '%s\\n' 'az webapp deploy'"}, + ], + } + _write_json(manifest_path, manifest) + + receipt = build_claude_plugin_scan_receipt(root) + + assert _THIS_CLASS.isdisjoint(receipt.finding_summary) + assert receipt.scan_result == "pass" + + +def test_manifest_reporting_command_does_not_hide_later_cloud_deploy( + tmp_path: Path, +) -> None: + """A later structural command value still exposes a real cloud deploy.""" + root = _licensed_plugin(tmp_path) + manifest_path = root / ".claude-plugin" / "plugin.json" + manifest = json.loads(manifest_path.read_text(encoding="utf-8")) + manifest["hooks"] = { + "PostToolUse": [ + {"command": 'echo "gcloud run deploy"'}, + {"command": "aws cloudformation deploy --stack-name app"}, + ], + } + _write_json(manifest_path, manifest) + + receipt = build_claude_plugin_scan_receipt(root) + + assert _GCLOUD_RULE not in receipt.finding_summary + assert _AWS_RULE in receipt.finding_summary + assert receipt.scan_result == "fail" From 1e81305a9a3026f718b98d780f8e8e25f9784cf3 Mon Sep 17 00:00:00 2001 From: Seongho Bae Date: Tue, 8 Sep 2026 16:11:31 +0900 Subject: [PATCH 4/9] fix(scanner): inherit quoted command-context repair --- appguardrail_core/claude_plugin_detector.py | 84 ++++++++++++++++++--- 1 file changed, 74 insertions(+), 10 deletions(-) diff --git a/appguardrail_core/claude_plugin_detector.py b/appguardrail_core/claude_plugin_detector.py index 6f96686e..a163c3ee 100644 --- a/appguardrail_core/claude_plugin_detector.py +++ b/appguardrail_core/claude_plugin_detector.py @@ -1840,14 +1840,73 @@ def _hosted_command_sources( return ((content, 1),) +def _shell_command_context_start(line: str, offset: int) -> int | None: + """Return the executable shell-frame start containing ``offset``. + + Args: + line: One hook or manifest command line. + offset: Zero-based match offset within ``line``. + + Returns: + The start of the root, ``$(...)``, or backtick command frame. + ``None`` means the offset is inert single- or double-quoted prose. + """ + frames: list[tuple[str, int, str, int]] = [("", 0, "", 0)] + escaped = False + index = 0 + while index < offset: + frame_end, frame_start, quote, depth = frames[-1] + char = line[index] + if escaped: + escaped = False + index += 1 + continue + if char == "\\" and quote != "'": + escaped = True + index += 1 + continue + if char == "'" and quote != '"': + frames[-1] = (frame_end, frame_start, "" if quote == "'" else "'", depth) + index += 1 + continue + if char == '"' and quote != "'": + frames[-1] = (frame_end, frame_start, "" if quote == '"' else '"', depth) + index += 1 + continue + if quote != "'" and line[index : index + 2] == "$(": + frames.append((")", index + 2, "", 1)) + index += 2 + continue + if quote != "'" and char == "`": + if frame_end == "`": + frames.pop() + else: + frames.append(("`", index + 1, "", 0)) + index += 1 + continue + if quote: + index += 1 + continue + if frame_end == ")" and char == "(": + frames[-1] = (frame_end, frame_start, quote, depth + 1) + elif frame_end == ")" and char == ")": + if depth == 1: + frames.pop() + else: + frames[-1] = (frame_end, frame_start, quote, depth - 1) + index += 1 + _frame_end, frame_start, quote, _depth = frames[-1] + return None if quote else frame_start + + def _executable_command_match( content: str, pattern: re.Pattern[str] ) -> re.Match[str] | None: """Return the first regex match that is an executable command context. - Unquoted ``#`` comments and ``echo``/``printf``/``print`` segments are - not executable. Manifest JSON command strings remain searchable - because they are not reporting builtins. + Unquoted ``#`` comments, quoted prose, and + ``echo``/``printf``/``print`` segments are not executable. Direct + commands inside ``$(...)`` or backticks remain executable. Args: content: Hook or manifest text. @@ -1865,17 +1924,22 @@ def _executable_command_match( line_end = len(content) line = content[line_start:line_end] relative = match.start() - line_start - comment_at = _unquoted_hash_index(line) - if comment_at is not None and relative >= comment_at: + context_start = _shell_command_context_start(line, relative) + if context_start is None: continue - for start, end in _iter_unquoted_segment_bounds(line): - if start <= relative < end: - if not _is_reporting_builtin_segment(line[start:end]): + context = line[context_start:] + context_relative = relative - context_start + comment_at = _unquoted_hash_index(context) + if comment_at is not None and context_relative >= comment_at: + continue + for segment_start, segment_end in _iter_unquoted_segment_bounds(context): + if segment_start <= context_relative < segment_end: + if not _is_reporting_builtin_segment( + context[segment_start:segment_end] + ): return match break return None - - def _vercel_deploy_command_hits( content: str, *, manifest: bool = False ) -> tuple[PluginHit, ...]: From cfa2ed70c1ee419b7c4cd5a8fc88e369b5f7a8a3 Mon Sep 17 00:00:00 2001 From: Seongho Bae Date: Tue, 8 Sep 2026 16:11:32 +0900 Subject: [PATCH 5/9] test(scanner): inherit quoted command-context regressions --- tests/test_claude_plugin_terraform_helm.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/tests/test_claude_plugin_terraform_helm.py b/tests/test_claude_plugin_terraform_helm.py index 4a95efdf..d413aa2c 100644 --- a/tests/test_claude_plugin_terraform_helm.py +++ b/tests/test_claude_plugin_terraform_helm.py @@ -254,3 +254,25 @@ def test_later_executable_command_after_reporting_segment_still_fails() -> None: hits = inspect_claude_plugin_file("session.sh", "hooks/session.sh", body) assert any(hit.rule_id in _THIS_CLASS for hit in hits) +def test_quoted_shell_prose_is_not_executable() -> None: + """Quoted command names and reporting substitutions are inert prose.""" + bodies = ( + '#!/bin/sh\nmessage="terraform apply -auto-approve"\n', + '#!/bin/sh\nif [ "$mode" = "helm install app chart/" ]; then echo safe; fi\n', + "#!/bin/sh\nmessage='helm install app chart/'\n", + '#!/bin/sh\nresult="$(echo \'terraform apply -auto-approve\')"\n', + ) + for body in bodies: + hits = inspect_claude_plugin_file("session.sh", "hooks/session.sh", body) + assert _THIS_CLASS.isdisjoint(hit.rule_id for hit in hits) + + +def test_command_substitution_remains_executable() -> None: + """Direct commands in modern and legacy substitutions remain executable.""" + bodies = ( + '#!/bin/sh\nresult="$(terraform apply -auto-approve)"\n', + "#!/bin/sh\nresult=`helm install app chart/`\n", + ) + for body in bodies: + hits = inspect_claude_plugin_file("session.sh", "hooks/session.sh", body) + assert any(hit.rule_id in _THIS_CLASS for hit in hits) From d081a88058375d56783b1bd12f716124cc936e23 Mon Sep 17 00:00:00 2001 From: Seongho Bae Date: Tue, 8 Sep 2026 16:37:12 +0900 Subject: [PATCH 6/9] test(scanner): inherit assignment command boundary --- tests/test_claude_plugin_terraform_helm.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/tests/test_claude_plugin_terraform_helm.py b/tests/test_claude_plugin_terraform_helm.py index d413aa2c..b80b6877 100644 --- a/tests/test_claude_plugin_terraform_helm.py +++ b/tests/test_claude_plugin_terraform_helm.py @@ -276,3 +276,25 @@ def test_command_substitution_remains_executable() -> None: for body in bodies: hits = inspect_claude_plugin_file("session.sh", "hooks/session.sh", body) assert any(hit.rule_id in _THIS_CLASS for hit in hits) + + +def test_assignment_values_are_not_executable_commands() -> None: + """An unquoted assignment value cannot turn its following word into the CLI.""" + bodies = ( + "#!/bin/sh\nmessage=terraform apply -auto-approve\n", + "#!/bin/sh\ncommand=helm install app chart/\n", + ) + for body in bodies: + hits = inspect_claude_plugin_file("session.sh", "hooks/session.sh", body) + assert _THIS_CLASS.isdisjoint(hit.rule_id for hit in hits) + + +def test_environment_assignment_before_real_command_still_fails() -> None: + """Environment assignments do not hide a later executable deployment CLI.""" + bodies = ( + "#!/bin/sh\nTF_IN_AUTOMATION=1 terraform apply -auto-approve\n", + "#!/bin/sh\nHELM_NAMESPACE=prod helm install app chart/\n", + ) + for body in bodies: + hits = inspect_claude_plugin_file("session.sh", "hooks/session.sh", body) + assert any(hit.rule_id in _THIS_CLASS for hit in hits) From c0a1a0ef12271fc1ddf317dc824b4571845925d2 Mon Sep 17 00:00:00 2001 From: Seongho Bae Date: Tue, 8 Sep 2026 16:37:13 +0900 Subject: [PATCH 7/9] fix(scanner): inherit assignment command boundary --- appguardrail_core/claude_plugin_detector.py | 28 ++++++++++++++++++--- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/appguardrail_core/claude_plugin_detector.py b/appguardrail_core/claude_plugin_detector.py index a163c3ee..a6dab478 100644 --- a/appguardrail_core/claude_plugin_detector.py +++ b/appguardrail_core/claude_plugin_detector.py @@ -1899,12 +1899,28 @@ def _shell_command_context_start(line: str, offset: int) -> int | None: return None if quote else frame_start -def _executable_command_match( - content: str, pattern: re.Pattern[str] +def _match_starts_in_shell_assignment_value(segment: str, offset: int) -> bool: + """Return whether ``offset`` starts inside an unquoted assignment word. + + Args: + segment: One shell command segment. + offset: Zero-based match offset within ``segment``. + + Returns: + True when the current shell word before ``offset`` contains ``=``. + An assignment followed by whitespace and a real command returns False. + """ + prefix = segment[:offset] + if not prefix or prefix[-1].isspace(): + return False + return "=" in prefix.rsplit(maxsplit=1)[-1] + + +def _executable_command_match( content: str, pattern: re.Pattern[str] ) -> re.Match[str] | None: """Return the first regex match that is an executable command context. - Unquoted ``#`` comments, quoted prose, and + Unquoted ``#`` comments, quoted prose, shell assignment values, and ``echo``/``printf``/``print`` segments are not executable. Direct commands inside ``$(...)`` or backticks remain executable. @@ -1934,8 +1950,12 @@ def _executable_command_match( continue for segment_start, segment_end in _iter_unquoted_segment_bounds(context): if segment_start <= context_relative < segment_end: + segment = context[segment_start:segment_end] + segment_relative = context_relative - segment_start if not _is_reporting_builtin_segment( - context[segment_start:segment_end] + segment + ) and not _match_starts_in_shell_assignment_value( + segment, segment_relative ): return match break From 10ead664ea6943526acc7f5fcc8596a2f960b525 Mon Sep 17 00:00:00 2001 From: Seongho Bae Date: Tue, 8 Sep 2026 17:14:33 +0900 Subject: [PATCH 8/9] fix(scanner): carry heredoc command boundary --- appguardrail_core/claude_plugin_detector.py | 57 ++++++++++++++++++++- 1 file changed, 55 insertions(+), 2 deletions(-) diff --git a/appguardrail_core/claude_plugin_detector.py b/appguardrail_core/claude_plugin_detector.py index a6dab478..ea572c82 100644 --- a/appguardrail_core/claude_plugin_detector.py +++ b/appguardrail_core/claude_plugin_detector.py @@ -433,6 +433,11 @@ _AZ_DEPLOY_COMMAND = re.compile(r"\baz\s+webapp\s+deploy\b", re.IGNORECASE) _REPORTING_BUILTINS: Final = frozenset({"echo", "printf", "print"}) _FIRST_SHELL_TOKEN = re.compile(r"\s*([A-Za-z0-9_./+-]+)") +_LITERAL_HEREDOC_OPEN = re.compile( + r"<<(?P-)?[ \t]*(?P['\"]?)" + r"(?P[A-Za-z_][A-Za-z0-9_]*)(?P=quote)" + r"(?=$|[ \t;&|()<>])" +) _DOCKER_SOCKET = re.compile( r"(?:/var/run/docker\.sock|unix://\S*docker\.sock)", re.IGNORECASE, @@ -1899,6 +1904,50 @@ def _shell_command_context_start(line: str, offset: int) -> int | None: return None if quote else frame_start +def _literal_heredoc_payload_spans(content: str) -> tuple[tuple[int, int], ...]: + """Return closed literal here-document payload spans. + + Args: + content: One hook or structural manifest command string. + + Returns: + Inclusive-start exclusive-end spans for payloads with one confidently + parsed identifier delimiter on the opener line. Quoted delimiters and + tab-stripping forms are supported. Ambiguous or unclosed forms stay + executable for fail-closed analysis. + """ + spans: list[tuple[int, int]] = [] + active: tuple[str, bool, int] | None = None + offset = 0 + for raw_line in content.splitlines(keepends=True): + line = raw_line.rstrip("\r\n") + if active is not None: + delimiter, strip_tabs, payload_start = active + candidate = line.lstrip("\t") if strip_tabs else line + if candidate == delimiter: + spans.append((payload_start, offset)) + active = None + offset += len(raw_line) + continue + + comment_at = _unquoted_hash_index(line) + openers = tuple( + match + for match in _LITERAL_HEREDOC_OPEN.finditer(line) + if (comment_at is None or match.start() < comment_at) + and _shell_command_context_start(line, match.start()) is not None + ) + if len(openers) == 1: + opener = openers[0] + active = ( + opener.group("delimiter"), + opener.group("strip") is not None, + offset + len(raw_line), + ) + offset += len(raw_line) + return tuple(spans) + + def _match_starts_in_shell_assignment_value(segment: str, offset: int) -> bool: """Return whether ``offset`` starts inside an unquoted assignment word. @@ -1920,8 +1969,9 @@ def _executable_command_match( content: str, pattern: re.Pattern[str] ) -> re.Match[str] | None: """Return the first regex match that is an executable command context. - Unquoted ``#`` comments, quoted prose, shell assignment values, and - ``echo``/``printf``/``print`` segments are not executable. Direct + Unquoted ``#`` comments, quoted prose, closed literal here-document + payloads, shell assignment values, and ``echo``/``printf``/``print`` + segments are not executable. Direct commands inside ``$(...)`` or backticks remain executable. Args: @@ -1933,7 +1983,10 @@ def _executable_command_match( content: str, pattern: re.Pattern[str] """ if not content: return None + inert_payloads = _literal_heredoc_payload_spans(content) for match in pattern.finditer(content): + if any(start <= match.start() < end for start, end in inert_payloads): + continue line_start = content.rfind("\n", 0, match.start()) + 1 line_end = content.find("\n", match.start()) if line_end < 0: From 5659c0d91ffe67b9687a68f720a99d323c2d8205 Mon Sep 17 00:00:00 2001 From: Seongho Bae Date: Tue, 8 Sep 2026 17:14:35 +0900 Subject: [PATCH 9/9] test(scanner): carry heredoc command regressions --- tests/test_claude_plugin_terraform_helm.py | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/tests/test_claude_plugin_terraform_helm.py b/tests/test_claude_plugin_terraform_helm.py index b80b6877..fe3bc41e 100644 --- a/tests/test_claude_plugin_terraform_helm.py +++ b/tests/test_claude_plugin_terraform_helm.py @@ -212,6 +212,7 @@ def test_kubectl_apply_without_terraform_stays_the_kubectl_class() -> None: assert _KUBECTL_RULE in rule_ids assert _THIS_CLASS.isdisjoint(rule_ids) + def test_hook_comments_and_reporting_builtins_are_not_commands() -> None: """Comments and reporting builtins do not execute terraform or Helm.""" bodies = ( @@ -278,6 +279,7 @@ def test_command_substitution_remains_executable() -> None: assert any(hit.rule_id in _THIS_CLASS for hit in hits) + def test_assignment_values_are_not_executable_commands() -> None: """An unquoted assignment value cannot turn its following word into the CLI.""" bodies = ( @@ -298,3 +300,38 @@ def test_environment_assignment_before_real_command_still_fails() -> None: for body in bodies: hits = inspect_claude_plugin_file("session.sh", "hooks/session.sh", body) assert any(hit.rule_id in _THIS_CLASS for hit in hits) + + +def test_here_document_payload_is_not_an_executable_command() -> None: + """Literal here-document payload is data, even when it names deployment CLIs.""" + bodies = ( + "#!/bin/sh\ncat <<'EOF'\nterraform apply -auto-approve\nEOF\n", + "#!/bin/sh\ncat <<-EOF\n\thelm install app chart/\n\tEOF\n", + ) + for body in bodies: + hits = inspect_claude_plugin_file("session.sh", "hooks/session.sh", body) + assert _THIS_CLASS.isdisjoint(hit.rule_id for hit in hits) + + +def test_command_after_here_document_still_fails() -> None: + """An inert payload cannot hide a later executable deployment command.""" + body = ( + "#!/bin/sh\ncat <<'EOF'\nterraform apply -auto-approve\nEOF\n" + "helm install app chart/\n" + ) + hits = inspect_claude_plugin_file("session.sh", "hooks/session.sh", body) + rule_ids = {hit.rule_id for hit in hits} + assert _TERRAFORM_RULE not in rule_ids + assert _HELM_RULE in rule_ids + + +def test_heredoc_opener_lookalikes_do_not_hide_real_commands() -> None: + """Quoted or commented opener text cannot suppress a later real command.""" + bodies = ( + '#!/bin/sh\necho "<