GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — Fix JVM vendor entry GC fail-closed behavior · SocketDev/socket-patch@002ca36

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

crates/socket-patch-core/src/vendor/jvm
- apply.rs
- gradle.rs

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎crates/socket-patch-core/src/vendor/jvm/apply.rs‎`

Copy file name to clipboardExpand all lines: crates/socket-patch-core/src/vendor/jvm/apply.rs

+10-3Lines changed: 10 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,13 +36,20 @@ use super::{`
`36`	`36`	`};`
`37`	`37`
`38`	`38`	/// Whether `entry` was written by this backend: it has wiring and every
`39`		`-/// record is one of this backend's kinds.`
	`39`	`+/// record is one of this backend's kinds, OR it's a maven-ecosystem entry`
	`40`	`+/// with a valid maven purl (covers empty-wiring reconstructed entries).`
`40`	`41`	`pub fn is_jvm_entry(entry: &VendorEntry) -> bool {`
`41`		`- !entry.wiring.is_empty()`
	`42`	`+ if !entry.wiring.is_empty()`
`42`	`43`	`&& entry`
`43`	`44`	`.wiring`
`44`	`45`	`.iter()`
`45`	`46`	`.all(\|w\| KINDS.contains(&w.kind.as_str()))`
	`47`	`+ {`
	`48`	`+ return true;`
	`49`	`+ }`
	`50`	`+ // Empty-wiring entries (e.g., from repair/reconstruction) that are`
	`51`	`+ // maven-ecosystem with valid maven purls should still be treated as JVM entries`
	`52`	`+ entry.ecosystem == "maven" && parse_maven_purl(&entry.base_purl).is_some()`
`46`	`53`	`}`
`47`	`54`
`48`	`55`	`/// Offline inputs have not been authenticated by independent registry checksums.`
`@@ -827,7 +834,7 @@ pub fn entry_references(root: &Path, entry: &VendorEntry) -> bool {`
`827`	`834`	`}`
`828`	`835`	`let (maven, gradle) = sides(&entry.wiring);`
`829`	`836`	`(maven && maven_reactor::wired_checked(&read, &c).unwrap_or(true))`
`830`		`- \|\| (gradle && gradle::references(&read, &c))`
	`837`	`+ \|\| (gradle && gradle::references_checked(&read, &c).unwrap_or(true))`
`831`	`838`	`}`
`832`	`839`
`833`	`840`	/// The liveness proof `vex` needs: every half of the entry is wired, and

Collapse file

`‎crates/socket-patch-core/src/vendor/jvm/gradle.rs‎`

Copy file name to clipboardExpand all lines: crates/socket-patch-core/src/vendor/jvm/gradle.rs

+36Lines changed: 36 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1197,6 +1197,42 @@ pub fn references(read: ReadFn<'_>, c: &Coords<'_>) -> bool {`
`1197`	`1197`	`indexed && applied`
`1198`	`1198`	`}`
`1199`	`1199`
	`1200`	+/// Checked variant of [`references`] that returns an error when files
	`1201`	+/// cannot be read, for fail-closed GC ([`crate::vex::discover::Discovery::vendor_entry_in_use`]).
	`1202`	`+pub fn references_checked(read: ReadFn<'_>, c: &Coords<'_>) -> Result<bool, String> {`
	`1203`	`+ let gav = format!("{}:{}:{}", c.group_id, c.artifact_id, c.version);`
	`1204`	`+ let index_bytes = read(INDEX_REL).ok_or_else(\|\| format!("cannot read {}", INDEX_REL))?;`
	`1205`	`+ let index_text = String::from_utf8(index_bytes)`
	`1206`	`+ .map_err(\|_\| format!("{} is not valid UTF-8", INDEX_REL))?;`
	`1207`	`+ let rows = index_rows(&index_text)`
	`1208`	`+ .ok_or_else(\|\| format!("{} could not be parsed", INDEX_REL))?;`
	`1209`	`+ let indexed = rows.iter().any(\|r\| {`
	`1210`	`+ let cols: Vec<&str> = r.split('\t').collect();`
	`1211`	`+ cols.first() == Some(&gav.as_str()) && cols.get(3) == Some(&c.uuid)`
	`1212`	`+ });`
	`1213`	`+`
	`1214`	`+ let wiring = WiringTarget::vendored();`
	`1215`	`+ let mut applied = false;`
	`1216`	`+ let mut settings_found = false;`
	`1217`	`+ for rel in ["settings.gradle", "settings.gradle.kts"] {`
	`1218`	`+ if let Some(bytes) = read(rel) {`
	`1219`	`+ settings_found = true;`
	`1220`	`+ let text = String::from_utf8(bytes)`
	`1221`	`+ .map_err(\|_\| format!("{} is not valid UTF-8", rel))?;`
	`1222`	`+ let dsl = dsl::dsl_of(rel).unwrap_or(Dsl::Groovy);`
	`1223`	`+ if has_apply_line(&text, dsl, &wiring, "") {`
	`1224`	`+ applied = true;`
	`1225`	`+ break;`
	`1226`	`+ }`
	`1227`	`+ }`
	`1228`	`+ }`
	`1229`	`+ if !settings_found {`
	`1230`	`+ return Err("cannot read settings.gradle or settings.gradle.kts".to_string());`
	`1231`	`+ }`
	`1232`	`+`
	`1233`	`+ Ok(indexed && applied)`
	`1234`	`+}`
	`1235`	`+`
`1200`	`1236`	/// The liveness proof `vex` needs for this layout: `c` is
`1201`	`1237`	/// [`references`]d, the script is ours (line endings aside), and a re-plan
`1202`	`1238`	`/// over the committed tree is refused nowhere and degraded nowhere.`

0 commit comments

Comments

0 (0)

You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.