Add sandboxed_shell

Richard Feldman committed 1 year ago

Commit 38136cb1 parent 6ed6e8b4 files · +118 −11Browse files

Unified · Split

4 files

Cargo.lock +12 −11
crates/scripting_tool/Cargo.toml +1 −0
crates/scripting_tool/src/sandboxed_shell.rs +104 −0
crates/scripting_tool/src/scripting_tool.rs +1 −0

  "cap-primitives",
  "cap-std",
  "io-lifetimes",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 [[package]]
  "ipnet",
  "maybe-owned",
  "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
  "winx",
 ]
 checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 [[package]]
 dependencies = [
  "io-lifetimes",
  "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 [[package]]
 checksum = "2285ddfe3054097ef4b2fe909ef8c3bcd1ea52a8f0d274416caebeef39f04a65"
 dependencies = [
  "io-lifetimes",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 [[package]]
  "once_cell",
  "socket2",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 [[package]]
  "libc",
  "linux-raw-sys",
  "once_cell",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 [[package]]
  "serde",
  "serde_json",
  "settings",
+ "shlex",
  "util",
 ]
  "fd-lock",
  "io-lifetimes",
  "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
  "winx",
 ]
  "getrandom 0.3.1",
  "once_cell",
  "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 [[package]]
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 [[package]]
 checksum = "3f3fd376f71958b862e7afb20cfe5a22830e1963462f3a17f49d82a6c1d1f42d"
 dependencies = [
  "bitflags 2.8.0",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 [[package]]

crates/scripting_tool/Cargo.toml+1−0

@@ -16,6 +16,7 @@ doctest = false · 15 unmodified lines
16	anyhow.workspace = true	16	anyhow.workspace = true
17	assistant_tool.workspace = true	17	assistant_tool.workspace = true
18	collections.workspace = true	18	collections.workspace = true
		19	shlex.workspace = true
19	futures.workspace = true	20	futures.workspace = true
20	gpui.workspace = true	21	gpui.workspace = true
21	mlua.workspace = true	22	mlua.workspace = true

crates/scripting_tool/src/sandboxed_shell.rs+104−0

@@ -0,0 +1,104 @@
	1	/// Models will commonly generate POSIX shell one-liner commands which
	2	/// they run via io.popen() in Lua. Instead of giving those shell command
	3	/// strings to the operating system - which is a security risk, and
	4	/// which can eaisly fail on Windows, since Windows doesn't do POSIX - we
	5	/// parse the shell command ourselves and translate it into a sequence of
	6	/// commands in our normal sandbox. Essentially, this is an extremely
	7	/// minimalstic shell which Lua popen() commands can execute in.
	8	use mlua::{Error, Result};
	9
	10	#[derive(Debug, Clone, PartialEq, Eq, Hash)]
	11	struct ShellCmd {
	12	command: String,
	13	args: Vec<String>,
	14	stdout_redirect: Option<String>,
	15	stderr_redirect: Option<String>,
	16	}
	17
	18	impl ShellCmd {
	19	/// Parse a shell string, which we assume the model will generate in POSIX format.
	20	/// Note that since we are turning this into our own representation, this should
	21	/// work seamlessly on Windows too, even though Windows has a different shell syntax.
	22	///
	23	/// If there are multiple commands piped into one another, this returns them all.
	24	pub fn parse_shell_str(string: &str) -> Result<Vec<Self>> {
	25	// For now, we don't support any of these shell features. We can add support them
	26	// in the future, though.
	27	if string.contains('$')
	28	\|\| string.contains('`')
	29	\|\| string.contains('(')
	30	\|\| string.contains(')')
	31	\|\| string.contains(';')
	32	\|\| string.contains('&')
	33	\|\| string.contains('{')
	34	\|\| string.contains('}')
	35	{
	36	return Err(Error::RuntimeError(
	37	"Complex shell features (pipes, subshells, variables, etc.) are not available in this shell."
	38	.to_string(),
	39	));
	40	}
	41
	42	// Use shlex to split the command line into tokens
	43	let tokens = shlex::split(string)
	44	.ok_or_else(\|\| Error::RuntimeError("Failed to parse shell command".to_string()))?;
	45
	46	// The first token is the command
	47	let mut tokens_iter = tokens.into_iter();
	48	let Some(command) = tokens_iter.next() else {
	49	return Err(Error::RuntimeError("Missing popen command".to_string()));
	50	};
	51
	52	let mut args = Vec::new();
	53	let mut stdout_redirect = None;
	54	let mut stderr_redirect = None;
	55
	56	// Process the remaining tokens
	57	while let Some(token) = tokens_iter.next() {
	58	match token.as_str() {
	59	">" \| "1>" => {
	60	// stdout redirection
	61	let target = tokens_iter.next().ok_or_else(\|\| {
	62	Error::RuntimeError("Missing redirection target".to_string())
	63	})?;
	64	stdout_redirect = Some(target);
	65	}
	66	"2>" => {
	67	// stderr redirection
	68	let target = tokens_iter.next().ok_or_else(\|\| {
	69	Error::RuntimeError("Missing redirection target".to_string())
	70	})?;
	71	stderr_redirect = Some(target);
	72	}
	73	"&>" \| ">&" => {
	74	// both stdout and stderr redirection
	75	let target = tokens_iter.next().ok_or_else(\|\| {
	76	Error::RuntimeError("Missing redirection target".to_string())
	77	})?;
	78	stdout_redirect = Some(target.clone());
	79	stderr_redirect = Some(target);
	80	}
	81	_ if token.starts_with(">")
	82	\|\| token.starts_with("2>")
	83	\|\| token.starts_with("&>") =>
	84	{
	85	// Handle cases like ">file" without a space
	86	return Err(Error::RuntimeError(
	87	"Redirections must have a space between operator and target".to_string(),
	88	));
	89	}
	90	_ => {
	91	// Regular argument
	92	args.push(token);
	93	}
	94	}
	95	}
	96
	97	Ok(ShellCmd {
	98	command,
	99	args,
	100	stdout_redirect,
	101	stderr_redirect,
	102	})
	103	}
	104	}

crates/scripting_tool/src/scripting_tool.rs+1−0

@@ -1,3 +1,4 @@
		1	mod sandboxed_shell;
1	mod session;	2	mod session;
2		3
3	use project::Project;	4	use project::Project;