feat: embed wrappers into ELF binaries

Author: m-hilgendorf

packages/std/Cargo.lock

@@ -1,6 +1,7 @@
 [workspace]
 members = [
-  "packages/cc_proxy",
+  "packages/cc_proxy", 
+  "packages/convert_manifest",
   "packages/ld_proxy",
   "packages/strip_proxy",
   "packages/wrapper",
@@ -26,6 +27,7 @@ pedantic = { level = "warn", priority = -1 }
 result_large_err = "allow"
 
 [workspace.dependencies]
+bytes = { version = "1", features = ["serde"] }
 clap = { version = "4", features = ["derive"] }
 fnv = "1"
 futures = "0.3"
@@ -35,6 +37,7 @@ libc = "0.2"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 tangram_client = { default-features = false, git = "https://github.com/tangramdotdev/tangram", rev = "17c7b14774e13c07e7e21f25cfa518947de6a65d" }
+tangram_serialize = { default-features = false, git = "https://github.com/tangramdotdev/tangram", rev = "17c7b14774e13c07e7e21f25cfa518947de6a65d" }
 tempfile = "3"
 tokio = { version = "1", default-features = false, features = [
   "rt",
@@ -77,10 +80,13 @@ path = "packages/std/lib.rs"
 workspace = true
 
 [dependencies]
+bytes = { workspace = true }
 futures = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 tangram_client = { workspace = true }
+tangram_serialize = { workspace = true }
+tempfile = { workspace = true }
 tracing = { workspace = true, optional = true }
 tracing-subscriber = { workspace = true, optional = true }
 

packages/std/Cargo.toml

@@ -0,0 +1,20 @@
+[package]
+name = "tangram_convert_manifest"
+authors.workspace = true
+description.workspace = true
+edition.workspace = true
+homepage.workspace = true
+license.workspace = true
+publish.workspace = true
+repository.workspace = true
+rust-version.workspace = true
+version.workspace = true
+
+[dependencies]
+clap = { workspace = true }
+tangram_std = { workspace = true }
+tangram_serialize = { workspace = true }
+serde_json = { workspace = true }
+
+[lints]
+workspace = true

packages/std/packages/convert_manifest/Cargo.toml

@@ -0,0 +1,39 @@
+use std::io::{Read, Write};
+
+use tangram_std::Manifest;
+
+#[derive(clap::Parser)]
+struct Args {
+	#[arg(short, long)]
+	output: Output,
+}
+
+#[derive(clap::ValueEnum, Copy, Clone)]
+enum Output {
+	Bin,
+	Json,
+}
+
+fn main() -> std::io::Result<()> {
+	let args = <Args as clap::Parser>::parse();
+	let mut input = Vec::new();
+	std::io::stdin().read_to_end(&mut input)?;
+
+	let manifest: Manifest = if input.starts_with(b"{") {
+		serde_json::from_slice(&input).map_err(|error| std::io::Error::other(error.to_string()))?
+	} else {
+		tangram_serialize::from_slice(&input)
+			.map_err(|error| std::io::Error::other(error.to_string()))?
+	};
+
+	let output = match args.output {
+		Output::Bin => tangram_serialize::to_vec(&manifest)
+			.map_err(|error| std::io::Error::other(error.to_string()))?,
+		Output::Json => serde_json::to_vec(&manifest)
+			.map_err(|error| std::io::Error::other(error.to_string()))?,
+	};
+
+	std::io::stdout().write_all(&output)?;
+
+	Ok(())
+}

packages/std/packages/convert_manifest/src/main.rs

@@ -75,6 +75,9 @@ struct Options {
 	/// If any NEEDED libraries are missing at the end, should we still produce a wrapper?. Will warn if false, error if true. Default: false.
 	disallow_missing: bool,
 
+	/// If enabled, the wrapper will be embedded into the binary.
+	embed: bool,
+
 	/// The interpreter used by the output executable.
 	interpreter_path: Option<String>,
 
@@ -122,6 +125,9 @@ fn read_options() -> tg::Result<Options> {
 	// Get the interpreter path.
 	let interpreter_path = std::env::var("TANGRAM_LINKER_INTERPRETER_PATH").ok();
 
+	// Get the wrap binary.
+	let mut embed = std::env::var("TANGRAM_LINKER_EMBED_WRAPPER").is_ok();
+
 	// Get additional interpreter args, if any.
 	let interpreter_args = std::env::var("TANGRAM_LINKER_INTERPRETER_ARGS")
 		.ok()
@@ -176,6 +182,8 @@ fn read_options() -> tg::Result<Options> {
 				passthrough = true;
 			} else if arg.starts_with("--tg-disallow-missing") {
 				disallow_missing = true;
+			} else if arg.starts_with("--tg-embed-wrapper") {
+				embed = true;
 			} else {
 				command_args.push(arg.clone());
 			}
@@ -223,6 +231,7 @@ fn read_options() -> tg::Result<Options> {
 		command_path,
 		command_args,
 		disallow_missing,
+		embed,
 		interpreter_path,
 		interpreter_args,
 		injection_path,
@@ -441,8 +450,15 @@ async fn create_wrapper(options: &Options) -> tg::Result<()> {
 			create_manifest(output_artifact_id, options, interpreter, library_paths).await?;
 		tracing::trace!(?manifest);
 
+		// If requested, emebd the wrapper.
+		let new_wrapper = if options.embed {
+			manifest.embed(&tg, &output_file).await?
+		} else {
+			manifest.write(&tg).await?
+		};
+
 		// Write the manifest to a wrapper.
-		let new_wrapper = manifest.write(&tg).await?;
+
 		let new_wrapper_id = new_wrapper.id();
 		tracing::trace!(?new_wrapper_id);