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
16 changes: 15 additions & 1 deletion crates/bashkit-js/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2409,6 +2409,20 @@ fn build_limits(state: &SharedState) -> ExecutionLimits {
limits
}

fn derive_sqlite_limits(state: &SharedState) -> bashkit::SqliteLimits {
let mut limits = bashkit::SqliteLimits::default();
if let Some(ms) = state.timeout_ms {
limits = limits.max_duration(std::time::Duration::from_millis(u64::from(ms)));
}
if let Some(memory_mb) = state.max_memory {
let max_db_bytes = (memory_mb.max(0.0) * 1024.0 * 1024.0).floor() as usize;
if max_db_bytes > 0 {
limits = limits.max_db_bytes(max_db_bytes);
}
}
limits
}

fn build_bash_from_state(state: &SharedState, files: Option<&HashMap<String, String>>) -> RustBash {
let mut builder = RustBash::builder();

Expand Down Expand Up @@ -2473,7 +2487,7 @@ fn build_bash_from_state(state: &SharedState, files: Option<&HashMap<String, Str
// Enable embedded SQLite (Turso). Passing `sqlite: true` from JS is the
// explicit opt-in that must also flip the in-process SQLite env gate.
if state.sqlite {
builder = builder.sqlite();
builder = builder.sqlite_with_limits(derive_sqlite_limits(state));
builder = builder.env("BASHKIT_ALLOW_INPROCESS_SQLITE", "1");
}

Expand Down
22 changes: 17 additions & 5 deletions crates/bashkit-python/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2883,12 +2883,24 @@ fn apply_python_config(
/// explicit opt-in for in-process SQLite execution, so we register the
/// builtin and inject the runtime gate env var. The deny-list defaults
/// (resource/FS-shaped PRAGMAs) come from `SqliteLimits::default()`.
fn apply_sqlite_config(mut builder: bashkit::BashBuilder, sqlite: bool) -> bashkit::BashBuilder {
fn apply_sqlite_config(
mut builder: bashkit::BashBuilder,
sqlite: bool,
timeout_seconds: Option<f64>,
max_memory: Option<u64>,
) -> PyResult<bashkit::BashBuilder> {
if sqlite {
builder = builder.sqlite();
let mut limits = bashkit::SqliteLimits::default();
if let Some(ts) = timeout_seconds {
limits = limits.max_duration(parse_timeout_seconds(ts)?);
}
if let Some(mm) = max_memory {
limits = limits.max_db_bytes(usize::try_from(mm).unwrap_or(usize::MAX));
}
builder = builder.sqlite_with_limits(limits);
builder = builder.env("BASHKIT_ALLOW_INPROCESS_SQLITE", "1");
}
builder
Ok(builder)
}

/// Core bash interpreter with virtual filesystem.
Expand Down Expand Up @@ -2979,7 +2991,7 @@ impl PyBash {
handler_clone,
self.external_handler_reentry_depth.clone(),
);
builder = apply_sqlite_config(builder, self.sqlite);
builder = apply_sqlite_config(builder, self.sqlite, self.timeout_seconds, self.max_memory)?;
if let Some(ref net) = self.network {
builder = net.apply(builder);
}
Expand Down Expand Up @@ -3094,7 +3106,7 @@ impl PyBash {
handler_for_build,
external_handler_reentry_depth.clone(),
);
builder = apply_sqlite_config(builder, sqlite);
builder = apply_sqlite_config(builder, sqlite, timeout_seconds, max_memory)?;
if let Some(ref net) = network {
builder = net.apply(builder);
}
Expand Down
Loading