Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 38 additions & 4 deletions crates/bashkit-python/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1185,22 +1185,52 @@ fn snapshot_live_bash(
})
}

fn restore_live_bash(
fn restore_live_bash_with_env_overrides(
py: Python<'_>,
rt: &Arc<Runtime>,
inner: &Arc<Mutex<Bash>>,
data: Vec<u8>,
env_overrides: &[(String, String)],
) -> PyResult<()> {
let rt = rt.clone();
let inner = inner.clone();
let env_overrides = env_overrides.to_vec();
py.detach(|| {
rt.block_on(async move {
let mut bash = inner.lock().await;
bash.restore_snapshot(&data).map_err(raise_snapshot_error)
bash.restore_snapshot(&data).map_err(raise_snapshot_error)?;
if env_overrides.is_empty() {
return Ok(());
}
let mut state = bash.shell_state();
for (key, value) in env_overrides {
state.env.insert(key, value);
}
bash.restore_shell_state(&state);
Ok(())
})
})
}

fn placeholder_env_overrides(
state: &ShellState,
network_config: &Option<PyNetworkConfig>,
) -> Vec<(String, String)> {
let Some(config) = network_config else {
return Vec::new();
};
config
.credential_placeholders
.iter()
.filter_map(|ph| {
state
.env
.get(&ph.env)
.map(|value| (ph.env.clone(), value.clone()))
})
.collect()
}

static MAPPING_PROXY_TYPE: PyOnceLock<Py<PyAny>> = PyOnceLock::new();

fn mapping_proxy(py: Python<'_>, dict: Bound<'_, PyDict>) -> PyResult<Py<PyAny>> {
Expand Down Expand Up @@ -3327,7 +3357,9 @@ impl PyBash {
/// Restore interpreter state from bytes previously produced by `snapshot()`.
fn restore_snapshot(&self, py: Python<'_>, data: Vec<u8>) -> PyResult<()> {
self.reject_external_handler_reentry()?;
restore_live_bash(py, &self.rt, &self.inner, data)
let state = capture_shell_state(py, &self.rt, &self.inner)?;
let env_overrides = placeholder_env_overrides(&state, &self.network);
restore_live_bash_with_env_overrides(py, &self.rt, &self.inner, data, &env_overrides)
}

/// Create a new Bash instance from a snapshot and optional constructor kwargs.
Expand Down Expand Up @@ -3913,7 +3945,9 @@ impl BashTool {

/// Restore interpreter state from bytes previously produced by `snapshot()`.
fn restore_snapshot(&self, py: Python<'_>, data: Vec<u8>) -> PyResult<()> {
restore_live_bash(py, &self.rt, &self.inner, data)
let state = capture_shell_state(py, &self.rt, &self.inner)?;
let env_overrides = placeholder_env_overrides(&state, &self.network);
restore_live_bash_with_env_overrides(py, &self.rt, &self.inner, data, &env_overrides)
}

/// Create a new BashTool instance from a snapshot and optional constructor kwargs.
Expand Down
21 changes: 21 additions & 0 deletions crates/bashkit-python/tests/test_network_credentials.py
Original file line number Diff line number Diff line change
Expand Up @@ -399,3 +399,24 @@ def test_bashtool_from_snapshot_with_placeholder(self):
r = restored.execute_sync("echo $OPENAI_API_KEY")
assert r.exit_code == 0
assert r.stdout.strip().startswith("bk_placeholder_")

def test_bashtool_from_snapshot_reapplies_placeholder_env_after_restore(self):
src = BashTool()
data = src.snapshot()
restored = BashTool.from_snapshot(
data,
network={
"allow": ["https://api.openai.com"],
"credential_placeholders": [
{
"env": "OPENAI_API_KEY",
"pattern": "https://api.openai.com",
"kind": "bearer",
"token": "sk-real-key",
}
],
},
)
r = restored.execute_sync("echo $OPENAI_API_KEY")
assert r.exit_code == 0
assert r.stdout.strip().startswith("bk_placeholder_")
Loading