Merge remote-tracking branch 'origin/main' into fix/maven-discovery-false-attestation

# Conflicts:
#	crates/socket-patch-cli/CLI_CONTRACT.md
#	crates/socket-patch-cli/src/commands/vex_sources.rs
#	crates/socket-patch-core/src/vex/discover/mod.rs

Author: mikolalysenko

crates/socket-patch-cli/CLI_CONTRACT.md

@@ -722,6 +722,7 @@ mod tests {
             resolved: None,
             integrity: LockIntegrity::None,
             source_kind: SourceKind::Unspecified,
+            pnpm_env: false,
         }
     }
 

crates/socket-patch-cli/src/commands/scan/discovery.rs

@@ -981,8 +981,10 @@ fn overlap_from_states(
 /// them to right now — the truth source for takeover direction.
 ///
 /// Both directions are proved by lockfile discovery with the same liveness
-/// rules `vex` gates attestations on (core `Discovery::redirect_record_live`
-/// / `Discovery::vendor_entry_live`). `redirect` holds the overlap PURLs the
+/// rules `vex` gates attestations on (core `Discovery::redirect_record_verdict`
+/// / `Discovery::vendor_entry_live`); a hosted record on a patch server this
+/// run was not given (`RecordLiveness::Undecided`) counts as wired, since the
+/// wiring is still there. `redirect` holds the overlap PURLs the
 /// lock routes to the hosted patch server (the vendored ledger entry is
 /// stale); `vendored` holds those it routes to a committed
 /// `.socket/vendor/<eco>/<uuid>` artifact.
@@ -1067,7 +1069,7 @@ pub(super) async fn classify_overlap_takeover_with(
     let mut liveness = LedgerLiveness::new(cwd, discovery, None);
     for purl in overlap {
         let hosted_live = match redirect_uuid_by_purl.get(&PurlKey::new(&purl)) {
-            Some(uuid) => liveness.redirect_record(&purl, uuid).await,
+            Some(uuid) => liveness.redirect_record_retained(&purl, uuid).await,
             None => discovery.wires_package(&purl, WiringMode::Hosted),
         };
         // `None`: undecided (a JVM pom that cannot be read, or a tree still
@@ -1394,8 +1396,9 @@ async fn gradle_scan(
 /// pin names the purl (`redirect_state`, the lockfiles' hosted state — see
 /// [`crate::commands::hosted_state_from_pins`]) AND lockfile discovery
 /// proves the current lockfile still routes it to that hosted patch — core
-/// `Discovery::redirect_record_live`, the same liveness rule `vex` gates
-/// hosted attestations on.
+/// `Discovery::redirect_record_verdict`, the same liveness rule `vex` gates
+/// hosted attestations on, keeping a record on a patch server this run was
+/// not given (`RecordLiveness::Undecided`): its wiring is still retained.
 ///
 /// Deliberately NOT routed through [`classify_overlap_takeover`]: that
 /// classifier keys on purls present in BOTH ledgers, so hosted-only wiring
@@ -1438,7 +1441,7 @@ pub(super) async fn hosted_wiring_retained_purls(
     let mut liveness = LedgerLiveness::new(cwd, &discovery, None);
     let mut out = Vec::new();
     for (purl, uuid) in candidates {
-        if liveness.redirect_record(&purl, uuid).await {
+        if liveness.redirect_record_retained(&purl, uuid).await {
             out.push(purl);
         }
     }

crates/socket-patch-cli/src/commands/scan/mod.rs

@@ -44,7 +44,10 @@
 //!   whatever raw text survives. Only for a uuid no read file mentions
 //!   (formats no extractor reads, patch servers outside the host allowlist)
 //!   does the ledger's own recorded wiring decide — only files that PIN the
-//!   resolution, never a leftover registry definition; a vendor entry
+//!   resolution, never a leftover registry definition — and a hosted
+//!   record whose lock entry or recorded wiring routes the uuid through a
+//!   hosted-shaped url on an origin this run was not given is never
+//!   attested (core `RecordLiveness::Undecided`, fail closed); a vendor entry
 //!   recording no wiring (repair's reconstruction) probes its ecosystem's
 //!   root locks; a lock inventory entry resolving the purl elsewhere is
 //!   dead. A reverted lockfile plus a leftover ledger or artifact must not
@@ -82,7 +85,7 @@ use socket_patch_core::utils::purl::strip_purl_qualifiers;
 use socket_patch_core::utils::purl_key::{canonical_base_purl, PurlKey};
 use socket_patch_core::vendor::state::{VendorArtifact, VendorEntry, VendorState};
 use socket_patch_core::vex::discover::{
-    vendor_ref, Discovery, LedgerLiveness, PatchedRef, WiringMode,
+    vendor_ref, Discovery, LedgerLiveness, PatchedRef, RecordLiveness, WiringMode,
 };
 use socket_patch_core::vex::{FailedPatch, Unattested, UnattestedKind};
 
@@ -237,6 +240,14 @@ const NOTE_MAVEN_PROFILE_UNPATCHED: &str = "vex_maven_profile_unpatched";
 /// Omission tag and note for [`UnattestedKind::MavenConfigOverride`]
 /// (`vex::Unattested`).
 const NOTE_MAVEN_CONFIG_OVERRIDE: &str = "vex_maven_config_override";
+/// Omission tag and note: a hosted Cargo pin beside another declaration of
+/// the crate that names no Socket registry, which cargo resolves as a
+/// separate, unpatched package (`vex::Unattested`).
+const NOTE_CARGO_UNPINNED_DECLARATION: &str = "vex_cargo_unpinned_declaration";
+/// Omission tag and note: a vendored Cargo copy beside a copy of the crate
+/// from a source its `[patch]` entry does not redirect (another registry,
+/// git), which cargo builds unpatched (`vex::Unattested`).
+const NOTE_CARGO_PATCH_BYPASSED: &str = "vex_cargo_patch_bypassed";
 /// Omission tag and note: a pnpm lock pins the patch, but a
 /// `pnpm-lock.<branch>.yaml` exists, which pnpm installs from instead when
 /// `gitBranchLockfile` is on; its presence withholds (`vex::Unattested`).
@@ -321,6 +332,15 @@ fn unattested_note(kind: UnattestedKind) -> (&'static str, &'static str) {
              through; the wiring itself is intact, so re-running `scan` does not change this \
              (drop that -D from .mvn/maven.config, or write the pinned version literally)",
         ),
+        UnattestedKind::CargoUnpinnedDeclaration => (
+            NOTE_CARGO_UNPINNED_DECLARATION,
+            "not attested while that declaration stands",
+        ),
+        UnattestedKind::CargoPatchBypassed => (
+            NOTE_CARGO_PATCH_BYPASSED,
+            "not attested while that copy can build beside the vendored one; the vendored \
+             wiring itself is intact (the warning above says how to clear it)",
+        ),
         UnattestedKind::PnpmGitBranchLock => (
             NOTE_PNPM_GIT_BRANCH_LOCKFILE,
             "not attested while any branch lock exists (or the members that could hold one \
@@ -681,9 +701,14 @@ pub(crate) async fn plan(
                 continue;
             }
         } else if cand.redirected {
-            let live = assumed.contains(strip_purl_qualifiers(&cand.key))
-                || liveness.redirect_record(&cand.key, &cand.uuid).await;
-            if live {
+            let verdict = if assumed.contains(strip_purl_qualifiers(&cand.key)) {
+                RecordLiveness::Live
+            } else {
+                liveness
+                    .redirect_record_verdict(&cand.key, &cand.uuid)
+                    .await
+            };
+            if verdict.attests() {
                 Basis::Hosted {
                     lockfile_basis: false,
                 }
@@ -692,6 +717,9 @@ pub(crate) async fn plan(
                 // purl: verify it as the agent-mode patch it now is.
                 Basis::Installed
             } else {
+                if verdict == RecordLiveness::Undecided {
+                    notes.push(foreign_origin_note(&cand.key, &cand.uuid));
+                }
                 notes.extend(dead_claim_notes(
                     &discovery,
                     &cand.key,
@@ -1117,6 +1145,20 @@ fn dead_claim_notes(
     notes
 }
 
+/// Why a hosted-ledger record whose wiring resolves from a patch server
+/// this run was not given ([`RecordLiveness::Undecided`]) is not attested:
+/// fail closed, and say how a staging server is admitted.
+fn foreign_origin_note(key: &str, uuid: &str) -> PlanNote {
+    PlanNote {
+        code: NOTE_CLAIM_UNWIRED,
+        detail: format!(
+            "{key}: the hosted ledger records patch {uuid}, but its wiring resolves it from a \
+             patch server this run was not given; pass --patch-server-url for a non-production \
+             patch server; not attested"
+        ),
+    }
+}
+
 /// A local record for `uuid` (manifest, then redirect ledger, then vendor
 /// entries) with the key it is filed under.
 fn local_record_by_uuid(
@@ -2111,6 +2153,106 @@ mod tests {
         );
     }
 
+    /// A hosted Cargo pin beside an unpinned declaration of the crate is
+    /// omitted as `vex_cargo_unpinned_declaration`, the note naming the
+    /// declaration and the remedy.
+    #[tokio::test]
+    async fn a_cargo_pin_beside_an_unpinned_declaration_is_gated() {
+        const PURL: &str = "pkg:cargo/serde@1.0.1";
+        let tmp = tempfile::tempdir().unwrap();
+        let mut redirect = RedirectState::new();
+        redirect.records.insert(PURL.into(), record(U1));
+        let mut found = discovery(vec![hosted_ref(PURL, U1, true)]);
+        found.unattested.push(socket_patch_core::vex::Unattested {
+            purl: PURL.into(),
+            uuid: U1.into(),
+            file: "crates/a/Cargo.toml".into(),
+            detail: "crates/a/Cargo.toml declares serde \"1\" from crates.io, not registry \
+                     \"socket-patch-…\"; re-run `socket-patch scan` to pin it too"
+                .into(),
+            kind: UnattestedKind::CargoUnpinnedDeclaration,
+        });
+        let gated = plan(
+            &common(tmp.path()),
+            Sources {
+                manifest: PatchManifest::new(),
+                vendor: VendorState::new(),
+                redirect: Some(redirect),
+                discovery: found,
+            },
+            &[],
+            &RunApiClient::new(),
+        )
+        .await;
+        assert!(gated.view.patches.is_empty() && gated.hosted.is_empty());
+        assert_eq!(
+            gated.gated,
+            vec![failed(PURL, NOTE_CARGO_UNPINNED_DECLARATION)]
+        );
+        assert!(
+            gated
+                .notes
+                .iter()
+                .any(|n| n.code == NOTE_CARGO_UNPINNED_DECLARATION
+                    && n.detail.contains("crates/a/Cargo.toml declares serde")
+                    && n.detail.ends_with(
+                        "re-run `socket-patch scan` to pin it too; not attested while that \
+                         declaration stands"
+                    )),
+            "{:?}",
+            gated.notes
+        );
+    }
+
+    /// A vendored Cargo copy beside a copy of the crate its `[patch]`
+    /// entry does not redirect is omitted as `vex_cargo_patch_bypassed`,
+    /// the note naming that copy and the remedy.
+    #[tokio::test]
+    async fn a_vendored_cargo_copy_beside_a_bypassing_source_is_gated() {
+        const PURL: &str = "pkg:cargo/serde@1.0.1";
+        let tmp = tempfile::tempdir().unwrap();
+        let mut manifest = PatchManifest::new();
+        manifest.patches.insert(PURL.into(), record(U1));
+        let vref = vendor_ref(&format!(".socket/vendor/cargo/{U1}/serde-1.0.1")).unwrap();
+        let mut found = discovery(vec![PatchedRef::vendored(
+            PURL.into(),
+            &vref,
+            "Cargo.toml",
+            None,
+        )]);
+        found.unattested.push(socket_patch_core::vex::Unattested {
+            purl: PURL.into(),
+            uuid: U1.into(),
+            file: "crates/a/Cargo.toml".into(),
+            detail: "crates/a/Cargo.toml declares serde \"1\" from registry `my-corp`".into(),
+            kind: UnattestedKind::CargoPatchBypassed,
+        });
+        let gated = plan(
+            &common(tmp.path()),
+            Sources {
+                manifest,
+                vendor: VendorState::new(),
+                redirect: None,
+                discovery: found,
+            },
+            &[],
+            &RunApiClient::new(),
+        )
+        .await;
+        assert!(gated.view.patches.is_empty() && gated.hosted.is_empty());
+        assert_eq!(gated.gated, vec![failed(PURL, NOTE_CARGO_PATCH_BYPASSED)]);
+        assert!(
+            gated
+                .notes
+                .iter()
+                .any(|n| n.code == NOTE_CARGO_PATCH_BYPASSED
+                    && n.detail.contains("from registry `my-corp`")
+                    && n.detail.contains("says how to clear it")),
+            "{:?}",
+            gated.notes
+        );
+    }
+
     /// Ledger-only records with no wiring anywhere are gated, except the
     /// manifest-owned one, which falls back to agent-mode verification; an
     /// in-run confirmed purl is live by construction.

crates/socket-patch-cli/src/commands/vex_sources.rs

@@ -913,48 +913,31 @@ fn cargo_hosted_f_spoofed_references_never_attest() {
     let run = fx.vex(&["--proxy-url", &api.uri()]);
     assert_nothing_discovered(&run, "foreign host");
     assert_eq!(api.hits(), 0, "a foreign-host uuid is never even fetched");
-    // DELIBERATE (the staging fallback): a uuid on a host outside the
-    // allowlist is not a lockfile reference, but it is not "recognized"
-    // either, so a redirect-ledger record for it falls back to the ledger's
-    // own recorded wiring files — which still name it — so that a staging
-    // `scan --mode hosted` run without `--patch-server-url` keeps
-    // attesting. Hash verification still judges the copy the build
-    // consumes (the foreign registry's): nothing is installed here, so the
-    // default run omits it; only `--no-verify`, which trusts the ledger's
-    // record by definition, attests.
+    // Fail closed: a ledger record wired through a hosted-shaped url on an
+    // unconfigured origin is `redirect_unwired` whatever is installed, even
+    // under `--no-verify` (CLI_CONTRACT.md, "Patch hosts (manifest-less VEX)").
     write_redirect_ledger(&fx, CARGO_PURL, cargo_record(U), CARGO_HOSTED_EDITS);
-    let run = fx.vex(&["--offline"]);
-    assert_omitted(
-        &run,
-        CARGO_PURL,
-        "package_not_found",
-        "foreign host + ledger",
-    );
-    fx.install_crate(SOCKET_CARGO_SRC, PATCHED_RS);
-    let run = fx.vex(&["--offline"]);
-    assert_omitted(
-        &run,
-        CARGO_PURL,
-        "package_not_found",
-        "foreign host + ledger: Socket's copy is not what this lock builds",
-    );
-    fx.install_crate("evil.example-0123456789abcdef", PRISTINE_RS);
-    let run = fx.vex(&["--offline"]);
-    assert_eq!(
-        run.code,
-        Some(1),
-        "foreign registry's pristine copy: {}",
-        run.env
-    );
-    let run = fx.vex(&["--offline", "--no-verify"]);
-    assert_attested(
-        &fx,
-        &run,
-        CARGO_PURL,
-        U,
-        "redirected",
-        "staging fallback, --no-verify",
-    );
+    for (state, install) in [
+        ("not installed", None),
+        ("Socket's patched copy", Some(SOCKET_CARGO_SRC)),
+        (
+            "the foreign registry's patched copy",
+            Some("evil.example-0123456789abcdef"),
+        ),
+    ] {
+        if let Some(src) = install {
+            fx.install_crate(src, PATCHED_RS);
+        }
+        for extra in [&["--offline"][..], &["--offline", "--no-verify"][..]] {
+            let run = fx.vex(extra);
+            assert_omitted(
+                &run,
+                CARGO_PURL,
+                "redirect_unwired",
+                &format!("foreign host + ledger, {state} {extra:?}"),
+            );
+        }
+    }
 
     // The same foreign origin configured as the operator's patch server.
     let fx = Fx::new();