fix: harden the LOD manifest-builder lane (#3)

* fix: harden the LOD manifest-builder lane

Overwrite read-only files when seeding the manifest-builder workdir (a
nix-store copy preserves 444 and poisons every rebuild) and pass the
pipeline catalyst explicitly to the npm child via --catalyst, so an
inherited CATALYST_URL from the service environment can no longer point
scene fetches at the wrong server and emit empty-scene LODs.

* fix: rustfmt and clippy compliance

Wrap the let-else per rustfmt. Replace set_readonly(false) with an
explicit owner-write mode bit on unix (permissions_set_readonly_false
is denied by CI clippy).

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>

Author: eordano

crate/src/bin/abgen-lod/main.rs

@@ -394,7 +394,14 @@ fn cmd_placements(argv: &[String]) -> Result<i32> {
         .with_context(|| format!("resolve scene {target:?}"))?;
     eprintln!("scene entity: {}", ent.entity_id);
 
-    let list = acquire_placements(&ent, coords.as_deref(), &iss, manifest_builder, workdir)?;
+    let list = acquire_placements(
+        &ent,
+        coords.as_deref(),
+        &iss,
+        manifest_builder,
+        workdir,
+        &catalyst,
+    )?;
     println!("{}", serde_json::to_string_pretty(&list)?);
     Ok(0)
 }
@@ -405,13 +412,15 @@ fn acquire_placements(
     iss: &str,
     manifest_builder: Option<String>,
     workdir: Option<String>,
+    catalyst: &str,
 ) -> Result<Vec<placements::Placement>> {
     abgen::lodgen::acquire_placements(
         ent,
         coords,
         iss,
         manifest_builder.as_deref(),
         workdir.map(PathBuf::from).as_deref(),
+        catalyst,
     )
 }
 
@@ -525,6 +534,7 @@ fn cmd_assemble(argv: &[String]) -> Result<i32> {
         &iss,
         manifest_builder,
         workdir,
+        &catalyst,
     )?;
     eprintln!("placements: {}", list.len());
 

crate/src/lodgen/pipeline.rs

@@ -55,6 +55,7 @@ pub fn acquire_placements(
     iss: &str,
     manifest_builder: Option<&str>,
     workdir: Option<&Path>,
+    catalyst: &str,
 ) -> Result<Vec<placements::Placement>> {
     let iss_bytes: Option<Vec<u8>> = match iss {
         "off" => None,
@@ -108,8 +109,12 @@ pub fn acquire_placements(
                     PathBuf::from(home).join(".cache/abgen-lod/manifest-builder")
                 }
             };
-            let Some(manifest_path) =
-                placements::run_manifest_builder(&run_coords, Path::new(&tool_dir), &work_dir)?
+            let Some(manifest_path) = placements::run_manifest_builder(
+                &run_coords,
+                Path::new(&tool_dir),
+                &work_dir,
+                catalyst,
+            )?
             else {
                 eprintln!(
                     "manifest-builder: scene ran to completion but emitted no manifest \
@@ -477,6 +482,7 @@ pub fn generate(params: &GenerateParams) -> Result<GenerateOutcome> {
         &params.iss,
         params.manifest_builder.as_deref(),
         mb_workdir.as_deref(),
+        &params.catalyst,
     )?;
     let placements_ms = t.elapsed().as_millis();
     log.push(format!("placements: {}", placements.len()));

crate/src/lodgen/placements_native.rs

@@ -25,6 +25,18 @@ pub fn fetch_iss(scene_id: &str) -> Result<Option<Vec<u8>>> {
     }
 }
 
+fn writable(mut perms: std::fs::Permissions) -> std::fs::Permissions {
+    #[cfg(unix)]
+    {
+        use std::os::unix::fs::PermissionsExt;
+        perms.set_mode(perms.mode() | 0o200);
+    }
+    #[cfg(not(unix))]
+    #[allow(clippy::permissions_set_readonly_false)]
+    perms.set_readonly(false);
+    perms
+}
+
 fn copy_tree(src: &Path, dst: &Path) -> Result<()> {
     std::fs::create_dir_all(dst).with_context(|| format!("mkdir {}", dst.display()))?;
     for entry in std::fs::read_dir(src).with_context(|| format!("read dir {}", src.display()))? {
@@ -39,8 +51,21 @@ fn copy_tree(src: &Path, dst: &Path) -> Result<()> {
         if entry.file_type()?.is_dir() {
             copy_tree(&sp, &dp)?;
         } else {
+            if let Ok(meta) = std::fs::metadata(&dp) {
+                let perms = meta.permissions();
+                if perms.readonly() {
+                    let _ = std::fs::set_permissions(&dp, writable(perms));
+                }
+            }
             std::fs::copy(&sp, &dp)
                 .with_context(|| format!("copy {} -> {}", sp.display(), dp.display()))?;
+            let perms = std::fs::metadata(&dp)
+                .with_context(|| format!("stat {}", dp.display()))?
+                .permissions();
+            if perms.readonly() {
+                std::fs::set_permissions(&dp, writable(perms))
+                    .with_context(|| format!("chmod {}", dp.display()))?;
+            }
         }
     }
     Ok(())
@@ -73,10 +98,16 @@ pub const MANIFEST_BUILDER_DONE_MARKER: &str = "Finished running frames!";
 
 static MANIFEST_BUILDER_LOCK: std::sync::Mutex<()> = std::sync::Mutex::new(());
 
+pub fn catalyst_base(content_url: &str) -> &str {
+    let trimmed = content_url.trim_end_matches('/');
+    trimmed.strip_suffix("/content").unwrap_or(trimmed)
+}
+
 pub fn run_manifest_builder(
     coords: &str,
     tool_dir: &Path,
     work_dir: &Path,
+    catalyst: &str,
 ) -> Result<Option<PathBuf>> {
     let _serialized = MANIFEST_BUILDER_LOCK
         .lock()
@@ -101,7 +132,11 @@ pub fn run_manifest_builder(
         run_npm(work_dir, &["run", "build"])?;
     }
     let coords_arg = format!("--coords={coords}");
-    let stdout = run_npm(work_dir, &["run", "start", &coords_arg, "--overwrite"])?;
+    let catalyst_arg = format!("--catalyst={}", catalyst_base(catalyst));
+    let stdout = run_npm(
+        work_dir,
+        &["run", "start", &coords_arg, &catalyst_arg, "--overwrite"],
+    )?;
     let out_dir = work_dir.join(MANIFEST_OUTPUT_DIR);
     if let Some(rest) = stdout.split("scene id:").nth(1) {
         let scene_id: String = rest
@@ -145,3 +180,28 @@ pub fn run_manifest_builder(
         ),
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::catalyst_base;
+
+    #[test]
+    fn catalyst_base_strips_content_suffix() {
+        assert_eq!(
+            catalyst_base("https://peer.decentraland.org/content"),
+            "https://peer.decentraland.org"
+        );
+        assert_eq!(
+            catalyst_base("https://peer.decentraland.org/content/"),
+            "https://peer.decentraland.org"
+        );
+        assert_eq!(
+            catalyst_base("http://127.0.0.1:5141"),
+            "http://127.0.0.1:5141"
+        );
+        assert_eq!(
+            catalyst_base("https://worlds-content-server.decentraland.org/world/name"),
+            "https://worlds-content-server.decentraland.org/world/name"
+        );
+    }
+}