feat: per-script Rhai sandbox overrides with admin ceiling
Adds optional per-script overrides for the six Rhai sandbox knobs
(max_operations, max_string_size, max_array_size, max_map_size,
max_call_levels, max_expr_depth). The executor merges its defaults
with each script's overrides on every call; the manager validates
overrides against an admin-set ceiling at write time, so the
executor trusts whatever is stored.
Storage chose JSONB on the existing scripts table over six new
columns: lets future knobs land as code-only changes, keeps the
sparse common case (most scripts override nothing) cheap to store
and serialize, and matches how the manager + executor pass the
config across the wire.
* 0002_sandbox.sql — ALTER TABLE scripts ADD COLUMN sandbox
JSONB NOT NULL DEFAULT '{}'
* shared::ScriptSandbox — six Option<u64> fields with
deny_unknown_fields so typos surface as 422
* Script.sandbox + ExecRequest.sandbox_overrides — typed end
to end; cluster mode just serializes the same struct
* executor-core::Limits::with_overrides — field-by-field
replacement; tests cover the override actually tightening
the live engine
* manager-core::SandboxCeiling — built-in conservative
defaults (10M ops, 1 MiB strings, 100k array/map, 128
call/expr depth); env vars override per knob, invalid
values warn-and-skip rather than blocking boot
* manager-core admin API — POST/PUT accept `sandbox`; values
above the ceiling return 422 with the specific field +
requested + ceiling; absent or `{}` keeps platform defaults
* picloud all-in-one — wires SandboxCeiling::from_env() into
AdminState
* memory_limit_mb stays in the schema, marked v1.3+ advisory
(no enforcement until OS-level isolation lands with
cluster-mode executors)
Verified live through Caddy:
* /version reports schema 2, product 0.3.0
* Script with max_operations: 500 → 507 on a 10k-iteration loop
* Same script after PUT raising to 1M → succeeds, returns 10000
* POST with max_operations: 1_000_000_000 → 422 (exceeds ceiling)
Tests:
* 13 executor-core unit tests (added 2 for override semantics)
* 20 integration tests (added 6 for sandbox CRUD + ceiling +
unknown-field rejection + executor honoring overrides)
* default cargo test --workspace stays green (integration tests
remain #[ignore]'d until DATABASE_URL is set)
Bumps:
* schema 1 → 2
* product 0.2.0 → 0.3.0
* SDK unchanged (scripts see nothing new)
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -49,10 +49,13 @@ impl Engine {
|
||||
|
||||
/// Execute `source` against `req`. Op-budget protection comes from
|
||||
/// Rhai's `set_max_operations`; wall-clock enforcement is the
|
||||
/// caller's responsibility.
|
||||
/// caller's responsibility. Per-script sandbox overrides on the
|
||||
/// request replace the engine's defaults field-by-field; the
|
||||
/// manager already clamped them against the admin ceiling.
|
||||
pub fn execute(&self, source: &str, req: ExecRequest) -> Result<ExecResponse, ExecError> {
|
||||
let effective_limits = self.limits.with_overrides(&req.sandbox_overrides);
|
||||
let logs: Arc<Mutex<Vec<LogEntry>>> = Arc::new(Mutex::new(Vec::new()));
|
||||
let engine = build_engine(self.limits, Some(logs.clone()));
|
||||
let engine = build_engine(effective_limits, Some(logs.clone()));
|
||||
|
||||
let ast = engine
|
||||
.compile(source)
|
||||
|
||||
@@ -1,8 +1,11 @@
|
||||
use picloud_shared::ScriptSandbox;
|
||||
|
||||
/// Resource and capability limits applied to every script execution.
|
||||
///
|
||||
/// Defaults are conservative and safe to expose to untrusted Rhai sources.
|
||||
/// Per-script overrides (e.g. higher operation budgets) come from the
|
||||
/// `Script` config and are clamped against these as upper bounds.
|
||||
/// Per-script overrides (via `Limits::with_overrides`) replace individual
|
||||
/// fields; the manager clamps every override against the admin ceiling at
|
||||
/// write time, so the executor trusts what arrives in `ExecRequest`.
|
||||
#[derive(Debug, Clone, Copy)]
|
||||
pub struct Limits {
|
||||
/// Hard cap on Rhai operations executed per invocation.
|
||||
@@ -35,3 +38,37 @@ impl Default for Limits {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Limits {
|
||||
/// Returns a new `Limits` with each field replaced by the matching
|
||||
/// override if present, otherwise the existing field. Overrides
|
||||
/// arrive as `u64` for JSONB round-tripping cleanliness; they're
|
||||
/// narrowed to `usize` here, saturating on the unlikely overflow
|
||||
/// (these caps come from admin-clamped writes, so the values are
|
||||
/// always small).
|
||||
#[must_use]
|
||||
pub fn with_overrides(&self, overrides: &ScriptSandbox) -> Self {
|
||||
Self {
|
||||
max_operations: overrides.max_operations.unwrap_or(self.max_operations),
|
||||
max_string_size: overrides
|
||||
.max_string_size
|
||||
.map_or(self.max_string_size, narrow_usize),
|
||||
max_array_size: overrides
|
||||
.max_array_size
|
||||
.map_or(self.max_array_size, narrow_usize),
|
||||
max_map_size: overrides
|
||||
.max_map_size
|
||||
.map_or(self.max_map_size, narrow_usize),
|
||||
max_call_levels: overrides
|
||||
.max_call_levels
|
||||
.map_or(self.max_call_levels, narrow_usize),
|
||||
max_expr_depth: overrides
|
||||
.max_expr_depth
|
||||
.map_or(self.max_expr_depth, narrow_usize),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn narrow_usize(v: u64) -> usize {
|
||||
usize::try_from(v).unwrap_or(usize::MAX)
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
use std::collections::BTreeMap;
|
||||
|
||||
use chrono::{DateTime, Utc};
|
||||
use picloud_shared::{ExecutionId, RequestId, ScriptId};
|
||||
use picloud_shared::{ExecutionId, RequestId, ScriptId, ScriptSandbox};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use thiserror::Error;
|
||||
|
||||
@@ -27,6 +27,12 @@ pub struct ExecRequest {
|
||||
pub path: String,
|
||||
pub headers: BTreeMap<String, String>,
|
||||
pub body: serde_json::Value,
|
||||
|
||||
/// Per-script sandbox overrides resolved by the manager. The
|
||||
/// executor's default `Limits` get merged with these (per-field
|
||||
/// override) before the Rhai engine is built.
|
||||
#[serde(default)]
|
||||
pub sandbox_overrides: ScriptSandbox,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
|
||||
Reference in New Issue
Block a user