@sysid/sandbox-runtime-improved 0.0.56-sysid.1 → 0.0.61-sysid.1

package/dist/vendor/srt-win/src/self_protect.rs

@@ -1,169 +0,0 @@
-//! Broker self-protection: rewrite the broker process's own DACL
-//! so the sandbox child cannot `OpenProcess(broker_pid,
-//! PROCESS_VM_*|CREATE_THREAD)`.
-//!
-//! The DACL is replaced with an explicit ALLOW list scoped to SIDs
-//! the sandbox child does NOT have enabled in its token:
-//!
-//!   - `<group_sid>` — child has it deny-only
-//!   - SYSTEM (S-1-5-18) — child doesn't carry it
-//!   - BUILTIN\Admins — child has it deny-only
-//!   - OWNER RIGHTS = 0 — suppresses the owner's implicit
-//!     `READ_CONTROL|WRITE_DAC`, which would otherwise let the
-//!     child (same user = owner) `WRITE_DAC` the broker
-//!
-//! `PROTECTED_DACL_SECURITY_INFORMATION` is required: without it
-//! the inherited "user has full access to their own process" ACE
-//! survives and the rewrite is a no-op for same-user children.
-//!
-//! Documented residual: another non-sandbox process belonging to
-//! the same user (e.g. Explorer) still has the group enabled and
-//! can therefore open the broker. That's intentional — the threat
-//! model is the sandbox child, not the rest of the user's session.
-
-use anyhow::{anyhow, Context, Result};
-use std::ffi::c_void;
-use std::mem::size_of;
-use windows::core::PWSTR;
-use windows::Win32::Foundation::HANDLE;
-use windows::Win32::Security::Authorization::{
-    ConvertSecurityDescriptorToStringSecurityDescriptorW, GetSecurityInfo,
-    SetSecurityInfo, SDDL_REVISION_1, SE_KERNEL_OBJECT,
-};
-use windows::Win32::Security::{
-    AddAccessAllowedAce, GetLengthSid, InitializeAcl, ACL, ACL_REVISION,
-    DACL_SECURITY_INFORMATION, PROTECTED_DACL_SECURITY_INFORMATION,
-};
-use windows::Win32::System::Threading::{GetCurrentProcess, PROCESS_ALL_ACCESS};
-
-use crate::sid::LocalPsid;
-
-/// Owner-Rights well-known SID (`S-1-3-4`). An ALLOW ACE with mask 0
-/// on this SID overrides the implicit `READ_CONTROL|WRITE_DAC` that
-/// the object's owner otherwise gets.
-const SID_OWNER_RIGHTS: &str = "S-1-3-4";
-const SID_SYSTEM: &str = "S-1-5-18";
-const SID_BUILTIN_ADMINS: &str = "S-1-5-32-544";
-
-/// Rewrite the current process's DACL to the broker-only pattern.
-/// Idempotent — safe to call once per `srt-win exec` invocation.
-pub fn install_broker_dacl(group_sid: &str) -> Result<()> {
-    // RAII over `ConvertStringSidToSidW` → freed via `LocalFree` on
-    // drop.
-    let group = LocalPsid::from_string(group_sid)
-        .with_context(|| format!("parse group SID '{group_sid}'"))?;
-    let system = LocalPsid::from_string(SID_SYSTEM)?;
-    let admins = LocalPsid::from_string(SID_BUILTIN_ADMINS)?;
-    let owner_rights = LocalPsid::from_string(SID_OWNER_RIGHTS)?;
-
-    // (sid, mask) — first three get full access; OWNER_RIGHTS gets
-    // nothing. CI passes `group_sid == BUILTIN\Administrators`;
-    // dedup so we don't write a redundant ACE.
-    let mut aces: Vec<(windows::Win32::Security::PSID, u32)> = vec![
-        (group.as_psid(), PROCESS_ALL_ACCESS.0),
-        (system.as_psid(), PROCESS_ALL_ACCESS.0),
-    ];
-    if !group_sid.eq_ignore_ascii_case(SID_BUILTIN_ADMINS) {
-        aces.push((admins.as_psid(), PROCESS_ALL_ACCESS.0));
-    }
-    aces.push((owner_rights.as_psid(), 0u32));
-
-    // ACL size = header + Σ(ACE fixed prefix + SID body). The fixed
-    // prefix of an ACCESS_ALLOWED_ACE is 8 bytes (Header 4 + Mask 4);
-    // `SidStart` is the first DWORD of the SID, so total per-ACE =
-    // 8 + GetLengthSid.
-    const ACE_FIXED: usize = 8;
-    let mut total = size_of::<ACL>();
-    for (s, _) in &aces {
-        let len = unsafe { GetLengthSid(*s) } as usize;
-        if len == 0 {
-            return Err(anyhow!("GetLengthSid returned 0"));
-        }
-        total += ACE_FIXED + len;
-    }
-    total = (total + 3) & !3; // DWORD-align
-
-    let mut buf = vec![0u8; total];
-    let acl = buf.as_mut_ptr() as *mut ACL;
-    unsafe {
-        InitializeAcl(acl, total as u32, ACL_REVISION)
-            .context("InitializeAcl")?;
-        for (s, mask) in &aces {
-            AddAccessAllowedAce(acl, ACL_REVISION, *mask, *s)
-                .context("AddAccessAllowedAce")?;
-        }
-        // PROTECTED strips inherited ACEs — without it the user
-        // SID's default "full access to own process" inherited
-        // grant fires and the rewrite is a no-op.
-        let r = SetSecurityInfo(
-            GetCurrentProcess(),
-            SE_KERNEL_OBJECT,
-            DACL_SECURITY_INFORMATION | PROTECTED_DACL_SECURITY_INFORMATION,
-            None,
-            None,
-            Some(acl),
-            None,
-        );
-        if r.is_err() {
-            return Err(anyhow!(
-                "SetSecurityInfo(broker process DACL): {r:?}"
-            ));
-        }
-    }
-    // `buf` can drop here — `SetSecurityInfo` copies the ACL into
-    // the kernel object's SECURITY_DESCRIPTOR.
-
-    // Diagnostic: read back and dump the DACL as SDDL so CI can
-    // confirm exactly what's on the broker process. Gated on
-    // SANDBOX_RUNTIME_WIN_DEBUG — production callers (batch 03:
-    // one exec per user command) don't want a stderr line per
-    // command. CI sets the env var so E6 still records the SDDL.
-    if std::env::var_os("SANDBOX_RUNTIME_WIN_DEBUG").is_some() {
-        match read_self_dacl_sddl() {
-            Some(sddl) => eprintln!(
-                "srt-win: self-protect applied (DACL: {sddl})"
-            ),
-            None => eprintln!("srt-win: self-protect applied"),
-        }
-    }
-    Ok(())
-}
-
-/// Best-effort read of the current process's DACL as an SDDL
-/// string. Returns `None` on any failure rather than erroring —
-/// this is diagnostic only.
-fn read_self_dacl_sddl() -> Option<String> {
-    use crate::util::{from_pwstr, local_free};
-    use windows::Win32::Security::PSECURITY_DESCRIPTOR;
-    unsafe {
-        let mut psd = PSECURITY_DESCRIPTOR::default();
-        let r = GetSecurityInfo(
-            HANDLE(GetCurrentProcess().0),
-            SE_KERNEL_OBJECT,
-            DACL_SECURITY_INFORMATION,
-            None,
-            None,
-            None,
-            None,
-            Some(&mut psd),
-        );
-        if r.is_err() || psd.0.is_null() {
-            return None;
-        }
-        let mut s = PWSTR::null();
-        let ok = ConvertSecurityDescriptorToStringSecurityDescriptorW(
-            psd,
-            SDDL_REVISION_1,
-            DACL_SECURITY_INFORMATION,
-            &mut s,
-            None,
-        );
-        local_free(psd.0);
-        if ok.is_err() {
-            return None;
-        }
-        let out = from_pwstr(s);
-        local_free(s.0 as *mut c_void);
-        Some(out)
-    }
-}

package/dist/vendor/srt-win/src/sid.rs

@@ -1,296 +0,0 @@
-//! PSID ↔ string-SID helpers and token-membership queries.
-//!
-//! All `PSID` values returned by `ConvertStringSidToSidW` are
-//! heap-allocated by the OS via `LocalAlloc` and **must** be freed
-//! with `LocalFree` — never `FreeSid`, which is only valid for SIDs
-//! built by `AllocateAndInitializeSid`. The `LocalPsid` RAII wrapper
-//! enforces that.
-
-use anyhow::{anyhow, Context, Result};
-use std::ffi::c_void;
-use windows::core::PWSTR;
-use windows::Win32::Foundation::{CloseHandle, LocalFree, HANDLE, HLOCAL};
-use windows::Win32::Security::Authorization::{
-    ConvertSidToStringSidW, ConvertStringSidToSidW,
-};
-use windows::Win32::Security::{
-    EqualSid, GetTokenInformation, LookupAccountNameW, LookupAccountSidW,
-    PSID, SID_NAME_USE, TokenGroups, TokenUser, TOKEN_GROUPS, TOKEN_QUERY,
-    TOKEN_USER,
-};
-use windows::Win32::System::SystemServices::{
-    SE_GROUP_ENABLED, SE_GROUP_USE_FOR_DENY_ONLY,
-};
-use windows::Win32::System::Threading::{GetCurrentProcess, OpenProcessToken};
-
-use crate::util::{from_pwstr, local_free, pcwstr, wstr};
-
-/// RAII wrapper for a `PSID` returned by `ConvertStringSidToSidW`.
-/// Freed via `LocalFree` on drop.
-pub struct LocalPsid(PSID);
-
-impl LocalPsid {
-    /// Parse a string SID like `"S-1-5-32-544"`.
-    pub fn from_string(sid_str: &str) -> Result<Self> {
-        let mut sid = PSID::default();
-        let w = wstr(sid_str);
-        unsafe {
-            ConvertStringSidToSidW(pcwstr(&w), &mut sid).map_err(|e| {
-                anyhow!("ConvertStringSidToSidW({sid_str}): {e}")
-            })?;
-        }
-        Ok(Self(sid))
-    }
-
-    pub fn as_psid(&self) -> PSID {
-        self.0
-    }
-}
-
-impl Drop for LocalPsid {
-    fn drop(&mut self) {
-        if !self.0 .0.is_null() {
-            unsafe {
-                let _ = LocalFree(Some(HLOCAL(self.0 .0)));
-            }
-        }
-    }
-}
-
-/// Stringify a `PSID`. Used for serialisation and logging.
-pub fn psid_to_string(sid: PSID) -> Result<String> {
-    let mut p = PWSTR::null();
-    unsafe {
-        ConvertSidToStringSidW(sid, &mut p)
-            .map_err(|e| anyhow!("ConvertSidToStringSidW: {e}"))?;
-    }
-    let s = from_pwstr(p);
-    local_free(p.0 as *mut c_void);
-    Ok(s)
-}
-
-/// Outcome of a SID → account reverse lookup.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum SidExistence {
-    /// `LookupAccountSidW` resolved the SID to an account.
-    Mapped,
-    /// `LookupAccountSidW` returned `ERROR_NONE_MAPPED` — well-formed
-    /// SID with no corresponding account. Treat as "absent".
-    Unmapped,
-    /// Lookup failed for a transient reason (e.g. domain controller
-    /// unreachable). Caller should fall through to other checks
-    /// rather than report absent.
-    Unknown,
-}
-
-/// Reverse-lookup: does any account correspond to `sid_str`?
-/// Used by `group status --group-sid` so a typo'd SID is reported as
-/// `absent` rather than `created-not-on-token`.
-pub fn sid_account_exists(sid_str: &str) -> Result<SidExistence> {
-    use windows::Win32::Foundation::{
-        GetLastError, ERROR_INSUFFICIENT_BUFFER, ERROR_NONE_MAPPED,
-    };
-    let psid = LocalPsid::from_string(sid_str)?;
-    unsafe {
-        let mut cch_name: u32 = 0;
-        let mut cch_dom: u32 = 0;
-        let mut use_: SID_NAME_USE = SID_NAME_USE::default();
-        // Sizing call — we only care about the error code.
-        let r = LookupAccountSidW(
-            windows::core::PCWSTR::null(),
-            psid.as_psid(),
-            None,
-            &mut cch_name,
-            None,
-            &mut cch_dom,
-            &mut use_,
-        );
-        if r.is_ok() {
-            // Shouldn't happen with zero-length buffers, but treat as
-            // mapped if it does.
-            return Ok(SidExistence::Mapped);
-        }
-        match GetLastError() {
-            ERROR_INSUFFICIENT_BUFFER => Ok(SidExistence::Mapped),
-            ERROR_NONE_MAPPED => Ok(SidExistence::Unmapped),
-            // RPC_S_SERVER_UNAVAILABLE, ERROR_TRUSTED_RELATIONSHIP_FAILURE,
-            // etc. — don't claim absence on a transient lookup failure.
-            _ => Ok(SidExistence::Unknown),
-        }
-    }
-}
-
-/// Resolve an account name (local or domain) to a string SID via
-/// `LookupAccountNameW` with a NULL system name (local SAM first,
-/// then domain). Errors if the name is not found.
-pub fn lookup_account_sid(name: &str) -> Result<String> {
-    unsafe {
-        let mut cb_sid: u32 = 0;
-        let mut cch_dom: u32 = 0;
-        let mut use_: SID_NAME_USE = SID_NAME_USE::default();
-        let name_w = wstr(name);
-        // Sizing call. Expected to fail with ERROR_INSUFFICIENT_BUFFER.
-        let _ = LookupAccountNameW(
-            windows::core::PCWSTR::null(),
-            pcwstr(&name_w),
-            None,
-            &mut cb_sid,
-            None,
-            &mut cch_dom,
-            &mut use_,
-        );
-        if cb_sid == 0 {
-            return Err(anyhow!(
-                "LookupAccountNameW({name}): account not found"
-            ));
-        }
-        let mut sid_buf = vec![0u8; cb_sid as usize];
-        let mut dom_buf = vec![0u16; cch_dom.max(1) as usize];
-        LookupAccountNameW(
-            windows::core::PCWSTR::null(),
-            pcwstr(&name_w),
-            Some(PSID(sid_buf.as_mut_ptr() as *mut c_void)),
-            &mut cb_sid,
-            Some(PWSTR(dom_buf.as_mut_ptr())),
-            &mut cch_dom,
-            &mut use_,
-        )
-        .map_err(|e| anyhow!("LookupAccountNameW({name}): {e}"))?;
-        psid_to_string(PSID(sid_buf.as_mut_ptr() as *mut c_void))
-    }
-}
-
-/// String SID of the current process token's user.
-pub fn current_user_sid() -> Result<String> {
-    unsafe {
-        let mut tok = HANDLE::default();
-        OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &mut tok)
-            .context("OpenProcessToken")?;
-        let mut len = 0u32;
-        let _ = GetTokenInformation(tok, TokenUser, None, 0, &mut len);
-        let mut buf = vec![0u8; len as usize];
-        let r = GetTokenInformation(
-            tok,
-            TokenUser,
-            Some(buf.as_mut_ptr() as *mut c_void),
-            len,
-            &mut len,
-        );
-        let _ = CloseHandle(tok);
-        r.context("GetTokenInformation(TokenUser)")?;
-        let tu = &*(buf.as_ptr() as *const TOKEN_USER);
-        psid_to_string(tu.User.Sid)
-    }
-}
-
-/// State of a SID inside the current process's `TokenGroups`.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum GroupState {
-    /// Present with `SE_GROUP_ENABLED` set. Broker tokens look like
-    /// this once the user has logged out + back in after group
-    /// creation.
-    Enabled,
-    /// Present with `SE_GROUP_USE_FOR_DENY_ONLY` set. A sandbox child
-    /// token looks like this; a broker should never see it.
-    DenyOnly,
-    /// Present but neither enabled nor deny-only. Unexpected.
-    Present,
-    /// Not in `TokenGroups` at all. Typical immediately after group
-    /// creation, before the user re-logs-in.
-    Absent,
-}
-
-/// How does `target_sid` appear in the current process token's
-/// `TokenGroups`?
-pub fn group_state_for_self(target_sid: &str) -> Result<GroupState> {
-    let target = LocalPsid::from_string(target_sid)?;
-    unsafe {
-        let mut tok = HANDLE::default();
-        OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &mut tok)
-            .context("OpenProcessToken")?;
-        let mut len = 0u32;
-        let _ = GetTokenInformation(tok, TokenGroups, None, 0, &mut len);
-        let mut buf = vec![0u8; len as usize];
-        let r = GetTokenInformation(
-            tok,
-            TokenGroups,
-            Some(buf.as_mut_ptr() as *mut c_void),
-            len,
-            &mut len,
-        );
-        let _ = CloseHandle(tok);
-        r.context("GetTokenInformation(TokenGroups)")?;
-        let tg = &*(buf.as_ptr() as *const TOKEN_GROUPS);
-        let arr = std::slice::from_raw_parts(
-            tg.Groups.as_ptr(),
-            tg.GroupCount as usize,
-        );
-        for g in arr {
-            if EqualSid(target.as_psid(), g.Sid).is_ok() {
-                let attrs = g.Attributes as i32;
-                if attrs & SE_GROUP_USE_FOR_DENY_ONLY != 0 {
-                    return Ok(GroupState::DenyOnly);
-                }
-                if attrs & SE_GROUP_ENABLED != 0 {
-                    return Ok(GroupState::Enabled);
-                }
-                return Ok(GroupState::Present);
-            }
-        }
-        Ok(GroupState::Absent)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn psid_string_round_trip() {
-        // Well-known Everyone SID.
-        let p = LocalPsid::from_string("S-1-1-0").expect("from_string");
-        let s = psid_to_string(p.as_psid()).expect("to_string");
-        assert_eq!(s, "S-1-1-0");
-    }
-
-    #[test]
-    fn lookup_builtin_users() {
-        // BUILTIN\Users exists on every Windows install.
-        let s = lookup_account_sid("BUILTIN\\Users").expect("lookup");
-        assert_eq!(s, "S-1-5-32-545");
-    }
-
-    #[test]
-    fn lookup_missing_account_errors() {
-        let r = lookup_account_sid("no-such-group-srt-win-test");
-        assert!(r.is_err());
-    }
-
-    #[test]
-    fn sid_account_exists_for_well_known() {
-        assert_eq!(
-            sid_account_exists("S-1-5-32-545").unwrap(),
-            SidExistence::Mapped
-        );
-    }
-
-    #[test]
-    fn sid_account_exists_unmapped_for_bogus() {
-        // Well-formed but maps to nothing on any machine.
-        assert_eq!(
-            sid_account_exists("S-1-5-21-1-2-3-9999999").unwrap(),
-            SidExistence::Unmapped
-        );
-    }
-
-    #[test]
-    fn sid_account_exists_errors_on_malformed() {
-        assert!(sid_account_exists("not-a-sid").is_err());
-    }
-
-    #[test]
-    fn current_user_sid_is_nonempty() {
-        let s = current_user_sid().expect("current_user_sid");
-        assert!(s.starts_with("S-1-"), "got {s}");
-    }
-}