@openai/codex-security 0.1.31 → 0.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +442 -2434
- package/_bundled_plugin/.app.json +5 -1
- package/_bundled_plugin/.codex-plugin/plugin.json +9 -5
- package/_bundled_plugin/.mcp.json +3 -0
- package/_bundled_plugin/examples/completed-scan/coverage.json +0 -1
- package/_bundled_plugin/examples/completed-scan/report.md +28 -26
- package/_bundled_plugin/examples/completed-scan/scan-manifest.json +1 -1
- package/_bundled_plugin/mcp/helpers.mjs +1 -0
- package/_bundled_plugin/mcp/helpers.mjs.br.part-000 +0 -0
- package/_bundled_plugin/mcp/native/THIRD_PARTY_NOTICES.txt +7 -214
- package/_bundled_plugin/mcp/native/darwin-arm64/unix.node +0 -0
- package/_bundled_plugin/mcp/native/darwin-x64/unix.node +0 -0
- package/_bundled_plugin/mcp/native/linux-arm64-gnu/unix.node +0 -0
- package/_bundled_plugin/mcp/native/linux-arm64-musl/unix.node +0 -0
- package/_bundled_plugin/mcp/native/linux-x64-gnu/unix.node +0 -0
- package/_bundled_plugin/mcp/native/linux-x64-musl/unix.node +0 -0
- package/_bundled_plugin/mcp/native/win32-arm64/windows.node +0 -0
- package/_bundled_plugin/mcp/native/win32-x64/windows.node +0 -0
- package/_bundled_plugin/mcp/permission-profile-preflight.mjs +563 -0
- package/_bundled_plugin/mcp/server.mjs +1 -0
- package/_bundled_plugin/mcp/server.mjs.br.part-000 +0 -0
- package/_bundled_plugin/mcp/server.mjs.br.part-001 +0 -0
- package/_bundled_plugin/preflight/capability-profiles.toml +0 -13
- package/_bundled_plugin/references/artifact-storage.md +5 -5
- package/_bundled_plugin/references/config-preflight.md +1 -5
- package/_bundled_plugin/references/core-scan.md +34 -10
- package/_bundled_plugin/references/final-report.md +13 -13
- package/_bundled_plugin/references/finding-detail-fields.md +90 -80
- package/_bundled_plugin/references/sarif-adapter.md +1 -1
- package/_bundled_plugin/references/scan-artifacts.md +3 -4
- package/_bundled_plugin/references/scan-contract.md +11 -6
- package/_bundled_plugin/references/scan-prologue.md +12 -0
- package/_bundled_plugin/references/security-guidance.md +2 -2
- package/_bundled_plugin/references/standalone-validation.md +11 -0
- package/_bundled_plugin/references/threat-model.md +2 -2
- package/_bundled_plugin/schemas/coverage.schema.json +23 -47
- package/_bundled_plugin/schemas/definitions/artifact-common.schema.json +2 -24
- package/_bundled_plugin/schemas/definitions/discovery-candidate.schema.json +49 -25
- package/_bundled_plugin/schemas/findings.schema.json +71 -192
- package/_bundled_plugin/schemas/scan-manifest.schema.json +83 -95
- package/_bundled_plugin/schemas/tools/candidate-attack-paths.schema.json +91 -83
- package/_bundled_plugin/schemas/tools/candidate-validations.schema.json +35 -64
- package/_bundled_plugin/schemas/tools/deep-reducer.schema.json +5 -2
- package/_bundled_plugin/schemas/tools/discovery-candidates.schema.json +6 -55
- package/_bundled_plugin/schemas/tools/review-items.schema.json +2 -38
- package/_bundled_plugin/schemas/tools/scan-draft.schema.json +245 -356
- package/_bundled_plugin/scripts/codex_profile.mjs +239 -0
- package/_bundled_plugin/scripts/codex_session.mjs +53 -0
- package/_bundled_plugin/scripts/config_preflight.py +29 -69
- package/_bundled_plugin/scripts/deep_scan_config.py +9 -11
- package/_bundled_plugin/scripts/deep_scan_workbench.py +208 -363
- package/_bundled_plugin/scripts/filesystem_identity.py +1 -5
- package/_bundled_plugin/scripts/finalize_scan_contract.py +733 -375
- package/_bundled_plugin/scripts/finding_preview.py +81 -91
- package/_bundled_plugin/scripts/generate_in_scope_files.py +48 -102
- package/_bundled_plugin/scripts/generate_rank_input.py +117 -888
- package/_bundled_plugin/scripts/launch_codex_security_mcp +35 -6
- package/_bundled_plugin/scripts/launch_codex_security_mcp.cmd +5 -5
- package/_bundled_plugin/scripts/rank_preview.py +43 -902
- package/_bundled_plugin/scripts/report_projection.py +143 -219
- package/_bundled_plugin/scripts/snapshot_sqlite.py +6 -1
- package/_bundled_plugin/scripts/threat_model_projection.py +161 -0
- package/_bundled_plugin/scripts/validate_scan_contract.py +4 -34
- package/_bundled_plugin/scripts/validate_tracking_source.py +3 -13
- package/_bundled_plugin/scripts/windows_scan_local_files.py +59 -9
- package/_bundled_plugin/scripts/workbench/handoff.py +25 -50
- package/_bundled_plugin/scripts/workbench/runtime_toml.py +22 -0
- package/_bundled_plugin/scripts/workbench/storage.py +21 -6
- package/_bundled_plugin/scripts/workbench_cli.py +99 -190
- package/_bundled_plugin/scripts/workbench_constants.py +6 -14
- package/_bundled_plugin/scripts/workbench_db.py +524 -672
- package/_bundled_plugin/scripts/workbench_feedback.py +6 -3
- package/_bundled_plugin/scripts/workbench_finding_index.py +20 -7
- package/_bundled_plugin/scripts/workbench_finding_workflows.py +18 -4
- package/_bundled_plugin/scripts/workbench_local_dedupe.py +136 -0
- package/_bundled_plugin/scripts/workbench_native_indexes.py +28 -18
- package/_bundled_plugin/scripts/workbench_progress.py +26 -92
- package/_bundled_plugin/scripts/workbench_publication.py +77 -116
- package/_bundled_plugin/scripts/workbench_remediation.py +14 -20
- package/_bundled_plugin/scripts/workbench_saved_results.py +1402 -263
- package/_bundled_plugin/scripts/workbench_scan_history.py +57 -57
- package/_bundled_plugin/scripts/workbench_scan_start.py +109 -52
- package/_bundled_plugin/scripts/workbench_scan_usage.py +30 -49
- package/_bundled_plugin/scripts/workbench_schema.py +71 -1370
- package/_bundled_plugin/scripts/workbench_source_excerpt.py +16 -7
- package/_bundled_plugin/scripts/workbench_target.py +526 -150
- package/_bundled_plugin/scripts/workbench_target_state.py +1 -5
- package/_bundled_plugin/scripts/workbench_validation.py +19 -44
- package/_bundled_plugin/shared/workbench-history-repairs.json +218 -0
- package/_bundled_plugin/shared/workbench-migrations.json +397 -0
- package/_bundled_plugin/skills/assess-patch-risk/SKILL.md +15 -4
- package/_bundled_plugin/skills/attack-path-analysis/SKILL.md +1 -0
- package/_bundled_plugin/skills/cloud-findings/SKILL.md +54 -0
- package/_bundled_plugin/skills/cloud-findings/agents/openai.yaml +4 -0
- package/_bundled_plugin/skills/deep-security-scan/SKILL.md +6 -6
- package/_bundled_plugin/skills/deep-security-scan/agents/openai.yaml +1 -1
- package/_bundled_plugin/skills/finding-discovery/SKILL.md +3 -3
- package/_bundled_plugin/skills/propose-security-hardening/references/proposal-format.md +50 -20
- package/_bundled_plugin/skills/security-diff-scan/SKILL.md +8 -14
- package/_bundled_plugin/skills/security-diff-scan/agents/openai.yaml +1 -1
- package/_bundled_plugin/skills/security-scan/SKILL.md +22 -7
- package/_bundled_plugin/skills/security-scan/agents/openai.yaml +1 -1
- package/_bundled_plugin/skills/security-scan/references/desktop-scan.md +2 -2
- package/_bundled_plugin/skills/security-scan/references/scan-artifacts-and-ledger.md +13 -1
- package/_bundled_plugin/skills/threat-model/SKILL.md +2 -2
- package/_bundled_plugin/skills/track-findings/SKILL.md +46 -178
- package/_bundled_plugin/skills/track-findings/agents/openai.yaml +1 -1
- package/_bundled_plugin/skills/track-findings/references/github-security-advisories.md +16 -24
- package/_bundled_plugin/skills/track-findings/references/jira.md +15 -61
- package/_bundled_plugin/skills/triage-finding/SKILL.md +50 -289
- package/_bundled_plugin/skills/triage-finding/agents/openai.yaml +2 -2
- package/_bundled_plugin/skills/triage-finding/references/ticket-intake.md +23 -43
- package/_bundled_plugin/skills/triage-finding/references/triage-result-contract.md +7 -1
- package/bin/codex-security.mjs +9 -2
- package/dist/api.d.ts +63 -15
- package/dist/api.d.ts.map +1 -1
- package/dist/api.js +970 -553
- package/dist/api.js.map +1 -1
- package/dist/artifact-export.d.ts +70 -0
- package/dist/artifact-export.d.ts.map +1 -0
- package/dist/artifact-export.js +292 -0
- package/dist/artifact-export.js.map +1 -0
- package/dist/auth.d.ts +2 -6
- package/dist/auth.d.ts.map +1 -1
- package/dist/auth.js +27 -12
- package/dist/auth.js.map +1 -1
- package/dist/bulk-scan-discovery.d.ts +1 -0
- package/dist/bulk-scan-discovery.d.ts.map +1 -1
- package/dist/bulk-scan-discovery.js +9 -9
- package/dist/bulk-scan-discovery.js.map +1 -1
- package/dist/classify-scan-severity.d.ts.map +1 -1
- package/dist/classify-scan-severity.js +2 -5
- package/dist/classify-scan-severity.js.map +1 -1
- package/dist/classify-severity.d.ts +28 -17
- package/dist/classify-severity.d.ts.map +1 -1
- package/dist/classify-severity.js +16 -35
- package/dist/classify-severity.js.map +1 -1
- package/dist/cli-help.d.ts +3 -0
- package/dist/cli-help.d.ts.map +1 -0
- package/dist/cli-help.js +285 -0
- package/dist/cli-help.js.map +1 -0
- package/dist/cli-signals.d.ts +8 -0
- package/dist/cli-signals.d.ts.map +1 -0
- package/dist/cli-signals.js +28 -0
- package/dist/cli-signals.js.map +1 -0
- package/dist/cli.d.ts +22 -24
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +1660 -1556
- package/dist/cli.js.map +1 -1
- package/dist/cloud-publish.d.ts.map +1 -1
- package/dist/cloud-publish.js +11 -17
- package/dist/cloud-publish.js.map +1 -1
- package/dist/codeowners.d.ts +19 -0
- package/dist/codeowners.d.ts.map +1 -0
- package/dist/codeowners.js +138 -0
- package/dist/codeowners.js.map +1 -0
- package/dist/codex-prompt.d.ts.map +1 -1
- package/dist/codex-prompt.js +1 -2
- package/dist/codex-prompt.js.map +1 -1
- package/dist/codex-sdk-environment.d.ts +3 -0
- package/dist/codex-sdk-environment.d.ts.map +1 -0
- package/dist/codex-sdk-environment.js +68 -0
- package/dist/codex-sdk-environment.js.map +1 -0
- package/dist/component-plan.d.ts +2 -5
- package/dist/component-plan.d.ts.map +1 -1
- package/dist/component-plan.js +38 -34
- package/dist/component-plan.js.map +1 -1
- package/dist/component-scan.d.ts +7 -5
- package/dist/component-scan.d.ts.map +1 -1
- package/dist/component-scan.js +54 -44
- package/dist/component-scan.js.map +1 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +93 -104
- package/dist/config.js.map +1 -1
- package/dist/contract.d.ts +15 -2
- package/dist/contract.d.ts.map +1 -1
- package/dist/contract.js +124 -348
- package/dist/contract.js.map +1 -1
- package/dist/cost-model.d.ts +13 -6
- package/dist/cost-model.d.ts.map +1 -1
- package/dist/cost-model.js +75 -34
- package/dist/cost-model.js.map +1 -1
- package/dist/cost.d.ts +10 -2
- package/dist/cost.d.ts.map +1 -1
- package/dist/cost.js +116 -134
- package/dist/cost.js.map +1 -1
- package/dist/custom-validation-prompt.d.ts.map +1 -1
- package/dist/custom-validation-prompt.js +7 -6
- package/dist/custom-validation-prompt.js.map +1 -1
- package/dist/custom-validation.d.ts +1 -2
- package/dist/custom-validation.d.ts.map +1 -1
- package/dist/custom-validation.js +23 -16
- package/dist/custom-validation.js.map +1 -1
- package/dist/deduplication/checkpointed-review.d.ts +4 -2
- package/dist/deduplication/checkpointed-review.d.ts.map +1 -1
- package/dist/deduplication/checkpointed-review.js +33 -20
- package/dist/deduplication/checkpointed-review.js.map +1 -1
- package/dist/deduplication/codex-review.d.ts +9 -1
- package/dist/deduplication/codex-review.d.ts.map +1 -1
- package/dist/deduplication/codex-review.js +129 -20
- package/dist/deduplication/codex-review.js.map +1 -1
- package/dist/deduplication/deduplication-prompts.d.ts +5 -2
- package/dist/deduplication/deduplication-prompts.d.ts.map +1 -1
- package/dist/deduplication/deduplication-prompts.js +18 -4
- package/dist/deduplication/deduplication-prompts.js.map +1 -1
- package/dist/deduplication/deduplication-reviewer.d.ts +26 -4
- package/dist/deduplication/deduplication-reviewer.d.ts.map +1 -1
- package/dist/deduplication/deduplication-reviewer.js +59 -47
- package/dist/deduplication/deduplication-reviewer.js.map +1 -1
- package/dist/deduplication/deduplication.d.ts.map +1 -1
- package/dist/deduplication/deduplication.js +59 -113
- package/dist/deduplication/deduplication.js.map +1 -1
- package/dist/deduplication/diagnostics.d.ts +17 -0
- package/dist/deduplication/diagnostics.d.ts.map +1 -0
- package/dist/deduplication/diagnostics.js +5 -0
- package/dist/deduplication/diagnostics.js.map +1 -0
- package/dist/deduplication/finding-schema.d.ts.map +1 -1
- package/dist/deduplication/finding-schema.js +7 -1
- package/dist/deduplication/finding-schema.js.map +1 -1
- package/dist/deduplication/local.d.ts +31 -0
- package/dist/deduplication/local.d.ts.map +1 -0
- package/dist/deduplication/local.js +166 -0
- package/dist/deduplication/local.js.map +1 -0
- package/dist/deduplication/records-protocol.d.ts.map +1 -1
- package/dist/deduplication/records-protocol.js +12 -28
- package/dist/deduplication/records-protocol.js.map +1 -1
- package/dist/deduplication/records.d.ts +188 -12
- package/dist/deduplication/records.d.ts.map +1 -1
- package/dist/deduplication/records.js +34 -24
- package/dist/deduplication/records.js.map +1 -1
- package/dist/deduplication/review.d.ts +7 -0
- package/dist/deduplication/review.d.ts.map +1 -1
- package/dist/deduplication/review.js.map +1 -1
- package/dist/deduplication/scan.d.ts +9 -3
- package/dist/deduplication/scan.d.ts.map +1 -1
- package/dist/deduplication/scan.js +159 -44
- package/dist/deduplication/scan.js.map +1 -1
- package/dist/deep-config.d.ts +2 -1
- package/dist/deep-config.d.ts.map +1 -1
- package/dist/deep-config.js +7 -23
- package/dist/deep-config.js.map +1 -1
- package/dist/deep-progress.d.ts +2 -1
- package/dist/deep-progress.d.ts.map +1 -1
- package/dist/deep-progress.js +32 -47
- package/dist/deep-progress.js.map +1 -1
- package/dist/deep-scan.d.ts +20 -0
- package/dist/deep-scan.d.ts.map +1 -0
- package/dist/deep-scan.js +113 -0
- package/dist/deep-scan.js.map +1 -0
- package/dist/errors.d.ts +5 -2
- package/dist/errors.d.ts.map +1 -1
- package/dist/errors.js +7 -7
- package/dist/errors.js.map +1 -1
- package/dist/feedback.d.ts.map +1 -1
- package/dist/feedback.js +53 -21
- package/dist/feedback.js.map +1 -1
- package/dist/finding-catalogue.d.ts.map +1 -1
- package/dist/finding-catalogue.js +26 -30
- package/dist/finding-catalogue.js.map +1 -1
- package/dist/finding-normalization.d.ts +5 -0
- package/dist/finding-normalization.d.ts.map +1 -0
- package/dist/finding-normalization.js +120 -0
- package/dist/finding-normalization.js.map +1 -0
- package/dist/finding-retrieval.d.ts +9 -0
- package/dist/finding-retrieval.d.ts.map +1 -1
- package/dist/finding-retrieval.js.map +1 -1
- package/dist/finding-workflow.d.ts +13 -8
- package/dist/finding-workflow.d.ts.map +1 -1
- package/dist/finding-workflow.js +18 -13
- package/dist/finding-workflow.js.map +1 -1
- package/dist/findings-client.d.ts +2 -1
- package/dist/findings-client.d.ts.map +1 -1
- package/dist/findings-client.js +36 -9
- package/dist/findings-client.js.map +1 -1
- package/dist/findings-errors.d.ts +16 -0
- package/dist/findings-errors.d.ts.map +1 -0
- package/dist/findings-errors.js +24 -0
- package/dist/findings-errors.js.map +1 -0
- package/dist/findings-import.d.ts +1 -1
- package/dist/findings-import.d.ts.map +1 -1
- package/dist/findings-import.js +16 -44
- package/dist/findings-import.js.map +1 -1
- package/dist/github.d.ts.map +1 -1
- package/dist/github.js +9 -4
- package/dist/github.js.map +1 -1
- package/dist/import-scan.d.ts.map +1 -1
- package/dist/import-scan.js +49 -39
- package/dist/import-scan.js.map +1 -1
- package/dist/index.d.ts +11 -5
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/knowledge-base.d.ts +7 -1
- package/dist/knowledge-base.d.ts.map +1 -1
- package/dist/knowledge-base.js +115 -47
- package/dist/knowledge-base.js.map +1 -1
- package/dist/linear.d.ts.map +1 -1
- package/dist/linear.js +4 -10
- package/dist/linear.js.map +1 -1
- package/dist/mock-scan.d.ts.map +1 -1
- package/dist/mock-scan.js +0 -1
- package/dist/mock-scan.js.map +1 -1
- package/dist/models.d.ts +24 -2
- package/dist/models.d.ts.map +1 -1
- package/dist/models.js.map +1 -1
- package/dist/multiscan.d.ts +9 -3
- package/dist/multiscan.d.ts.map +1 -1
- package/dist/multiscan.js +225 -153
- package/dist/multiscan.js.map +1 -1
- package/dist/owner-evidence.d.ts +10 -2
- package/dist/owner-evidence.d.ts.map +1 -1
- package/dist/owner-evidence.js +69 -14
- package/dist/owner-evidence.js.map +1 -1
- package/dist/patch-tui.d.ts.map +1 -1
- package/dist/patch-tui.js +5 -6
- package/dist/patch-tui.js.map +1 -1
- package/dist/project-config-schema.d.ts +10 -0
- package/dist/project-config-schema.d.ts.map +1 -1
- package/dist/project-config-schema.js +1 -0
- package/dist/project-config-schema.js.map +1 -1
- package/dist/project-config.d.ts +1 -0
- package/dist/project-config.d.ts.map +1 -1
- package/dist/project-config.js +5 -3
- package/dist/project-config.js.map +1 -1
- package/dist/prompt-files.d.ts +0 -1
- package/dist/prompt-files.d.ts.map +1 -1
- package/dist/prompt-files.js +2 -4
- package/dist/prompt-files.js.map +1 -1
- package/dist/provider-profile.d.ts +21 -0
- package/dist/provider-profile.d.ts.map +1 -0
- package/dist/provider-profile.js +133 -0
- package/dist/provider-profile.js.map +1 -0
- package/dist/publication-events.d.ts +6 -8
- package/dist/publication-events.d.ts.map +1 -1
- package/dist/publication-events.js +40 -79
- package/dist/publication-events.js.map +1 -1
- package/dist/publication-store.d.ts.map +1 -1
- package/dist/publication-store.js +48 -76
- package/dist/publication-store.js.map +1 -1
- package/dist/publication.d.ts +1 -2
- package/dist/publication.d.ts.map +1 -1
- package/dist/publication.js +7 -16
- package/dist/publication.js.map +1 -1
- package/dist/publish.d.ts +1 -5
- package/dist/publish.d.ts.map +1 -1
- package/dist/publish.js +138 -199
- package/dist/publish.js.map +1 -1
- package/dist/record.d.ts +2 -0
- package/dist/record.d.ts.map +1 -0
- package/dist/record.js +4 -0
- package/dist/record.js.map +1 -0
- package/dist/request-metadata.d.ts +9 -0
- package/dist/request-metadata.d.ts.map +1 -0
- package/dist/request-metadata.js +13 -0
- package/dist/request-metadata.js.map +1 -0
- package/dist/result.d.ts +4 -1
- package/dist/result.d.ts.map +1 -1
- package/dist/result.js +7 -0
- package/dist/result.js.map +1 -1
- package/dist/runtime.d.ts +25 -17
- package/dist/runtime.d.ts.map +1 -1
- package/dist/runtime.js +619 -255
- package/dist/runtime.js.map +1 -1
- package/dist/saved-scan-bootstrap.d.ts +14 -0
- package/dist/saved-scan-bootstrap.d.ts.map +1 -0
- package/dist/saved-scan-bootstrap.js +261 -0
- package/dist/saved-scan-bootstrap.js.map +1 -0
- package/dist/saved-scan.d.ts +1 -1
- package/dist/saved-scan.d.ts.map +1 -1
- package/dist/saved-scan.js +16 -32
- package/dist/saved-scan.js.map +1 -1
- package/dist/scan-activity.d.ts.map +1 -1
- package/dist/scan-activity.js +19 -30
- package/dist/scan-activity.js.map +1 -1
- package/dist/scan-comparison.d.ts +31 -18
- package/dist/scan-comparison.d.ts.map +1 -1
- package/dist/scan-comparison.js +307 -347
- package/dist/scan-comparison.js.map +1 -1
- package/dist/scan-dashboard.d.ts +3 -1
- package/dist/scan-dashboard.d.ts.map +1 -1
- package/dist/scan-dashboard.js +351 -92
- package/dist/scan-dashboard.js.map +1 -1
- package/dist/scan-history-renderer.d.ts.map +1 -1
- package/dist/scan-history-renderer.js +55 -15
- package/dist/scan-history-renderer.js.map +1 -1
- package/dist/scan-inputs.d.ts +6 -0
- package/dist/scan-inputs.d.ts.map +1 -0
- package/dist/scan-inputs.js +71 -0
- package/dist/scan-inputs.js.map +1 -0
- package/dist/scan-logs.d.ts +2 -3
- package/dist/scan-logs.d.ts.map +1 -1
- package/dist/scan-logs.js +14 -12
- package/dist/scan-logs.js.map +1 -1
- package/dist/scan-sessions.d.ts +4 -0
- package/dist/scan-sessions.d.ts.map +1 -1
- package/dist/scan-sessions.js +18 -3
- package/dist/scan-sessions.js.map +1 -1
- package/dist/scan-settings.d.ts +5 -0
- package/dist/scan-settings.d.ts.map +1 -1
- package/dist/scan-settings.js +4 -0
- package/dist/scan-settings.js.map +1 -1
- package/dist/scan-skill-paths.d.ts +8 -0
- package/dist/scan-skill-paths.d.ts.map +1 -0
- package/dist/scan-skill-paths.js +47 -0
- package/dist/scan-skill-paths.js.map +1 -0
- package/dist/security-policy-cli.d.ts.map +1 -1
- package/dist/security-policy-cli.js +15 -33
- package/dist/security-policy-cli.js.map +1 -1
- package/dist/security-policy.d.ts +17 -9
- package/dist/security-policy.d.ts.map +1 -1
- package/dist/security-policy.js +131 -98
- package/dist/security-policy.js.map +1 -1
- package/dist/server/api.d.ts +0 -1
- package/dist/server/api.d.ts.map +1 -1
- package/dist/server/api.js +0 -1
- package/dist/server/api.js.map +1 -1
- package/dist/server/embeddings.d.ts +3 -1
- package/dist/server/embeddings.d.ts.map +1 -1
- package/dist/server/embeddings.js +11 -3
- package/dist/server/embeddings.js.map +1 -1
- package/dist/server/errors.d.ts +5 -2
- package/dist/server/errors.d.ts.map +1 -1
- package/dist/server/errors.js +7 -0
- package/dist/server/errors.js.map +1 -1
- package/dist/server/sqlite-store.d.ts +0 -2
- package/dist/server/sqlite-store.d.ts.map +1 -1
- package/dist/server/sqlite-store.js +55 -55
- package/dist/server/sqlite-store.js.map +1 -1
- package/dist/server/storage.d.ts +0 -2
- package/dist/server/storage.d.ts.map +1 -1
- package/dist/server/storage.js.map +1 -1
- package/dist/severity-store.js +20 -32
- package/dist/severity-store.js.map +1 -1
- package/dist/standalone-validation-prompt.d.ts +2 -0
- package/dist/standalone-validation-prompt.d.ts.map +1 -0
- package/dist/standalone-validation-prompt.js +10 -0
- package/dist/standalone-validation-prompt.js.map +1 -0
- package/dist/suggest-owners.d.ts +6 -5
- package/dist/suggest-owners.d.ts.map +1 -1
- package/dist/suggest-owners.js +15 -10
- package/dist/suggest-owners.js.map +1 -1
- package/dist/targets.d.ts +12 -0
- package/dist/targets.d.ts.map +1 -1
- package/dist/targets.js +124 -62
- package/dist/targets.js.map +1 -1
- package/dist/trusted-executable.d.ts +6 -1
- package/dist/trusted-executable.d.ts.map +1 -1
- package/dist/trusted-executable.js +28 -9
- package/dist/trusted-executable.js.map +1 -1
- package/dist/value.d.ts +2 -0
- package/dist/value.d.ts.map +1 -0
- package/dist/value.js +27 -0
- package/dist/value.js.map +1 -0
- package/dist/version.d.ts.map +1 -1
- package/dist/version.js +3 -6
- package/dist/version.js.map +1 -1
- package/dist/windows-path.d.ts.map +1 -1
- package/dist/windows-path.js +1 -2
- package/dist/windows-path.js.map +1 -1
- package/dist/workbench-arguments.d.ts +3 -0
- package/dist/workbench-arguments.d.ts.map +1 -0
- package/dist/workbench-arguments.js +15 -0
- package/dist/workbench-arguments.js.map +1 -0
- package/dist/worker-progress.d.ts +2 -0
- package/dist/worker-progress.d.ts.map +1 -1
- package/dist/worker-progress.js +40 -46
- package/dist/worker-progress.js.map +1 -1
- package/docs/cli.md +1778 -0
- package/docs/dedupe-records.md +24 -0
- package/docs/findings-service.md +402 -0
- package/package.json +23 -23
- package/schemas/project-config.schema.json +5 -0
- package/_bundled_plugin/schemas/tools/worker-threat-model.schema.json +0 -18
- package/_bundled_plugin/scripts/normalize_candidates.py +0 -338
- package/_bundled_plugin/scripts/workbench_dashboard.py +0 -159
- package/_bundled_plugin/scripts/workbench_findings.py +0 -221
- package/_bundled_plugin/scripts/workbench_severity.py +0 -119
- package/_bundled_plugin/skills/assess-patch-risk/scripts/validate_patch_risk_assessment.py +0 -163
- package/dist/server/dashboard/THIRD_PARTY_NOTICES.txt +0 -276
- package/dist/server/dashboard/app.css +0 -2
- package/dist/server/dashboard/app.js +0 -66
- package/dist/server/dashboard/index.html +0 -18
- package/dist/server/dashboard-types.d.ts +0 -48
- package/dist/server/dashboard-types.d.ts.map +0 -1
- package/dist/server/dashboard-types.js +0 -2
- package/dist/server/dashboard-types.js.map +0 -1
- package/dist/server/dashboard.d.ts +0 -6
- package/dist/server/dashboard.d.ts.map +0 -1
- package/dist/server/dashboard.js +0 -59
- package/dist/server/dashboard.js.map +0 -1
- package/dist/server/findings-service.d.ts +0 -20
- package/dist/server/findings-service.d.ts.map +0 -1
- package/dist/server/findings-service.js +0 -31
- package/dist/server/findings-service.js.map +0 -1
- package/dist/server/index.d.ts +0 -2
- package/dist/server/index.d.ts.map +0 -1
- package/dist/server/index.js +0 -6
- package/dist/server/index.js.map +0 -1
- package/dist/server/routes.d.ts +0 -6
- package/dist/server/routes.d.ts.map +0 -1
- package/dist/server/routes.js +0 -86
- package/dist/server/routes.js.map +0 -1
- package/dist/server/serve.d.ts +0 -2
- package/dist/server/serve.d.ts.map +0 -1
- package/dist/server/serve.js +0 -28
- package/dist/server/serve.js.map +0 -1
- package/dist/server/server.d.ts +0 -10
- package/dist/server/server.d.ts.map +0 -1
- package/dist/server/server.js +0 -17
- package/dist/server/server.js.map +0 -1
- package/dist/server/validation.d.ts +0 -17
- package/dist/server/validation.d.ts.map +0 -1
- package/dist/server/validation.js +0 -53
- package/dist/server/validation.js.map +0 -1
|
@@ -3,22 +3,53 @@
|
|
|
3
3
|
from __future__ import annotations
|
|
4
4
|
|
|
5
5
|
import argparse
|
|
6
|
+
import codecs
|
|
6
7
|
import hashlib
|
|
7
8
|
import os
|
|
9
|
+
import re
|
|
8
10
|
import shutil
|
|
9
11
|
import sqlite3
|
|
10
12
|
import stat
|
|
11
13
|
import subprocess
|
|
12
14
|
import sys
|
|
13
15
|
import tempfile
|
|
14
|
-
from
|
|
15
|
-
from
|
|
16
|
+
from concurrent.futures import ThreadPoolExecutor
|
|
17
|
+
from pathlib import Path, PurePosixPath
|
|
18
|
+
from typing import Any, BinaryIO, Callable
|
|
16
19
|
|
|
17
20
|
# Some plugin hosts launch Python with safe-path isolation enabled.
|
|
18
21
|
sys.path.insert(0, str(Path(__file__).resolve().parent))
|
|
19
22
|
from filesystem_identity import stored_filesystem_identity_matches
|
|
23
|
+
from rank_preview import DEFAULT_PREVIEW_READ_BYTES, is_binary_sample
|
|
24
|
+
from windows_scan_local_files import copy_directory_junction
|
|
20
25
|
from workbench_constants import GIT_REPOSITORY_ENVIRONMENT
|
|
21
26
|
|
|
27
|
+
_WINDOWS = os.name == "nt"
|
|
28
|
+
|
|
29
|
+
|
|
30
|
+
def committed_diff_snapshot_digest(kind: str, base_revision: str, head_revision: str) -> str:
|
|
31
|
+
digest = hashlib.sha256(
|
|
32
|
+
f"codex-security-diff/v1\0{kind}\0{base_revision}\0{head_revision}".encode()
|
|
33
|
+
).hexdigest()
|
|
34
|
+
return f"codex-security-snapshot/v1:sha256:{digest}"
|
|
35
|
+
|
|
36
|
+
|
|
37
|
+
def diff_snapshot_digest(scan: sqlite3.Row, manifest: dict[str, Any] | None) -> str | None:
|
|
38
|
+
if scan["diff_target_kind"] == "working_tree":
|
|
39
|
+
return scan["diff_content_digest"]
|
|
40
|
+
if scan["diff_target_kind"] in {"commit", "range"}:
|
|
41
|
+
manifest_scan = manifest.get("scan") if manifest is not None else None
|
|
42
|
+
# Preserve the recorded digest when recovery rebuilds a sealed manifest.
|
|
43
|
+
if isinstance(manifest_scan, dict) and (
|
|
44
|
+
manifest_scan.get("sealedAt") is not None or manifest_scan.get("artifacts")
|
|
45
|
+
):
|
|
46
|
+
target = manifest_scan.get("target")
|
|
47
|
+
return target.get("snapshotDigest") if isinstance(target, dict) else None
|
|
48
|
+
return committed_diff_snapshot_digest(
|
|
49
|
+
scan["diff_target_kind"], scan["diff_base_revision"], scan["diff_head_revision"]
|
|
50
|
+
)
|
|
51
|
+
return None
|
|
52
|
+
|
|
22
53
|
|
|
23
54
|
def git_output(
|
|
24
55
|
target: Path,
|
|
@@ -27,7 +58,11 @@ def git_output(
|
|
|
27
58
|
work_tree: Path | None = None,
|
|
28
59
|
) -> str | None:
|
|
29
60
|
completed = git_command(target, *args, text=False, git_dir=git_dir, work_tree=work_tree)
|
|
30
|
-
output = os.fsdecode(completed.stdout)
|
|
61
|
+
output = os.fsdecode(completed.stdout)
|
|
62
|
+
if sys.platform == "win32" and output.endswith("\r\n"):
|
|
63
|
+
output = output[:-2]
|
|
64
|
+
else:
|
|
65
|
+
output = output.removesuffix("\n")
|
|
31
66
|
return output if completed.returncode == 0 and output else None
|
|
32
67
|
|
|
33
68
|
|
|
@@ -41,84 +76,168 @@ def git_bytes(
|
|
|
41
76
|
return completed.stdout if completed.returncode == 0 else None
|
|
42
77
|
|
|
43
78
|
|
|
44
|
-
def
|
|
79
|
+
def git_blob_samples(
|
|
45
80
|
target: Path,
|
|
46
81
|
object_names: list[str],
|
|
47
82
|
*,
|
|
48
83
|
git_dir: Path | None = None,
|
|
49
84
|
work_tree: Path | None = None,
|
|
50
|
-
) -> list[bytes | None]:
|
|
51
|
-
"""
|
|
85
|
+
) -> list[tuple[bytes, bool] | None]:
|
|
86
|
+
"""Sample ordered blobs and classify all their bytes without buffering the batch."""
|
|
52
87
|
if not object_names:
|
|
53
88
|
return []
|
|
54
89
|
|
|
55
90
|
request = b"\0".join(os.fsencode(name) for name in object_names) + b"\0"
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
"
|
|
60
|
-
"
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
91
|
+
read_fd, write_fd = os.pipe()
|
|
92
|
+
with (
|
|
93
|
+
ThreadPoolExecutor(max_workers=1) as reader,
|
|
94
|
+
os.fdopen(read_fd, "rb") as output,
|
|
95
|
+
os.fdopen(write_fd, "wb") as sink,
|
|
96
|
+
):
|
|
97
|
+
|
|
98
|
+
def read_samples() -> list[tuple[bytes, bool] | None]:
|
|
99
|
+
# Closing the reader also unblocks Git if framing is invalid.
|
|
100
|
+
with output:
|
|
101
|
+
return _read_git_batch_samples(output, object_names)
|
|
102
|
+
|
|
103
|
+
samples = reader.submit(read_samples)
|
|
104
|
+
try:
|
|
105
|
+
completed = git_command(
|
|
106
|
+
target,
|
|
107
|
+
"cat-file",
|
|
108
|
+
"--batch",
|
|
109
|
+
"-z",
|
|
110
|
+
text=False,
|
|
111
|
+
input_data=request,
|
|
112
|
+
git_dir=git_dir,
|
|
113
|
+
work_tree=work_tree,
|
|
114
|
+
stdout_file=sink,
|
|
115
|
+
)
|
|
116
|
+
finally:
|
|
117
|
+
# Git may fail before producing all requested records.
|
|
118
|
+
sink.close()
|
|
119
|
+
if completed.returncode != 0:
|
|
120
|
+
return [None] * len(object_names)
|
|
121
|
+
try:
|
|
122
|
+
return samples.result()
|
|
123
|
+
except ValueError:
|
|
124
|
+
return [None] * len(object_names)
|
|
125
|
+
|
|
126
|
+
|
|
127
|
+
def _read_git_batch_samples(
|
|
128
|
+
output: BinaryIO, object_names: list[str]
|
|
129
|
+
) -> list[tuple[bytes, bool] | None]:
|
|
130
|
+
"""Read the older-Git-compatible -z protocol without buffering blob bodies."""
|
|
131
|
+
samples: list[tuple[bytes, bool] | None] = []
|
|
132
|
+
for name in object_names:
|
|
133
|
+
header = output.readline()
|
|
134
|
+
raw_name = os.fsencode(name)
|
|
135
|
+
# Missing lookups echo the whole request, including any embedded newlines.
|
|
136
|
+
if header and raw_name.startswith(header):
|
|
137
|
+
header += output.read(len(raw_name) - len(header)) + output.readline()
|
|
138
|
+
if header in (raw_name + b" missing\n", raw_name + b" ambiguous\n"):
|
|
139
|
+
samples.append(None)
|
|
84
140
|
continue
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
141
|
+
fields = header.split(b" ")
|
|
142
|
+
if len(fields) != 3 or not header.endswith(b"\n"):
|
|
143
|
+
raise ValueError("invalid batch header")
|
|
144
|
+
size = int(fields[2])
|
|
145
|
+
if size < 0:
|
|
146
|
+
raise ValueError("invalid blob size")
|
|
147
|
+
# Consume non-blob objects too, so subsequent records stay aligned.
|
|
148
|
+
sample = _read_git_blob_sample(output, size)
|
|
149
|
+
samples.append(sample if fields[1] == b"blob" else None)
|
|
150
|
+
return samples
|
|
151
|
+
|
|
152
|
+
|
|
153
|
+
def _read_git_blob_sample(output: BinaryIO, size: int) -> tuple[bytes, bool]:
|
|
154
|
+
sample_size = min(size, DEFAULT_PREVIEW_READ_BYTES)
|
|
155
|
+
sample = output.read(sample_size)
|
|
156
|
+
if len(sample) != sample_size:
|
|
157
|
+
raise ValueError("truncated blob")
|
|
158
|
+
binary = is_binary_sample(sample)
|
|
159
|
+
bom = sample[:2] if sample.startswith((codecs.BOM_UTF16_LE, codecs.BOM_UTF16_BE)) else b""
|
|
160
|
+
remaining = size - sample_size
|
|
161
|
+
while remaining:
|
|
162
|
+
chunk_size = min(remaining, DEFAULT_PREVIEW_READ_BYTES)
|
|
163
|
+
chunk = output.read(chunk_size)
|
|
164
|
+
if len(chunk) != chunk_size:
|
|
165
|
+
raise ValueError("truncated blob")
|
|
166
|
+
# Even-sized reads keep UTF-16 code units aligned; preserve the original byte order.
|
|
167
|
+
if not binary:
|
|
168
|
+
binary = is_binary_sample(bom + chunk) if bom else b"\0" in chunk
|
|
169
|
+
remaining -= chunk_size
|
|
170
|
+
if output.read(1) != b"\n":
|
|
171
|
+
raise ValueError("missing blob terminator")
|
|
172
|
+
return (b"", True) if binary else (sample, False)
|
|
96
173
|
|
|
97
174
|
|
|
98
|
-
def
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
175
|
+
def _protected_repository_root(target: Path) -> Path:
|
|
176
|
+
root = target.resolve()
|
|
177
|
+
if root.is_file():
|
|
178
|
+
root = root.parent
|
|
179
|
+
protected = root
|
|
180
|
+
for ancestor in (root, *root.parents):
|
|
181
|
+
try:
|
|
182
|
+
(ancestor / ".git").lstat()
|
|
183
|
+
except FileNotFoundError:
|
|
184
|
+
continue
|
|
185
|
+
protected = ancestor
|
|
186
|
+
return protected
|
|
187
|
+
|
|
188
|
+
|
|
189
|
+
def trusted_git_executable(protected_root: Path) -> str | None:
|
|
190
|
+
"""Validate host-selected Git, or discover Git for a direct plugin invocation."""
|
|
191
|
+
configured = os.environ.get("CODEX_SECURITY_GIT")
|
|
192
|
+
windows = sys.platform == "win32"
|
|
193
|
+
if configured is None:
|
|
194
|
+
names = ("git.exe", "git.com") if windows else ("git",)
|
|
195
|
+
candidates = (
|
|
196
|
+
Path(entry.strip('"') if windows else entry) / name
|
|
197
|
+
for entry in os.get_exec_path()
|
|
198
|
+
for name in names
|
|
199
|
+
)
|
|
200
|
+
elif not configured:
|
|
102
201
|
return None
|
|
202
|
+
else:
|
|
203
|
+
candidate = Path(configured)
|
|
204
|
+
if not candidate.is_absolute():
|
|
205
|
+
raise SystemExit("CODEX_SECURITY_GIT must name an absolute trusted executable.")
|
|
206
|
+
candidates = iter((candidate,))
|
|
207
|
+
|
|
103
208
|
try:
|
|
104
|
-
|
|
105
|
-
except
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
)
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
209
|
+
repository = _protected_repository_root(protected_root)
|
|
210
|
+
except (OSError, RuntimeError):
|
|
211
|
+
return None
|
|
212
|
+
|
|
213
|
+
for candidate in candidates:
|
|
214
|
+
try:
|
|
215
|
+
lexical = Path(os.path.abspath(candidate))
|
|
216
|
+
invocation = candidate.parent.resolve(strict=True) / candidate.name
|
|
217
|
+
canonical = candidate.resolve(strict=True)
|
|
218
|
+
except (OSError, RuntimeError):
|
|
219
|
+
continue
|
|
220
|
+
if (
|
|
221
|
+
not canonical.is_file()
|
|
222
|
+
or not os.access(canonical, os.F_OK if windows else os.X_OK)
|
|
223
|
+
or (
|
|
224
|
+
windows
|
|
225
|
+
and (
|
|
226
|
+
candidate.suffix.lower() not in {".exe", ".com"}
|
|
227
|
+
or canonical.suffix.lower() in {".bat", ".cmd"}
|
|
228
|
+
)
|
|
229
|
+
)
|
|
230
|
+
):
|
|
231
|
+
continue
|
|
232
|
+
if any(
|
|
233
|
+
path == repository or repository in path.parents
|
|
234
|
+
for path in (lexical, invocation, canonical)
|
|
235
|
+
):
|
|
236
|
+
if configured is not None:
|
|
237
|
+
raise SystemExit("CODEX_SECURITY_GIT must stay outside the protected repository.")
|
|
238
|
+
continue
|
|
239
|
+
return str(invocation)
|
|
240
|
+
return None
|
|
122
241
|
|
|
123
242
|
|
|
124
243
|
def git_command(
|
|
@@ -129,6 +248,7 @@ def git_command(
|
|
|
129
248
|
git_dir: Path | None = None,
|
|
130
249
|
work_tree: Path | None = None,
|
|
131
250
|
stdout_file: BinaryIO | None = None,
|
|
251
|
+
pathspec_environment: dict[str, str] | None = None,
|
|
132
252
|
) -> subprocess.CompletedProcess[str] | subprocess.CompletedProcess[bytes]:
|
|
133
253
|
if (git_dir is None) != (work_tree is None):
|
|
134
254
|
raise ValueError("git_dir and work_tree must be provided together")
|
|
@@ -136,9 +256,12 @@ def git_command(
|
|
|
136
256
|
for name in GIT_REPOSITORY_ENVIRONMENT:
|
|
137
257
|
environment.pop(name, None)
|
|
138
258
|
environment["GIT_LITERAL_PATHSPECS"] = "1"
|
|
259
|
+
if pathspec_environment is not None:
|
|
260
|
+
environment.update(pathspec_environment)
|
|
261
|
+
executable = trusted_git_executable(target)
|
|
139
262
|
# Repository-local config is untrusted; fsmonitor may name an executable hook.
|
|
140
263
|
command = [
|
|
141
|
-
"git",
|
|
264
|
+
executable or "git",
|
|
142
265
|
"-c",
|
|
143
266
|
"core.fsmonitor=false",
|
|
144
267
|
"-c",
|
|
@@ -149,6 +272,9 @@ def git_command(
|
|
|
149
272
|
if git_dir is not None and work_tree is not None:
|
|
150
273
|
command.extend(["--git-dir", str(git_dir), "--work-tree", str(work_tree)])
|
|
151
274
|
full_command = [*command, *args]
|
|
275
|
+
if executable is None:
|
|
276
|
+
empty_output = "" if text else b""
|
|
277
|
+
return subprocess.CompletedProcess(full_command, 127, empty_output, empty_output)
|
|
152
278
|
try:
|
|
153
279
|
output_options = (
|
|
154
280
|
{"capture_output": True}
|
|
@@ -172,6 +298,80 @@ def git_command(
|
|
|
172
298
|
return subprocess.CompletedProcess(full_command, 127, empty_output, empty_output)
|
|
173
299
|
|
|
174
300
|
|
|
301
|
+
def candidate_source_lines(
|
|
302
|
+
target: Path,
|
|
303
|
+
diff_target: dict[str, str],
|
|
304
|
+
paths: list[str],
|
|
305
|
+
locations: list[str],
|
|
306
|
+
case_insensitive: bool = False,
|
|
307
|
+
) -> dict[str, dict[str, Any]]:
|
|
308
|
+
"""Resolve candidate sources in the same selected view as the diff inventory."""
|
|
309
|
+
from generate_rank_input import git_changed_paths
|
|
310
|
+
|
|
311
|
+
base, head = diff_target["baseRevision"], diff_target["headRevision"]
|
|
312
|
+
local = diff_target["kind"] == "working_tree"
|
|
313
|
+
changed = {
|
|
314
|
+
path.relative_to(target).as_posix(): status
|
|
315
|
+
for path, status in git_changed_paths(
|
|
316
|
+
target, base, head, "local-patch" if local else "revisions"
|
|
317
|
+
)
|
|
318
|
+
}
|
|
319
|
+
selected_names = set(changed)
|
|
320
|
+
aliases: dict[str, str | None] = {}
|
|
321
|
+
if case_insensitive:
|
|
322
|
+
if not local:
|
|
323
|
+
tree = git_command(target, "ls-tree", "-r", "-t", "-z", "--name-only", head, text=False)
|
|
324
|
+
tree.check_returncode()
|
|
325
|
+
selected_names.update(os.fsdecode(name) for name in tree.stdout.split(b"\0") if name)
|
|
326
|
+
for name in selected_names:
|
|
327
|
+
key = name.lower()
|
|
328
|
+
aliases[key] = None if key in aliases and aliases[key] != name else name
|
|
329
|
+
location_set = set(locations)
|
|
330
|
+
result: dict[str, dict[str, Any]] = {}
|
|
331
|
+
counts: dict[str, int] = {}
|
|
332
|
+
for raw in dict.fromkeys([*paths, *locations]):
|
|
333
|
+
path = PurePosixPath(raw)
|
|
334
|
+
if not raw or path.is_absolute() or ".." in path.parts or "\0" in raw:
|
|
335
|
+
raise ValueError("path: expected a repository-relative path without traversal")
|
|
336
|
+
name = path.as_posix()
|
|
337
|
+
if case_insensitive and name not in selected_names:
|
|
338
|
+
selected = aliases.get(name.lower(), name)
|
|
339
|
+
if selected is None:
|
|
340
|
+
result[raw] = {"error": "missing"}
|
|
341
|
+
continue
|
|
342
|
+
name = selected
|
|
343
|
+
deleted = changed.get(name) == "D"
|
|
344
|
+
if local and not deleted:
|
|
345
|
+
continue
|
|
346
|
+
revision = base if deleted else head
|
|
347
|
+
if name not in changed:
|
|
348
|
+
entry = git_command(target, "ls-tree", "-z", revision, "--", name, text=False)
|
|
349
|
+
entry.check_returncode()
|
|
350
|
+
metadata = next(
|
|
351
|
+
(
|
|
352
|
+
row.partition(b"\t")[0].split()
|
|
353
|
+
for row in entry.stdout.split(b"\0")
|
|
354
|
+
if row.partition(b"\t")[2] == os.fsencode(name)
|
|
355
|
+
),
|
|
356
|
+
[],
|
|
357
|
+
)
|
|
358
|
+
if not metadata or not metadata[0].startswith(b"100"):
|
|
359
|
+
result[raw] = {"error": "not_file" if metadata else "missing"}
|
|
360
|
+
continue
|
|
361
|
+
source: dict[str, Any] = {"path": name}
|
|
362
|
+
if raw in location_set:
|
|
363
|
+
if name not in counts:
|
|
364
|
+
blob = git_command(target, "cat-file", "blob", f"{revision}:{name}", text=False)
|
|
365
|
+
blob.check_returncode()
|
|
366
|
+
data = blob.stdout
|
|
367
|
+
counts[name] = len(re.split(rb"\r\n|[\r\n]", data)) - int(
|
|
368
|
+
not data or data.endswith((b"\r", b"\n"))
|
|
369
|
+
)
|
|
370
|
+
source["lineCount"] = counts[name]
|
|
371
|
+
result[raw] = source
|
|
372
|
+
return result
|
|
373
|
+
|
|
374
|
+
|
|
175
375
|
def _update_digest_field_header(digest: Any, label: bytes, value_size: int) -> None:
|
|
176
376
|
digest.update(len(label).to_bytes(4, "big"))
|
|
177
377
|
digest.update(label)
|
|
@@ -331,11 +531,17 @@ def git_worktree_context(target: Path) -> tuple[Path, str]:
|
|
|
331
531
|
if root is None:
|
|
332
532
|
raise SystemExit("Could not inspect the selected Git working tree.")
|
|
333
533
|
repository = Path(root).resolve()
|
|
534
|
+
prefix = git_bytes(target, "rev-parse", "--show-prefix")
|
|
535
|
+
if prefix is None:
|
|
536
|
+
raise SystemExit("Could not inspect the selected Git working tree.")
|
|
537
|
+
pathspec = os.fsdecode(prefix.removesuffix(b"\n")).removesuffix("/") or "."
|
|
538
|
+
scoped = (repository / pathspec).resolve()
|
|
334
539
|
try:
|
|
335
|
-
|
|
336
|
-
|
|
540
|
+
if not scoped.is_relative_to(repository) or not scoped.samefile(target):
|
|
541
|
+
raise ValueError("Git working tree does not contain the selected target")
|
|
542
|
+
except (OSError, ValueError) as exc:
|
|
337
543
|
raise SystemExit("Scan target must stay inside its Git working tree.") from exc
|
|
338
|
-
return repository,
|
|
544
|
+
return repository, pathspec
|
|
339
545
|
|
|
340
546
|
|
|
341
547
|
def git_submodule_entries(target: Path) -> tuple[tuple[Path, str], ...]:
|
|
@@ -354,14 +560,11 @@ def git_submodule_entries(target: Path) -> tuple[tuple[Path, str], ...]:
|
|
|
354
560
|
) from exc
|
|
355
561
|
if mode != b"160000":
|
|
356
562
|
continue
|
|
357
|
-
|
|
563
|
+
relative_path = Path(os.fsdecode(raw_path)).relative_to(pathspec)
|
|
564
|
+
entries.append((target / relative_path, object_id.decode("ascii")))
|
|
358
565
|
return tuple(entries)
|
|
359
566
|
|
|
360
567
|
|
|
361
|
-
def git_submodule_paths(target: Path) -> tuple[Path, ...]:
|
|
362
|
-
return tuple(path for path, _ in git_submodule_entries(target))
|
|
363
|
-
|
|
364
|
-
|
|
365
568
|
def require_clean_submodule_worktrees(target: Path) -> None:
|
|
366
569
|
for submodule, expected_revision in git_submodule_entries(target):
|
|
367
570
|
relative_path = str(submodule.relative_to(target))
|
|
@@ -373,7 +576,7 @@ def require_clean_submodule_worktrees(target: Path) -> None:
|
|
|
373
576
|
continue
|
|
374
577
|
root = git_output(submodule, "rev-parse", "--show-toplevel")
|
|
375
578
|
try:
|
|
376
|
-
is_initialized = root is not None and Path(root).
|
|
579
|
+
is_initialized = root is not None and Path(root).samefile(submodule)
|
|
377
580
|
except OSError:
|
|
378
581
|
is_initialized = False
|
|
379
582
|
if not is_initialized:
|
|
@@ -409,6 +612,24 @@ def clean_worktree_content_digest() -> str:
|
|
|
409
612
|
return f"codex-security-snapshot/v1:sha256:{digest.hexdigest()}"
|
|
410
613
|
|
|
411
614
|
|
|
615
|
+
def _directory_link_boundary(target: Path, path: Path, linked_prefixes: dict[str, bool]) -> Path:
|
|
616
|
+
# The index can retain descendants of a directory replaced by a link.
|
|
617
|
+
# Keep the link's identity in snapshots without following its contents.
|
|
618
|
+
prefix = target
|
|
619
|
+
for component in path.relative_to(target).parts[:-1]:
|
|
620
|
+
prefix /= component
|
|
621
|
+
key = str(prefix)
|
|
622
|
+
if key not in linked_prefixes:
|
|
623
|
+
metadata = prefix.lstat()
|
|
624
|
+
linked_prefixes[key] = bool(
|
|
625
|
+
stat.S_ISLNK(metadata.st_mode)
|
|
626
|
+
or getattr(metadata, "st_reparse_tag", 0) & 0x20000000
|
|
627
|
+
)
|
|
628
|
+
if linked_prefixes[key]:
|
|
629
|
+
return prefix
|
|
630
|
+
return path
|
|
631
|
+
|
|
632
|
+
|
|
412
633
|
def git_directory_snapshot_paths(target: Path) -> list[Path] | None:
|
|
413
634
|
repository_root = git_output(target, "rev-parse", "--show-toplevel")
|
|
414
635
|
if repository_root is None:
|
|
@@ -417,6 +638,7 @@ def git_directory_snapshot_paths(target: Path) -> list[Path] | None:
|
|
|
417
638
|
scope = repository / pathspec
|
|
418
639
|
scope_depth = len(Path(pathspec).parts)
|
|
419
640
|
matching_prefixes: dict[str, bool] = {}
|
|
641
|
+
linked_prefixes: dict[str, bool] = {}
|
|
420
642
|
listing_args: list[str] = []
|
|
421
643
|
inventory_pathspec = pathspec
|
|
422
644
|
if scope_depth:
|
|
@@ -436,6 +658,7 @@ def git_directory_snapshot_paths(target: Path) -> list[Path] | None:
|
|
|
436
658
|
"--cached",
|
|
437
659
|
"--others",
|
|
438
660
|
"--exclude-standard",
|
|
661
|
+
"-t",
|
|
439
662
|
"-z",
|
|
440
663
|
"--",
|
|
441
664
|
inventory_pathspec,
|
|
@@ -443,9 +666,10 @@ def git_directory_snapshot_paths(target: Path) -> list[Path] | None:
|
|
|
443
666
|
if listed is None:
|
|
444
667
|
raise SystemExit("Could not inspect files in the selected Git working tree.")
|
|
445
668
|
paths: list[Path] = []
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
669
|
+
junctions: dict[tuple[int, int], Path] = {}
|
|
670
|
+
nested_worktrees: set[tuple[int, int]] = set()
|
|
671
|
+
for entry in (entry for entry in listed.split(b"\0") if entry):
|
|
672
|
+
relative = Path(os.fsdecode(entry[2:]))
|
|
449
673
|
if scope_depth:
|
|
450
674
|
if len(relative.parts) <= scope_depth:
|
|
451
675
|
continue
|
|
@@ -462,90 +686,186 @@ def git_directory_snapshot_paths(target: Path) -> list[Path] | None:
|
|
|
462
686
|
# POSIX volumes; WindowsPath equality also folds distinct names.
|
|
463
687
|
if not matching_prefixes[key]:
|
|
464
688
|
continue
|
|
465
|
-
|
|
689
|
+
path = target.joinpath(*relative.parts[scope_depth:])
|
|
466
690
|
try:
|
|
691
|
+
path = _directory_link_boundary(target, path, linked_prefixes)
|
|
467
692
|
metadata = path.lstat()
|
|
468
|
-
except FileNotFoundError:
|
|
469
|
-
# The index can retain
|
|
693
|
+
except (FileNotFoundError, NotADirectoryError):
|
|
694
|
+
# The index can retain deleted paths, including directory-to-file replacements.
|
|
470
695
|
continue
|
|
471
|
-
|
|
472
|
-
|
|
696
|
+
if getattr(metadata, "st_reparse_tag", 0) & 0x20000000:
|
|
697
|
+
# Case aliases share the link's identity. Prefer the stable index
|
|
698
|
+
# spelling over untracked descendants added in its external target.
|
|
699
|
+
identity = metadata.st_dev, metadata.st_ino
|
|
700
|
+
if entry[:1] != b"?" or identity not in junctions:
|
|
701
|
+
junctions[identity] = path
|
|
473
702
|
continue
|
|
474
|
-
|
|
703
|
+
paths.append(path)
|
|
475
704
|
if (
|
|
476
|
-
|
|
477
|
-
|
|
705
|
+
not stat.S_ISDIR(metadata.st_mode)
|
|
706
|
+
or getattr(metadata, "st_reparse_tag", 0) & 0x20000000
|
|
478
707
|
):
|
|
708
|
+
continue
|
|
709
|
+
nested_repository_root = git_output(path, "rev-parse", "--show-toplevel")
|
|
710
|
+
if nested_repository_root is not None and Path(nested_repository_root).samefile(path):
|
|
479
711
|
nested_paths = git_directory_snapshot_paths(path)
|
|
480
712
|
if nested_paths is not None:
|
|
713
|
+
nested_worktrees.add((metadata.st_dev, metadata.st_ino))
|
|
481
714
|
paths.extend(nested_paths)
|
|
482
715
|
continue
|
|
483
|
-
paths.extend(
|
|
484
|
-
|
|
485
|
-
|
|
486
|
-
|
|
716
|
+
paths.extend(source_directory_snapshot_paths(path))
|
|
717
|
+
|
|
718
|
+
if _WINDOWS:
|
|
719
|
+
# Git omits empty untracked directories from its file listing. Inventory
|
|
720
|
+
# junction identities independently of whether their targets contain files.
|
|
721
|
+
git_directory = git_output(target, "rev-parse", "--absolute-git-dir")
|
|
722
|
+
if git_directory is None:
|
|
723
|
+
raise SystemExit("Could not inspect the selected Git working tree.")
|
|
724
|
+
directories = git_bytes(
|
|
725
|
+
target,
|
|
726
|
+
"--no-literal-pathspecs",
|
|
727
|
+
"ls-files",
|
|
728
|
+
"--others",
|
|
729
|
+
"--directory",
|
|
730
|
+
"--exclude-standard",
|
|
731
|
+
"-z",
|
|
732
|
+
"--",
|
|
733
|
+
# Seed only eligible descendants, never the selected directory itself.
|
|
734
|
+
":(glob)**/*/",
|
|
735
|
+
git_dir=Path(git_directory),
|
|
736
|
+
work_tree=repository,
|
|
487
737
|
)
|
|
738
|
+
if directories is None:
|
|
739
|
+
raise SystemExit("Could not inspect directories in the selected Git working tree.")
|
|
740
|
+
pending = [target / os.fsdecode(path) for path in directories.split(b"\0") if path]
|
|
741
|
+
while pending:
|
|
742
|
+
children: list[Path] = []
|
|
743
|
+
for path in pending:
|
|
744
|
+
try:
|
|
745
|
+
path = _directory_link_boundary(target, path, linked_prefixes)
|
|
746
|
+
metadata = path.lstat()
|
|
747
|
+
except (FileNotFoundError, NotADirectoryError):
|
|
748
|
+
continue
|
|
749
|
+
if getattr(metadata, "st_reparse_tag", 0) & 0x20000000:
|
|
750
|
+
junctions.setdefault((metadata.st_dev, metadata.st_ino), path)
|
|
751
|
+
elif stat.S_ISLNK(metadata.st_mode):
|
|
752
|
+
paths.append(path)
|
|
753
|
+
elif stat.S_ISDIR(metadata.st_mode):
|
|
754
|
+
if (metadata.st_dev, metadata.st_ino) in nested_worktrees:
|
|
755
|
+
# Its own inventory already applied its repository exclusions.
|
|
756
|
+
continue
|
|
757
|
+
try:
|
|
758
|
+
children.extend(path.iterdir())
|
|
759
|
+
except PermissionError:
|
|
760
|
+
# Match Git's treatment of unreadable descendants.
|
|
761
|
+
continue
|
|
762
|
+
candidates: dict[bytes, Path] = {}
|
|
763
|
+
for path in children:
|
|
764
|
+
if os.path.normcase(path.name) == ".git":
|
|
765
|
+
continue
|
|
766
|
+
try:
|
|
767
|
+
metadata = path.lstat()
|
|
768
|
+
except (FileNotFoundError, NotADirectoryError, PermissionError):
|
|
769
|
+
continue
|
|
770
|
+
if not (stat.S_ISDIR(metadata.st_mode) or stat.S_ISLNK(metadata.st_mode)):
|
|
771
|
+
continue
|
|
772
|
+
relative = (Path(pathspec) / path.relative_to(target)).as_posix()
|
|
773
|
+
candidates[os.fsencode(relative)] = path
|
|
774
|
+
if not candidates:
|
|
775
|
+
break
|
|
776
|
+
# Filter a directory level at once, retaining the outer repository context.
|
|
777
|
+
ignored = git_command(
|
|
778
|
+
repository,
|
|
779
|
+
"--no-literal-pathspecs",
|
|
780
|
+
"check-ignore",
|
|
781
|
+
"-z",
|
|
782
|
+
"--stdin",
|
|
783
|
+
text=False,
|
|
784
|
+
input_data=b"\0".join(candidates) + b"\0",
|
|
785
|
+
git_dir=Path(git_directory),
|
|
786
|
+
work_tree=repository,
|
|
787
|
+
pathspec_environment={
|
|
788
|
+
"GIT_NOGLOB_PATHSPECS": "0",
|
|
789
|
+
},
|
|
790
|
+
)
|
|
791
|
+
if ignored.returncode not in (0, 1):
|
|
792
|
+
raise SystemExit("Could not inspect directories in the selected Git working tree.")
|
|
793
|
+
excluded = set(ignored.stdout.split(b"\0"))
|
|
794
|
+
pending = [path for raw, path in candidates.items() if raw not in excluded]
|
|
795
|
+
paths.extend(junctions.values())
|
|
488
796
|
return sorted({str(path): path for path in paths}.values(), key=str)
|
|
489
797
|
|
|
490
798
|
|
|
491
|
-
def source_directory_snapshot_paths(
|
|
799
|
+
def source_directory_snapshot_paths(
|
|
800
|
+
target: Path,
|
|
801
|
+
excluded: tuple[Path, ...] = (),
|
|
802
|
+
*,
|
|
803
|
+
onerror: Callable[[OSError], None] | None = None,
|
|
804
|
+
) -> list[Path]:
|
|
492
805
|
paths: list[Path] = []
|
|
493
|
-
|
|
494
|
-
|
|
495
|
-
|
|
496
|
-
|
|
806
|
+
for directory, directories, files in os.walk(
|
|
807
|
+
target, topdown=True, followlinks=False, onerror=onerror
|
|
808
|
+
):
|
|
809
|
+
parent = Path(directory)
|
|
810
|
+
for name in directories[:]:
|
|
811
|
+
path = parent / name
|
|
812
|
+
if name == ".git" or path in excluded:
|
|
813
|
+
directories.remove(name)
|
|
497
814
|
continue
|
|
498
815
|
paths.append(path)
|
|
499
|
-
metadata = path.lstat()
|
|
500
816
|
# Name-surrogate reparse points include Windows directory junctions.
|
|
501
|
-
if (
|
|
502
|
-
|
|
503
|
-
|
|
504
|
-
|
|
505
|
-
|
|
817
|
+
if getattr(path.lstat(), "st_reparse_tag", 0) & 0x20000000:
|
|
818
|
+
directories.remove(name)
|
|
819
|
+
paths.extend(
|
|
820
|
+
parent / name for name in files if name != ".git" and parent / name not in excluded
|
|
821
|
+
)
|
|
506
822
|
return sorted(paths)
|
|
507
823
|
|
|
508
824
|
|
|
509
825
|
def directory_content_digest(
|
|
510
|
-
target: Path,
|
|
826
|
+
target: Path,
|
|
827
|
+
*,
|
|
828
|
+
excluded: tuple[Path, ...] = (),
|
|
829
|
+
include_ignored: bool = False,
|
|
511
830
|
) -> str:
|
|
512
|
-
|
|
513
|
-
|
|
514
|
-
|
|
515
|
-
|
|
516
|
-
|
|
517
|
-
|
|
831
|
+
def raise_walk_error(error: OSError) -> None:
|
|
832
|
+
raise error
|
|
833
|
+
|
|
834
|
+
excluded_relative = [
|
|
835
|
+
path.relative_to(target) for path in excluded if path.is_relative_to(target)
|
|
836
|
+
]
|
|
518
837
|
paths = (
|
|
519
|
-
source_directory_snapshot_paths(target)
|
|
838
|
+
source_directory_snapshot_paths(target, excluded, onerror=raise_walk_error)
|
|
520
839
|
if include_ignored
|
|
521
840
|
else git_directory_snapshot_paths(target)
|
|
522
841
|
)
|
|
523
842
|
if paths is None:
|
|
524
|
-
paths =
|
|
843
|
+
paths = source_directory_snapshot_paths(target)
|
|
525
844
|
digest = hashlib.sha256()
|
|
526
845
|
update_digest_field(digest, b"format", b"codex-security-directory/v1")
|
|
527
846
|
for path in paths:
|
|
528
847
|
relative_path = path.relative_to(target)
|
|
529
|
-
if any(
|
|
530
|
-
relative_path == excluded_path or excluded_path in relative_path.parents
|
|
531
|
-
for excluded_path in excluded_relative
|
|
532
|
-
):
|
|
848
|
+
if any(relative_path.is_relative_to(path) for path in excluded_relative):
|
|
533
849
|
continue
|
|
534
850
|
try:
|
|
535
851
|
metadata = path.lstat()
|
|
536
852
|
except OSError as exc:
|
|
537
853
|
raise SystemExit(f"Could not read local file: {relative_path}") from exc
|
|
854
|
+
mode = metadata.st_mode
|
|
855
|
+
link_target = (
|
|
856
|
+
os.readlink(path)
|
|
857
|
+
if stat.S_ISLNK(mode) or getattr(metadata, "st_reparse_tag", 0) & 0x20000000
|
|
858
|
+
else None
|
|
859
|
+
)
|
|
538
860
|
raw_path = os.fsencode(relative_path.as_posix())
|
|
539
861
|
update_digest_field(digest, b"path", raw_path)
|
|
540
|
-
update_digest_field(digest, b"mode", str(stat.S_IMODE(
|
|
541
|
-
if
|
|
542
|
-
include_ignored and getattr(metadata, "st_reparse_tag", 0) & 0x20000000
|
|
543
|
-
):
|
|
862
|
+
update_digest_field(digest, b"mode", str(stat.S_IMODE(mode)).encode())
|
|
863
|
+
if link_target is not None:
|
|
544
864
|
update_digest_field(digest, b"kind", b"symlink")
|
|
545
|
-
update_digest_field(digest, b"content", os.fsencode(
|
|
546
|
-
elif stat.S_ISDIR(
|
|
865
|
+
update_digest_field(digest, b"content", os.fsencode(link_target))
|
|
866
|
+
elif stat.S_ISDIR(mode):
|
|
547
867
|
update_digest_field(digest, b"kind", b"directory")
|
|
548
|
-
elif stat.S_ISREG(
|
|
868
|
+
elif stat.S_ISREG(mode):
|
|
549
869
|
content_digest = hashlib.sha256()
|
|
550
870
|
content_size = 0
|
|
551
871
|
try:
|
|
@@ -566,7 +886,7 @@ def directory_content_digest(
|
|
|
566
886
|
def directory_snapshot_regular_file_count(target: Path) -> int:
|
|
567
887
|
paths = git_directory_snapshot_paths(target)
|
|
568
888
|
if paths is None:
|
|
569
|
-
paths =
|
|
889
|
+
paths = source_directory_snapshot_paths(target)
|
|
570
890
|
count = 0
|
|
571
891
|
for path in paths:
|
|
572
892
|
try:
|
|
@@ -578,26 +898,55 @@ def directory_snapshot_regular_file_count(target: Path) -> int:
|
|
|
578
898
|
return count
|
|
579
899
|
|
|
580
900
|
|
|
581
|
-
def copy_directory_excluding(
|
|
582
|
-
|
|
583
|
-
|
|
584
|
-
|
|
585
|
-
|
|
586
|
-
|
|
587
|
-
|
|
901
|
+
def copy_directory_excluding(
|
|
902
|
+
source: Path, destination: Path, excluded: tuple[Path, ...]
|
|
903
|
+
) -> list[Path]:
|
|
904
|
+
excluded_relative = [
|
|
905
|
+
path.relative_to(source) for path in excluded if path.is_relative_to(source)
|
|
906
|
+
]
|
|
907
|
+
|
|
908
|
+
junctions: list[Path] = []
|
|
588
909
|
|
|
589
910
|
def ignored(directory: str, names: list[str]) -> list[str]:
|
|
590
911
|
relative = Path(directory).relative_to(source)
|
|
591
|
-
|
|
912
|
+
skipped = [
|
|
592
913
|
path.name
|
|
593
914
|
for path in excluded_relative
|
|
594
915
|
if path.parent == relative and path.name in names
|
|
595
916
|
]
|
|
917
|
+
for name in names:
|
|
918
|
+
if name in skipped:
|
|
919
|
+
continue
|
|
920
|
+
path = Path(directory) / name
|
|
921
|
+
metadata = path.lstat()
|
|
922
|
+
if (
|
|
923
|
+
stat.S_ISDIR(metadata.st_mode)
|
|
924
|
+
and getattr(metadata, "st_reparse_tag", 0) & 0x20000000
|
|
925
|
+
):
|
|
926
|
+
junctions.append(relative / name)
|
|
927
|
+
skipped.append(name)
|
|
928
|
+
return skipped
|
|
596
929
|
|
|
597
930
|
shutil.copytree(source, destination, symlinks=True, ignore=ignored)
|
|
598
931
|
|
|
932
|
+
# Empty placeholders retain parent directories while a patch is reversed.
|
|
933
|
+
for path in junctions:
|
|
934
|
+
(destination / path).mkdir()
|
|
935
|
+
return junctions
|
|
599
936
|
|
|
600
|
-
|
|
937
|
+
|
|
938
|
+
def restore_directory_junctions(source: Path, destination: Path, junctions: list[Path]) -> None:
|
|
939
|
+
# Recreate links only after patch application can no longer write through them.
|
|
940
|
+
destination = destination.resolve()
|
|
941
|
+
for path in junctions:
|
|
942
|
+
placeholder = require_remediation_target(str(destination / path))
|
|
943
|
+
os.chmod(placeholder, stat.S_IMODE((source / path).lstat().st_mode))
|
|
944
|
+
copy_directory_junction(source / path, placeholder)
|
|
945
|
+
|
|
946
|
+
|
|
947
|
+
def copy_git_worktree_files(
|
|
948
|
+
source: Path, destination: Path, excluded: tuple[Path, ...]
|
|
949
|
+
) -> tuple[Path, list[Path]]:
|
|
601
950
|
repository, pathspec = git_worktree_context(source)
|
|
602
951
|
listed = git_bytes(
|
|
603
952
|
repository,
|
|
@@ -614,22 +963,36 @@ def copy_git_worktree_files(source: Path, destination: Path, excluded: tuple[Pat
|
|
|
614
963
|
excluded_relative = []
|
|
615
964
|
for path in excluded:
|
|
616
965
|
try:
|
|
617
|
-
|
|
966
|
+
relative_path = path.relative_to(repository)
|
|
618
967
|
except ValueError:
|
|
619
|
-
|
|
968
|
+
try:
|
|
969
|
+
relative_path = Path(pathspec) / path.relative_to(source)
|
|
970
|
+
except ValueError:
|
|
971
|
+
continue
|
|
972
|
+
excluded_relative.append(relative_path)
|
|
620
973
|
destination.mkdir()
|
|
974
|
+
junctions: set[Path] = set()
|
|
975
|
+
nested_worktrees: list[Path] = []
|
|
976
|
+
linked_prefixes: dict[str, bool] = {}
|
|
977
|
+
copied: set[Path] = set()
|
|
621
978
|
for raw_path in sorted(path for path in listed.split(b"\0") if path):
|
|
622
979
|
relative = Path(os.fsdecode(raw_path))
|
|
623
|
-
if any(
|
|
624
|
-
relative == excluded_path or excluded_path in relative.parents
|
|
625
|
-
for excluded_path in excluded_relative
|
|
626
|
-
):
|
|
980
|
+
if any(relative.is_relative_to(path) for path in excluded_relative):
|
|
627
981
|
continue
|
|
628
982
|
source_path = repository / relative
|
|
629
983
|
try:
|
|
984
|
+
if _WINDOWS:
|
|
985
|
+
source_path = _directory_link_boundary(repository, source_path, linked_prefixes)
|
|
986
|
+
relative = source_path.relative_to(repository)
|
|
630
987
|
metadata = source_path.lstat()
|
|
631
988
|
except FileNotFoundError:
|
|
632
989
|
continue
|
|
990
|
+
if relative in copied:
|
|
991
|
+
continue
|
|
992
|
+
copied.add(relative)
|
|
993
|
+
if stat.S_ISDIR(metadata.st_mode) and getattr(metadata, "st_reparse_tag", 0) & 0x20000000:
|
|
994
|
+
junctions.add(relative)
|
|
995
|
+
continue
|
|
633
996
|
destination_path = destination / relative
|
|
634
997
|
destination_path.parent.mkdir(parents=True, exist_ok=True)
|
|
635
998
|
if stat.S_ISLNK(metadata.st_mode):
|
|
@@ -640,13 +1003,30 @@ def copy_git_worktree_files(source: Path, destination: Path, excluded: tuple[Pat
|
|
|
640
1003
|
nested_git_dir = git_output(source_path, "rev-parse", "--absolute-git-dir")
|
|
641
1004
|
if nested_git_dir is None:
|
|
642
1005
|
raise SystemExit(f"Could not inspect nested Git working tree: {relative}")
|
|
643
|
-
copy_git_worktree_files(source_path, destination_path, excluded)
|
|
1006
|
+
_, nested_junctions = copy_git_worktree_files(source_path, destination_path, excluded)
|
|
1007
|
+
junctions.update(relative / path for path in nested_junctions)
|
|
1008
|
+
nested_worktrees.append(relative)
|
|
644
1009
|
(destination_path / ".git").write_text(f"gitdir: {nested_git_dir}\n", encoding="utf-8")
|
|
645
1010
|
else:
|
|
646
1011
|
raise SystemExit(f"Unsupported Git working-tree file type: {relative}")
|
|
1012
|
+
if _WINDOWS:
|
|
1013
|
+
for path in git_directory_snapshot_paths(source) or []:
|
|
1014
|
+
relative = Path(pathspec) / path.relative_to(source)
|
|
1015
|
+
if any(
|
|
1016
|
+
relative.is_relative_to(root) for root in [*excluded_relative, *nested_worktrees]
|
|
1017
|
+
):
|
|
1018
|
+
continue
|
|
1019
|
+
metadata = path.lstat()
|
|
1020
|
+
if (
|
|
1021
|
+
stat.S_ISDIR(metadata.st_mode)
|
|
1022
|
+
and getattr(metadata, "st_reparse_tag", 0) & 0x20000000
|
|
1023
|
+
):
|
|
1024
|
+
junctions.add(relative)
|
|
1025
|
+
for path in junctions:
|
|
1026
|
+
(destination / path).mkdir(parents=True, exist_ok=True)
|
|
647
1027
|
copied_target = destination if pathspec == "." else destination / pathspec
|
|
648
1028
|
copied_target.mkdir(parents=True, exist_ok=True)
|
|
649
|
-
return copied_target
|
|
1029
|
+
return copied_target, sorted(junctions)
|
|
650
1030
|
|
|
651
1031
|
|
|
652
1032
|
def git_revision(target: Path) -> str:
|
|
@@ -663,7 +1043,7 @@ def git_target_metadata(target: Path) -> dict[str, Any]:
|
|
|
663
1043
|
and is_worktree
|
|
664
1044
|
and revision is not None
|
|
665
1045
|
and repository_root is not None
|
|
666
|
-
and Path(repository_root).
|
|
1046
|
+
and Path(repository_root).samefile(target)
|
|
667
1047
|
)
|
|
668
1048
|
metadata: dict[str, Any] = {
|
|
669
1049
|
"hasHead": revision is not None,
|
|
@@ -679,7 +1059,7 @@ def git_target_metadata(target: Path) -> dict[str, Any]:
|
|
|
679
1059
|
subject = git_bytes(target, "show", "-s", "--format=%s", "HEAD")
|
|
680
1060
|
metadata.update(
|
|
681
1061
|
{
|
|
682
|
-
"commitSubject": (subject or b"").decode("utf-8").strip() or None,
|
|
1062
|
+
"commitSubject": (subject or b"").decode("utf-8", errors="replace").strip() or None,
|
|
683
1063
|
"revision": revision,
|
|
684
1064
|
"shortRevision": revision[:7],
|
|
685
1065
|
}
|
|
@@ -768,17 +1148,13 @@ def scan_target_warning(scan: sqlite3.Row) -> str | None:
|
|
|
768
1148
|
"Working-tree contents changed while the scan was running; "
|
|
769
1149
|
"results were saved for the original snapshot."
|
|
770
1150
|
)
|
|
771
|
-
except (OSError, SystemExit):
|
|
1151
|
+
except (OSError, SystemExit) as error:
|
|
772
1152
|
return (
|
|
773
|
-
"
|
|
1153
|
+
f"Could not verify the scan target after scanning: {error}; "
|
|
774
1154
|
"results were saved for the original revision or snapshot."
|
|
775
1155
|
)
|
|
776
1156
|
return None
|
|
777
1157
|
|
|
778
1158
|
|
|
779
|
-
def main() -> None:
|
|
780
|
-
argparse.ArgumentParser(description=__doc__).parse_args()
|
|
781
|
-
|
|
782
|
-
|
|
783
1159
|
if __name__ == "__main__":
|
|
784
|
-
|
|
1160
|
+
argparse.ArgumentParser(description=__doc__).parse_args()
|