diff --git a/src/board3d.js b/src/board3d.js index f188be3..7c7537d 100644 --- a/src/board3d.js +++ b/src/board3d.js @@ -67,7 +67,7 @@ async function load(){ const scene=viewer.getScene();scene.useRightHandedSystem=true; scheduleRendering(); scene.constantlyUpdateMeshUnderPointer=true; - const imported=await B.SceneLoader.ImportMeshAsync('', 'scene/', 'sensor.glb',scene); + const imported=await B.SceneLoader.ImportMeshAsync('', 'scene/', manifest.file||'sensor.glb',scene); root=new B.TransformNode('native-board-z-up-mm',scene); // Native GLB is metres, Y-up. Convert once to physical PCB X,-Y,Z in mm. root.rotation.x=Math.PI/2;root.scaling.setAll(1000); diff --git a/src/server.rs b/src/server.rs index bdb93ef..f1d8de8 100644 --- a/src/server.rs +++ b/src/server.rs @@ -25,7 +25,10 @@ pub fn configure_scene(dir: Option, viewer: Option, ai: Option "caller_identity_required: supply --ai-thread when serving a linked board scene"); let mut manifest: Value = serde_json::from_slice(&std::fs::read(d.join("scene.json"))?)?; anyhow::ensure!(manifest["schema"] == "adom/board-scene@1", "Unsupported scene schema"); - let bytes = std::fs::read(d.join("sensor.glb"))?; + let file = manifest.get("file").and_then(Value::as_str).unwrap_or("sensor.glb").to_string(); + anyhow::ensure!(!file.is_empty() && !file.contains('/') && !file.contains('\\') && !file.contains("..") && file.ends_with(".glb"), "Invalid board scene filename"); + let bytes = std::fs::read(d.join(&file))?; + manifest["file"] = json!(file); let hash = format!("{:x}", Sha256::digest(&bytes)); anyhow::ensure!(bytes.len() >= 20 && &bytes[..4] == b"glTF", "Invalid board GLB"); let json_len = u32::from_le_bytes(bytes[12..16].try_into().unwrap()) as usize; @@ -198,10 +201,10 @@ fn route(method: &Method, url: &str, query: &str, body: &str) -> Response(body) { *RENDER_ACK.lock().unwrap() = Some(v); } json_resp("{\"ok\":true}") } - (Method::Get, "/scene/sensor.glb") => asset(&SCENE_DIR, "sensor.glb", "model/gltf-binary"), _ if method == &Method::Get && url.starts_with("/scene/") => { let name = &url[7..]; - let allowed = SCENE.lock().unwrap().as_ref().and_then(|v| v["componentLod"]["assets"].as_object()).map_or(false, |assets| { + let board_asset = SCENE.lock().unwrap().as_ref().and_then(|v| v["file"].as_str()).map_or(false, |file| file == name); + let allowed = board_asset || SCENE.lock().unwrap().as_ref().and_then(|v| v["componentLod"]["assets"].as_object()).map_or(false, |assets| { assets.values().any(|a| a["levels"].as_array().map_or(false, |levels| levels.iter().any(|l| l["path"].as_str() == Some(name)))) }); if allowed { asset(&SCENE_DIR, name, "model/gltf-binary") } else { not_found() }