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
107 changes: 103 additions & 4 deletions crates/capsec-core/src/has.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,17 @@
//!
//! # Multiple capabilities
//!
//! For functions that need multiple permissions, use multiple parameters:
//! Bundle permissions in a single token with a tuple:
//!
//! ```rust,ignore
//! fn sync_data(cap: &(impl Has<FsRead> + Has<NetConnect>)) { ... }
//!
//! let root = test_root();
//! let cap = root.grant::<(FsRead, NetConnect)>();
//! sync_data(&cap);
//! ```
//!
//! Or use separate parameters:
//!
//! ```rust,ignore
//! fn sync_data(fs: &impl Has<FsRead>, net: &impl Has<NetConnect>) { ... }
Expand DownExpand Up@@ -49,15 +59,15 @@ pub trait Has<P: Permission> {
fn cap_ref(&self) -> Cap<P>;
}

// ── Direct: Cap<P> implements Has<P> ────────────────────────────
// Direct: Cap<P> implements Has<P>

impl<P: Permission> Has<P> for Cap<P> {
fn cap_ref(&self) -> Cap<P> {
Cap::new()
}
}

// ── Subsumption: FsAll, NetAll ──────────────────────────────────
// Subsumption: FsAll, NetAll

macro_rules! impl_subsumes {
($super:ty => $($sub:ty),+) => {
Expand All@@ -72,7 +82,7 @@ macro_rules! impl_subsumes {
impl_subsumes!(FsAll => FsRead, FsWrite);
impl_subsumes!(NetAll => NetConnect, NetBind);

// ── Ambient: satisfies everything ───────────────────────────────
// Ambient: satisfies everything

macro_rules! impl_ambient {
($($perm:ty),+) => {
Expand All@@ -88,6 +98,53 @@ impl_ambient!(
FsRead, FsWrite, FsAll, NetConnect, NetBind, NetAll, EnvRead, EnvWrite, Spawn
);

// Tuples: Cap<(A, B)> satisfies Has<A> and Has<B>
//
// Because Rust's coherence rules reject overlapping generic impls when A == B,
// we enumerate all concrete permission pairs via two macros.
//
// Macro 1: Has<first_element> for all (A, B) pairs including self-pairs (100 impls).
// Macro 2: Has<second_element> for distinct pairs only (90 impls).
//
// Total: 190 unique impls. No conflicts. No changes to the Has<P> trait signature.

macro_rules! impl_tuple_has_first {
([$($a:ident),+]; $all:tt) => {
$( impl_tuple_has_first!(@inner $a; $all); )+
};
(@inner $a:ident; [$($b:ident),+]) => {
$(
impl Has<$a> for Cap<($a, $b)> {
fn cap_ref(&self) -> Cap<$a> { Cap::new() }
}
)+
};
}

macro_rules! impl_tuple_has_second {
($first:ident $(, $rest:ident)+) => {
$(
impl Has<$first> for Cap<($rest, $first)> {
fn cap_ref(&self) -> Cap<$first> { Cap::new() }
}
impl Has<$rest> for Cap<($first, $rest)> {
fn cap_ref(&self) -> Cap<$rest> { Cap::new() }
}
)+
impl_tuple_has_second!($($rest),+);
};
($single:ident) => {};
}

impl_tuple_has_first!(
[FsRead, FsWrite, FsAll, NetConnect, NetBind, NetAll, EnvRead, EnvWrite, Spawn, Ambient];
[FsRead, FsWrite, FsAll, NetConnect, NetBind, NetAll, EnvRead, EnvWrite, Spawn, Ambient]
);

impl_tuple_has_second!(
FsRead, FsWrite, FsAll, NetConnect, NetBind, NetAll, EnvRead, EnvWrite, Spawn, Ambient
);

#[cfg(test)]
mod tests {
use super::*;
Expand DownExpand Up@@ -141,4 +198,46 @@ mod tests {
let net = root.grant::<NetConnect>();
sync_data(&fs, &net);
}

#[test]
fn tuple_cap_satisfies_both_has() {
let root = test_root();
let cap = root.grant::<(FsRead, NetConnect)>();
fn needs_fs(_: &impl Has<FsRead>) {}
fn needs_net(_: &impl Has<NetConnect>) {}
needs_fs(&cap);
needs_net(&cap);
}

#[test]
fn tuple_self_pair() {
let root = test_root();
let cap = root.grant::<(FsRead, FsRead)>();
fn needs_fs(_: &impl Has<FsRead>) {}
needs_fs(&cap);
}

#[test]
fn tuple_with_subsumption_type() {
let root = test_root();
let cap = root.grant::<(FsAll, NetConnect)>();
fn needs_fs_all(_: &impl Has<FsAll>) {}
fn needs_net(_: &impl Has<NetConnect>) {}
needs_fs_all(&cap);
needs_net(&cap);
}

#[test]
fn tuple_cap_ref_returns_correct_type() {
let root = test_root();
let cap = root.grant::<(FsRead, NetConnect)>();
let _fs: Cap<FsRead> = Has::<FsRead>::cap_ref(&cap);
let _net: Cap<NetConnect> = Has::<NetConnect>::cap_ref(&cap);
}

#[test]
fn tuple_is_zst() {
use std::mem::size_of;
assert_eq!(size_of::<Cap<(FsRead, NetConnect)>>(), 0);
}
}
33 changes: 25 additions & 8 deletions crates/capsec-core/src/permission.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,13 @@
//! | [`Spawn`] | Process | Execute subprocesses |
//! | [`Ambient`] | Everything | Full ambient authority — the "god token" |
//!
//! # Tuples
//!
//! Two permissions can be bundled via a tuple: `(FsRead, NetConnect)` is itself
//! a `Permission`, and `Cap<(FsRead, NetConnect)>` satisfies both `Has<FsRead>`
//! and `Has<NetConnect>`. All 2-tuple combinations of built-in permissions are
//! supported.
//!
//! # Subsumption
//!
//! Some permissions imply others. [`FsAll`] subsumes both [`FsRead`] and [`FsWrite`],
Expand All@@ -32,7 +39,7 @@
/// can be used as capability tokens — external crates cannot forge new permissions.
pub trait Permission: sealed::Sealed + 'static {}

// ── Filesystem ──────────────────────────────────────────────────
// Filesystem

/// Permission to read files, list directories, and check metadata.
pub struct FsRead;
Expand All@@ -43,7 +50,7 @@ pub struct FsWrite;
/// Permission for all filesystem operations. Subsumes [`FsRead`] and [`FsWrite`].
pub struct FsAll;

// ── Network ─────────────────────────────────────────────────────
// Network

/// Permission to open outbound TCP and UDP connections.
pub struct NetConnect;
Expand All@@ -54,28 +61,28 @@ pub struct NetBind;
/// Permission for all network operations. Subsumes [`NetConnect`] and [`NetBind`].
pub struct NetAll;

// ── Environment ─────────────────────────────────────────────────
// Environment

/// Permission to read environment variables.
pub struct EnvRead;

/// Permission to modify or remove environment variables.
pub struct EnvWrite;

// ── Process ─────────────────────────────────────────────────────
// Process

/// Permission to spawn and execute subprocesses via `std::process::Command`.
pub struct Spawn;

// ── Ambient ─────────────────────────────────────────────────────
// Ambient

/// Full ambient authority — grants every permission.
///
/// This is the "god token." A `Cap<Ambient>` satisfies any `Has<P>` bound.
/// Use sparingly and only at the capability root.
pub struct Ambient;

// ── Permission impls ────────────────────────────────────────────
// Permission impls

impl Permission for FsRead {}
impl Permission for FsWrite {}
Expand All@@ -88,7 +95,11 @@ impl Permission for EnvWrite {}
impl Permission for Spawn {}
impl Permission for Ambient {}

// ── Subsumption ─────────────────────────────────────────────────
// Tuple permissions

impl<A: Permission, B: Permission> Permission for (A, B) {}

// Subsumption

/// Indicates that `Self` implies permission `P`.
///
Expand All@@ -103,7 +114,7 @@ impl Subsumes<NetConnect> for NetAll {}
impl Subsumes<NetBind> for NetAll {}
impl<P: Permission> Subsumes<P> for Ambient {}

// ── Sealed ──────────────────────────────────────────────────────
// Sealed

mod sealed {
pub trait Sealed {}
Expand All@@ -117,6 +128,7 @@ mod sealed {
impl Sealed for super::EnvWrite {}
impl Sealed for super::Spawn {}
impl Sealed for super::Ambient {}
impl<A: Sealed, B: Sealed> Sealed for (A, B) {}
}

#[cfg(test)]
Expand All@@ -141,6 +153,11 @@ mod tests {
// Compile-time proof that subsumption relationships hold:
fn _assert_subsumes<Super: Subsumes<Sub>, Sub: Permission>() {}

#[test]
fn tuple_permission_is_zst() {
assert_eq!(size_of::<(FsRead, NetConnect)>(), 0);
}

#[test]
fn subsumption_relationships() {
_assert_subsumes::<FsAll, FsRead>();
Expand Down
4 changes: 4 additions & 0 deletions crates/capsec-core/src/root.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,8 +83,12 @@ impl CapRoot {
/// # use capsec_core::permission::{FsRead, NetConnect};
/// let root = test_root();
///
/// // Individual capabilities:
/// let fs_cap = root.grant::<FsRead>();
/// let net_cap = root.grant::<NetConnect>();
///
/// // Or bundle multiple permissions in one token:
/// let combo = root.grant::<(FsRead, NetConnect)>();
/// ```
pub fn grant<P: Permission>(&self) -> Cap<P> {
Cap::new()
Expand Down
6 changes: 3 additions & 3 deletions crates/capsec/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@
//! - **`capsec-macro`** — `#[requires]` and `#[deny]` proc macros
//! - **`capsec-std`** — capability-gated `std` wrappers

// ── Re-exports from capsec-core ─────────────────────────────────
// Re-exports from capsec-core

pub use capsec_core::cap::{Cap, SendCap};
pub use capsec_core::error::CapSecError;
Expand All@@ -44,11 +44,11 @@ pub use capsec_core::root::test_root;

pub use capsec_core::attenuate::{Attenuated, DirScope, HostScope, Scope};

// ── Re-exports from capsec-macro ────────────────────────────────
// Re-exports from capsec-macro

pub use capsec_macro::{deny, requires};

// ── Capability-gated std wrappers ───────────────────────────────
// Capability-gated std wrappers

/// Capability-gated filesystem operations. See [`capsec_std::fs`].
pub mod fs {
Expand Down
3 changes: 3 additions & 0 deletions crates/capsec/tests/compile_fail/cap_is_not_send.stderr
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ error[E0277]: `*const ()` cannot be sent between threads safely
= help: within `capsec::Cap<capsec::FsRead>`, the trait `Send` is not implemented for `*const ()`
note: required because it appears within the type `PhantomData<*const ()>`
--> $RUST/core/src/marker.rs
|
| pub struct PhantomData<T: PointeeSized>;
| ^^^^^^^^^^^
note: required because it appears within the type `capsec::Cap<capsec::FsRead>`
--> $WORKSPACE/crates/capsec-core/src/cap.rs
|
Expand Down
3 changes: 3 additions & 0 deletions crates/capsec/tests/compile_fail/cap_is_not_sync.stderr
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ error[E0277]: `*const ()` cannot be shared between threads safely
= help: within `capsec::Cap<capsec::FsRead>`, the trait `Sync` is not implemented for `*const ()`
note: required because it appears within the type `PhantomData<*const ()>`
--> $RUST/core/src/marker.rs
|
| pub struct PhantomData<T: PointeeSized>;
| ^^^^^^^^^^^
note: required because it appears within the type `capsec::Cap<capsec::FsRead>`
--> $WORKSPACE/crates/capsec-core/src/cap.rs
|
Expand Down
16 changes: 8 additions & 8 deletions crates/capsec/tests/compile_fail/capsec_std_wrong_cap.stderr
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,14 @@ error[E0277]: the trait bound `Cap<capsec::NetConnect>: Has<FsRead>` is not sati
| required by a bound introduced by this call
|
= help: the following other types implement trait `Has<P>`:
`Cap<Ambient>` implements `Has<EnvRead>`
`Cap<Ambient>` implements `Has<EnvWrite>`
`Cap<Ambient>` implements `Has<FsAll>`
`Cap<Ambient>` implements `Has<FsRead>`
`Cap<Ambient>` implements `Has<FsWrite>`
`Cap<Ambient>` implements `Has<NetAll>`
`Cap<Ambient>` implements `Has<NetBind>`
`Cap<Ambient>` implements `Has<Spawn>`
`Cap<(Ambient, Ambient)>` implements `Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `Has<EnvRead>`
`Cap<(Ambient, EnvWrite)>` implements `Has<Ambient>`
`Cap<(Ambient, EnvWrite)>` implements `Has<EnvWrite>`
`Cap<(Ambient, FsAll)>` implements `Has<Ambient>`
`Cap<(Ambient, FsAll)>` implements `Has<FsAll>`
`Cap<(Ambient, FsRead)>` implements `Has<Ambient>`
and $N others
note: required by a bound in `capsec::fs::read_to_string`
--> $WORKSPACE/crates/capsec-std/src/fs.rs
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,14 +10,14 @@ help: the trait `capsec_core::permission::sealed::Sealed` is not implemented for
5 | struct MyPerm;
| ^^^^^^^^^^^^^
= help: the following other types implement trait `capsec_core::permission::sealed::Sealed`:
(A, B)
Ambient
EnvRead
EnvWrite
FsAll
FsRead
FsWrite
NetAll
NetBind
and $N others
note: required by a bound in `capsec::Permission`
--> $WORKSPACE/crates/capsec-core/src/permission.rs
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,14 @@ error[E0277]: the trait bound `Cap<capsec::FsRead>: capsec::Has<capsec::NetConne
| required by a bound introduced by this call
|
= help: the following other types implement trait `capsec::Has<P>`:
`Cap<Ambient>` implements `capsec::Has<EnvRead>`
`Cap<Ambient>` implements `capsec::Has<EnvWrite>`
`Cap<Ambient>` implements `capsec::Has<FsAll>`
`Cap<Ambient>` implements `capsec::Has<FsWrite>`
`Cap<Ambient>` implements `capsec::Has<NetAll>`
`Cap<Ambient>` implements `capsec::Has<NetBind>`
`Cap<Ambient>` implements `capsec::Has<Spawn>`
`Cap<Ambient>` implements `capsec::Has<capsec::FsRead>`
`Cap<(Ambient, Ambient)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `capsec::Has<EnvRead>`
`Cap<(Ambient, EnvWrite)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvWrite)>` implements `capsec::Has<EnvWrite>`
`Cap<(Ambient, FsAll)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, FsAll)>` implements `capsec::Has<FsAll>`
`Cap<(Ambient, FsWrite)>` implements `capsec::Has<Ambient>`
and $N others
note: required by a bound in `needs_net`
--> tests/compile_fail/sendcap_cannot_grant_wrong_perm.rs:5:23
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,14 @@ error[E0277]: the trait bound `Cap<capsec::FsRead>: capsec::Has<capsec::FsAll>`
| required by a bound introduced by this call
|
= help: the following other types implement trait `capsec::Has<P>`:
`Cap<Ambient>` implements `capsec::Has<EnvRead>`
`Cap<Ambient>` implements `capsec::Has<EnvWrite>`
`Cap<Ambient>` implements `capsec::Has<FsWrite>`
`Cap<Ambient>` implements `capsec::Has<NetAll>`
`Cap<Ambient>` implements `capsec::Has<NetBind>`
`Cap<Ambient>` implements `capsec::Has<NetConnect>`
`Cap<Ambient>` implements `capsec::Has<Spawn>`
`Cap<Ambient>` implements `capsec::Has<capsec::FsAll>`
`Cap<(Ambient, Ambient)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `capsec::Has<EnvRead>`
`Cap<(Ambient, EnvWrite)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvWrite)>` implements `capsec::Has<EnvWrite>`
`Cap<(Ambient, FsWrite)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, FsWrite)>` implements `capsec::Has<FsWrite>`
`Cap<(Ambient, NetAll)>` implements `capsec::Has<Ambient>`
and $N others
note: required by a bound in `needs_fs_all`
--> tests/compile_fail/subsumption_not_reversed.rs:5:26
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
feat: implement Has<A> + Has<B> for tuple Cap<(A, B)> via macro-generated concrete impls by bordumb · Pull Request #7 · auths-dev/capsec · GitHub
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
107 changes: 103 additions & 4 deletions crates/capsec-core/src/has.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,17 @@
//!
//! # Multiple capabilities
//!
//! For functions that need multiple permissions, use multiple parameters:
//! Bundle permissions in a single token with a tuple:
//!
//! ```rust,ignore
//! fn sync_data(cap: &(impl Has<FsRead> + Has<NetConnect>)) { ... }
//!
//! let root = test_root();
//! let cap = root.grant::<(FsRead, NetConnect)>();
//! sync_data(&cap);
//! ```
//!
//! Or use separate parameters:
//!
//! ```rust,ignore
//! fn sync_data(fs: &impl Has<FsRead>, net: &impl Has<NetConnect>) { ... }
Expand DownExpand Up@@ -49,15 +59,15 @@ pub trait Has<P: Permission> {
fn cap_ref(&self) -> Cap<P>;
}

// ── Direct: Cap<P> implements Has<P> ────────────────────────────
// Direct: Cap<P> implements Has<P>

impl<P: Permission> Has<P> for Cap<P> {
fn cap_ref(&self) -> Cap<P> {
Cap::new()
}
}

// ── Subsumption: FsAll, NetAll ──────────────────────────────────
// Subsumption: FsAll, NetAll

macro_rules! impl_subsumes {
($super:ty => $($sub:ty),+) => {
Expand All@@ -72,7 +82,7 @@ macro_rules! impl_subsumes {
impl_subsumes!(FsAll => FsRead, FsWrite);
impl_subsumes!(NetAll => NetConnect, NetBind);

// ── Ambient: satisfies everything ───────────────────────────────
// Ambient: satisfies everything

macro_rules! impl_ambient {
($($perm:ty),+) => {
Expand All@@ -88,6 +98,53 @@ impl_ambient!(
FsRead, FsWrite, FsAll, NetConnect, NetBind, NetAll, EnvRead, EnvWrite, Spawn
);

// Tuples: Cap<(A, B)> satisfies Has<A> and Has<B>
//
// Because Rust's coherence rules reject overlapping generic impls when A == B,
// we enumerate all concrete permission pairs via two macros.
//
// Macro 1: Has<first_element> for all (A, B) pairs including self-pairs (100 impls).
// Macro 2: Has<second_element> for distinct pairs only (90 impls).
//
// Total: 190 unique impls. No conflicts. No changes to the Has<P> trait signature.

macro_rules! impl_tuple_has_first {
([$($a:ident),+]; $all:tt) => {
$( impl_tuple_has_first!(@inner $a; $all); )+
};
(@inner $a:ident; [$($b:ident),+]) => {
$(
impl Has<$a> for Cap<($a, $b)> {
fn cap_ref(&self) -> Cap<$a> { Cap::new() }
}
)+
};
}

macro_rules! impl_tuple_has_second {
($first:ident $(, $rest:ident)+) => {
$(
impl Has<$first> for Cap<($rest, $first)> {
fn cap_ref(&self) -> Cap<$first> { Cap::new() }
}
impl Has<$rest> for Cap<($first, $rest)> {
fn cap_ref(&self) -> Cap<$rest> { Cap::new() }
}
)+
impl_tuple_has_second!($($rest),+);
};
($single:ident) => {};
}

impl_tuple_has_first!(
[FsRead, FsWrite, FsAll, NetConnect, NetBind, NetAll, EnvRead, EnvWrite, Spawn, Ambient];
[FsRead, FsWrite, FsAll, NetConnect, NetBind, NetAll, EnvRead, EnvWrite, Spawn, Ambient]
);

impl_tuple_has_second!(
FsRead, FsWrite, FsAll, NetConnect, NetBind, NetAll, EnvRead, EnvWrite, Spawn, Ambient
);

#[cfg(test)]
mod tests {
use super::*;
Expand DownExpand Up@@ -141,4 +198,46 @@ mod tests {
let net = root.grant::<NetConnect>();
sync_data(&fs, &net);
}

#[test]
fn tuple_cap_satisfies_both_has() {
let root = test_root();
let cap = root.grant::<(FsRead, NetConnect)>();
fn needs_fs(_: &impl Has<FsRead>) {}
fn needs_net(_: &impl Has<NetConnect>) {}
needs_fs(&cap);
needs_net(&cap);
}

#[test]
fn tuple_self_pair() {
let root = test_root();
let cap = root.grant::<(FsRead, FsRead)>();
fn needs_fs(_: &impl Has<FsRead>) {}
needs_fs(&cap);
}

#[test]
fn tuple_with_subsumption_type() {
let root = test_root();
let cap = root.grant::<(FsAll, NetConnect)>();
fn needs_fs_all(_: &impl Has<FsAll>) {}
fn needs_net(_: &impl Has<NetConnect>) {}
needs_fs_all(&cap);
needs_net(&cap);
}

#[test]
fn tuple_cap_ref_returns_correct_type() {
let root = test_root();
let cap = root.grant::<(FsRead, NetConnect)>();
let _fs: Cap<FsRead> = Has::<FsRead>::cap_ref(&cap);
let _net: Cap<NetConnect> = Has::<NetConnect>::cap_ref(&cap);
}

#[test]
fn tuple_is_zst() {
use std::mem::size_of;
assert_eq!(size_of::<Cap<(FsRead, NetConnect)>>(), 0);
}
}
33 changes: 25 additions & 8 deletions crates/capsec-core/src/permission.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,13 @@
//! | [`Spawn`] | Process | Execute subprocesses |
//! | [`Ambient`] | Everything | Full ambient authority — the "god token" |
//!
//! # Tuples
//!
//! Two permissions can be bundled via a tuple: `(FsRead, NetConnect)` is itself
//! a `Permission`, and `Cap<(FsRead, NetConnect)>` satisfies both `Has<FsRead>`
//! and `Has<NetConnect>`. All 2-tuple combinations of built-in permissions are
//! supported.
//!
//! # Subsumption
//!
//! Some permissions imply others. [`FsAll`] subsumes both [`FsRead`] and [`FsWrite`],
Expand All@@ -32,7 +39,7 @@
/// can be used as capability tokens — external crates cannot forge new permissions.
pub trait Permission: sealed::Sealed + 'static {}

// ── Filesystem ──────────────────────────────────────────────────
// Filesystem

/// Permission to read files, list directories, and check metadata.
pub struct FsRead;
Expand All@@ -43,7 +50,7 @@ pub struct FsWrite;
/// Permission for all filesystem operations. Subsumes [`FsRead`] and [`FsWrite`].
pub struct FsAll;

// ── Network ─────────────────────────────────────────────────────
// Network

/// Permission to open outbound TCP and UDP connections.
pub struct NetConnect;
Expand All@@ -54,28 +61,28 @@ pub struct NetBind;
/// Permission for all network operations. Subsumes [`NetConnect`] and [`NetBind`].
pub struct NetAll;

// ── Environment ─────────────────────────────────────────────────
// Environment

/// Permission to read environment variables.
pub struct EnvRead;

/// Permission to modify or remove environment variables.
pub struct EnvWrite;

// ── Process ─────────────────────────────────────────────────────
// Process

/// Permission to spawn and execute subprocesses via `std::process::Command`.
pub struct Spawn;

// ── Ambient ─────────────────────────────────────────────────────
// Ambient

/// Full ambient authority — grants every permission.
///
/// This is the "god token." A `Cap<Ambient>` satisfies any `Has<P>` bound.
/// Use sparingly and only at the capability root.
pub struct Ambient;

// ── Permission impls ────────────────────────────────────────────
// Permission impls

impl Permission for FsRead {}
impl Permission for FsWrite {}
Expand All@@ -88,7 +95,11 @@ impl Permission for EnvWrite {}
impl Permission for Spawn {}
impl Permission for Ambient {}

// ── Subsumption ─────────────────────────────────────────────────
// Tuple permissions

impl<A: Permission, B: Permission> Permission for (A, B) {}

// Subsumption

/// Indicates that `Self` implies permission `P`.
///
Expand All@@ -103,7 +114,7 @@ impl Subsumes<NetConnect> for NetAll {}
impl Subsumes<NetBind> for NetAll {}
impl<P: Permission> Subsumes<P> for Ambient {}

// ── Sealed ──────────────────────────────────────────────────────
// Sealed

mod sealed {
pub trait Sealed {}
Expand All@@ -117,6 +128,7 @@ mod sealed {
impl Sealed for super::EnvWrite {}
impl Sealed for super::Spawn {}
impl Sealed for super::Ambient {}
impl<A: Sealed, B: Sealed> Sealed for (A, B) {}
}

#[cfg(test)]
Expand All@@ -141,6 +153,11 @@ mod tests {
// Compile-time proof that subsumption relationships hold:
fn _assert_subsumes<Super: Subsumes<Sub>, Sub: Permission>() {}

#[test]
fn tuple_permission_is_zst() {
assert_eq!(size_of::<(FsRead, NetConnect)>(), 0);
}

#[test]
fn subsumption_relationships() {
_assert_subsumes::<FsAll, FsRead>();
Expand Down
4 changes: 4 additions & 0 deletions crates/capsec-core/src/root.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,8 +83,12 @@ impl CapRoot {
/// # use capsec_core::permission::{FsRead, NetConnect};
/// let root = test_root();
///
/// // Individual capabilities:
/// let fs_cap = root.grant::<FsRead>();
/// let net_cap = root.grant::<NetConnect>();
///
/// // Or bundle multiple permissions in one token:
/// let combo = root.grant::<(FsRead, NetConnect)>();
/// ```
pub fn grant<P: Permission>(&self) -> Cap<P> {
Cap::new()
Expand Down
6 changes: 3 additions & 3 deletions crates/capsec/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@
//! - **`capsec-macro`** — `#[requires]` and `#[deny]` proc macros
//! - **`capsec-std`** — capability-gated `std` wrappers

// ── Re-exports from capsec-core ─────────────────────────────────
// Re-exports from capsec-core

pub use capsec_core::cap::{Cap, SendCap};
pub use capsec_core::error::CapSecError;
Expand All@@ -44,11 +44,11 @@ pub use capsec_core::root::test_root;

pub use capsec_core::attenuate::{Attenuated, DirScope, HostScope, Scope};

// ── Re-exports from capsec-macro ────────────────────────────────
// Re-exports from capsec-macro

pub use capsec_macro::{deny, requires};

// ── Capability-gated std wrappers ───────────────────────────────
// Capability-gated std wrappers

/// Capability-gated filesystem operations. See [`capsec_std::fs`].
pub mod fs {
Expand Down
3 changes: 3 additions & 0 deletions crates/capsec/tests/compile_fail/cap_is_not_send.stderr
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ error[E0277]: `*const ()` cannot be sent between threads safely
= help: within `capsec::Cap<capsec::FsRead>`, the trait `Send` is not implemented for `*const ()`
note: required because it appears within the type `PhantomData<*const ()>`
--> $RUST/core/src/marker.rs
|
| pub struct PhantomData<T: PointeeSized>;
| ^^^^^^^^^^^
note: required because it appears within the type `capsec::Cap<capsec::FsRead>`
--> $WORKSPACE/crates/capsec-core/src/cap.rs
|
Expand Down
3 changes: 3 additions & 0 deletions crates/capsec/tests/compile_fail/cap_is_not_sync.stderr
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ error[E0277]: `*const ()` cannot be shared between threads safely
= help: within `capsec::Cap<capsec::FsRead>`, the trait `Sync` is not implemented for `*const ()`
note: required because it appears within the type `PhantomData<*const ()>`
--> $RUST/core/src/marker.rs
|
| pub struct PhantomData<T: PointeeSized>;
| ^^^^^^^^^^^
note: required because it appears within the type `capsec::Cap<capsec::FsRead>`
--> $WORKSPACE/crates/capsec-core/src/cap.rs
|
Expand Down
16 changes: 8 additions & 8 deletions crates/capsec/tests/compile_fail/capsec_std_wrong_cap.stderr
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,14 @@ error[E0277]: the trait bound `Cap<capsec::NetConnect>: Has<FsRead>` is not sati
| required by a bound introduced by this call
|
= help: the following other types implement trait `Has<P>`:
`Cap<Ambient>` implements `Has<EnvRead>`
`Cap<Ambient>` implements `Has<EnvWrite>`
`Cap<Ambient>` implements `Has<FsAll>`
`Cap<Ambient>` implements `Has<FsRead>`
`Cap<Ambient>` implements `Has<FsWrite>`
`Cap<Ambient>` implements `Has<NetAll>`
`Cap<Ambient>` implements `Has<NetBind>`
`Cap<Ambient>` implements `Has<Spawn>`
`Cap<(Ambient, Ambient)>` implements `Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `Has<EnvRead>`
`Cap<(Ambient, EnvWrite)>` implements `Has<Ambient>`
`Cap<(Ambient, EnvWrite)>` implements `Has<EnvWrite>`
`Cap<(Ambient, FsAll)>` implements `Has<Ambient>`
`Cap<(Ambient, FsAll)>` implements `Has<FsAll>`
`Cap<(Ambient, FsRead)>` implements `Has<Ambient>`
and $N others
note: required by a bound in `capsec::fs::read_to_string`
--> $WORKSPACE/crates/capsec-std/src/fs.rs
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,14 +10,14 @@ help: the trait `capsec_core::permission::sealed::Sealed` is not implemented for
5 | struct MyPerm;
| ^^^^^^^^^^^^^
= help: the following other types implement trait `capsec_core::permission::sealed::Sealed`:
(A, B)
Ambient
EnvRead
EnvWrite
FsAll
FsRead
FsWrite
NetAll
NetBind
and $N others
note: required by a bound in `capsec::Permission`
--> $WORKSPACE/crates/capsec-core/src/permission.rs
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,14 @@ error[E0277]: the trait bound `Cap<capsec::FsRead>: capsec::Has<capsec::NetConne
| required by a bound introduced by this call
|
= help: the following other types implement trait `capsec::Has<P>`:
`Cap<Ambient>` implements `capsec::Has<EnvRead>`
`Cap<Ambient>` implements `capsec::Has<EnvWrite>`
`Cap<Ambient>` implements `capsec::Has<FsAll>`
`Cap<Ambient>` implements `capsec::Has<FsWrite>`
`Cap<Ambient>` implements `capsec::Has<NetAll>`
`Cap<Ambient>` implements `capsec::Has<NetBind>`
`Cap<Ambient>` implements `capsec::Has<Spawn>`
`Cap<Ambient>` implements `capsec::Has<capsec::FsRead>`
`Cap<(Ambient, Ambient)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `capsec::Has<EnvRead>`
`Cap<(Ambient, EnvWrite)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvWrite)>` implements `capsec::Has<EnvWrite>`
`Cap<(Ambient, FsAll)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, FsAll)>` implements `capsec::Has<FsAll>`
`Cap<(Ambient, FsWrite)>` implements `capsec::Has<Ambient>`
and $N others
note: required by a bound in `needs_net`
--> tests/compile_fail/sendcap_cannot_grant_wrong_perm.rs:5:23
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,14 @@ error[E0277]: the trait bound `Cap<capsec::FsRead>: capsec::Has<capsec::FsAll>`
| required by a bound introduced by this call
|
= help: the following other types implement trait `capsec::Has<P>`:
`Cap<Ambient>` implements `capsec::Has<EnvRead>`
`Cap<Ambient>` implements `capsec::Has<EnvWrite>`
`Cap<Ambient>` implements `capsec::Has<FsWrite>`
`Cap<Ambient>` implements `capsec::Has<NetAll>`
`Cap<Ambient>` implements `capsec::Has<NetBind>`
`Cap<Ambient>` implements `capsec::Has<NetConnect>`
`Cap<Ambient>` implements `capsec::Has<Spawn>`
`Cap<Ambient>` implements `capsec::Has<capsec::FsAll>`
`Cap<(Ambient, Ambient)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `capsec::Has<EnvRead>`
`Cap<(Ambient, EnvWrite)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvWrite)>` implements `capsec::Has<EnvWrite>`
`Cap<(Ambient, FsWrite)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, FsWrite)>` implements `capsec::Has<FsWrite>`
`Cap<(Ambient, NetAll)>` implements `capsec::Has<Ambient>`
and $N others
note: required by a bound in `needs_fs_all`
--> tests/compile_fail/subsumption_not_reversed.rs:5:26
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat: implement Has<A> + Has<B> for tuple Cap<(A, B)> via macro-generated concrete impls by bordumb · Pull Request #7 · auths-dev/capsec · GitHub
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
107 changes: 103 additions & 4 deletions crates/capsec-core/src/has.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,17 @@
//!
//! # Multiple capabilities
//!
//! For functions that need multiple permissions, use multiple parameters:
//! Bundle permissions in a single token with a tuple:
//!
//! ```rust,ignore
//! fn sync_data(cap: &(impl Has<FsRead> + Has<NetConnect>)) { ... }
//!
//! let root = test_root();
//! let cap = root.grant::<(FsRead, NetConnect)>();
//! sync_data(&cap);
//! ```
//!
//! Or use separate parameters:
//!
//! ```rust,ignore
//! fn sync_data(fs: &impl Has<FsRead>, net: &impl Has<NetConnect>) { ... }
Expand DownExpand Up@@ -49,15 +59,15 @@ pub trait Has<P: Permission> {
fn cap_ref(&self) -> Cap<P>;
}

// ── Direct: Cap<P> implements Has<P> ────────────────────────────
// Direct: Cap<P> implements Has<P>

impl<P: Permission> Has<P> for Cap<P> {
fn cap_ref(&self) -> Cap<P> {
Cap::new()
}
}

// ── Subsumption: FsAll, NetAll ──────────────────────────────────
// Subsumption: FsAll, NetAll

macro_rules! impl_subsumes {
($super:ty => $($sub:ty),+) => {
Expand All@@ -72,7 +82,7 @@ macro_rules! impl_subsumes {
impl_subsumes!(FsAll => FsRead, FsWrite);
impl_subsumes!(NetAll => NetConnect, NetBind);

// ── Ambient: satisfies everything ───────────────────────────────
// Ambient: satisfies everything

macro_rules! impl_ambient {
($($perm:ty),+) => {
Expand All@@ -88,6 +98,53 @@ impl_ambient!(
FsRead, FsWrite, FsAll, NetConnect, NetBind, NetAll, EnvRead, EnvWrite, Spawn
);

// Tuples: Cap<(A, B)> satisfies Has<A> and Has<B>
//
// Because Rust's coherence rules reject overlapping generic impls when A == B,
// we enumerate all concrete permission pairs via two macros.
//
// Macro 1: Has<first_element> for all (A, B) pairs including self-pairs (100 impls).
// Macro 2: Has<second_element> for distinct pairs only (90 impls).
//
// Total: 190 unique impls. No conflicts. No changes to the Has<P> trait signature.

macro_rules! impl_tuple_has_first {
([$($a:ident),+]; $all:tt) => {
$( impl_tuple_has_first!(@inner $a; $all); )+
};
(@inner $a:ident; [$($b:ident),+]) => {
$(
impl Has<$a> for Cap<($a, $b)> {
fn cap_ref(&self) -> Cap<$a> { Cap::new() }
}
)+
};
}

macro_rules! impl_tuple_has_second {
($first:ident $(, $rest:ident)+) => {
$(
impl Has<$first> for Cap<($rest, $first)> {
fn cap_ref(&self) -> Cap<$first> { Cap::new() }
}
impl Has<$rest> for Cap<($first, $rest)> {
fn cap_ref(&self) -> Cap<$rest> { Cap::new() }
}
)+
impl_tuple_has_second!($($rest),+);
};
($single:ident) => {};
}

impl_tuple_has_first!(
[FsRead, FsWrite, FsAll, NetConnect, NetBind, NetAll, EnvRead, EnvWrite, Spawn, Ambient];
[FsRead, FsWrite, FsAll, NetConnect, NetBind, NetAll, EnvRead, EnvWrite, Spawn, Ambient]
);

impl_tuple_has_second!(
FsRead, FsWrite, FsAll, NetConnect, NetBind, NetAll, EnvRead, EnvWrite, Spawn, Ambient
);

#[cfg(test)]
mod tests {
use super::*;
Expand DownExpand Up@@ -141,4 +198,46 @@ mod tests {
let net = root.grant::<NetConnect>();
sync_data(&fs, &net);
}

#[test]
fn tuple_cap_satisfies_both_has() {
let root = test_root();
let cap = root.grant::<(FsRead, NetConnect)>();
fn needs_fs(_: &impl Has<FsRead>) {}
fn needs_net(_: &impl Has<NetConnect>) {}
needs_fs(&cap);
needs_net(&cap);
}

#[test]
fn tuple_self_pair() {
let root = test_root();
let cap = root.grant::<(FsRead, FsRead)>();
fn needs_fs(_: &impl Has<FsRead>) {}
needs_fs(&cap);
}

#[test]
fn tuple_with_subsumption_type() {
let root = test_root();
let cap = root.grant::<(FsAll, NetConnect)>();
fn needs_fs_all(_: &impl Has<FsAll>) {}
fn needs_net(_: &impl Has<NetConnect>) {}
needs_fs_all(&cap);
needs_net(&cap);
}

#[test]
fn tuple_cap_ref_returns_correct_type() {
let root = test_root();
let cap = root.grant::<(FsRead, NetConnect)>();
let _fs: Cap<FsRead> = Has::<FsRead>::cap_ref(&cap);
let _net: Cap<NetConnect> = Has::<NetConnect>::cap_ref(&cap);
}

#[test]
fn tuple_is_zst() {
use std::mem::size_of;
assert_eq!(size_of::<Cap<(FsRead, NetConnect)>>(), 0);
}
}
33 changes: 25 additions & 8 deletions crates/capsec-core/src/permission.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,13 @@
//! | [`Spawn`] | Process | Execute subprocesses |
//! | [`Ambient`] | Everything | Full ambient authority — the "god token" |
//!
//! # Tuples
//!
//! Two permissions can be bundled via a tuple: `(FsRead, NetConnect)` is itself
//! a `Permission`, and `Cap<(FsRead, NetConnect)>` satisfies both `Has<FsRead>`
//! and `Has<NetConnect>`. All 2-tuple combinations of built-in permissions are
//! supported.
//!
//! # Subsumption
//!
//! Some permissions imply others. [`FsAll`] subsumes both [`FsRead`] and [`FsWrite`],
Expand All@@ -32,7 +39,7 @@
/// can be used as capability tokens — external crates cannot forge new permissions.
pub trait Permission: sealed::Sealed + 'static {}

// ── Filesystem ──────────────────────────────────────────────────
// Filesystem

/// Permission to read files, list directories, and check metadata.
pub struct FsRead;
Expand All@@ -43,7 +50,7 @@ pub struct FsWrite;
/// Permission for all filesystem operations. Subsumes [`FsRead`] and [`FsWrite`].
pub struct FsAll;

// ── Network ─────────────────────────────────────────────────────
// Network

/// Permission to open outbound TCP and UDP connections.
pub struct NetConnect;
Expand All@@ -54,28 +61,28 @@ pub struct NetBind;
/// Permission for all network operations. Subsumes [`NetConnect`] and [`NetBind`].
pub struct NetAll;

// ── Environment ─────────────────────────────────────────────────
// Environment

/// Permission to read environment variables.
pub struct EnvRead;

/// Permission to modify or remove environment variables.
pub struct EnvWrite;

// ── Process ─────────────────────────────────────────────────────
// Process

/// Permission to spawn and execute subprocesses via `std::process::Command`.
pub struct Spawn;

// ── Ambient ─────────────────────────────────────────────────────
// Ambient

/// Full ambient authority — grants every permission.
///
/// This is the "god token." A `Cap<Ambient>` satisfies any `Has<P>` bound.
/// Use sparingly and only at the capability root.
pub struct Ambient;

// ── Permission impls ────────────────────────────────────────────
// Permission impls

impl Permission for FsRead {}
impl Permission for FsWrite {}
Expand All@@ -88,7 +95,11 @@ impl Permission for EnvWrite {}
impl Permission for Spawn {}
impl Permission for Ambient {}

// ── Subsumption ─────────────────────────────────────────────────
// Tuple permissions

impl<A: Permission, B: Permission> Permission for (A, B) {}

// Subsumption

/// Indicates that `Self` implies permission `P`.
///
Expand All@@ -103,7 +114,7 @@ impl Subsumes<NetConnect> for NetAll {}
impl Subsumes<NetBind> for NetAll {}
impl<P: Permission> Subsumes<P> for Ambient {}

// ── Sealed ──────────────────────────────────────────────────────
// Sealed

mod sealed {
pub trait Sealed {}
Expand All@@ -117,6 +128,7 @@ mod sealed {
impl Sealed for super::EnvWrite {}
impl Sealed for super::Spawn {}
impl Sealed for super::Ambient {}
impl<A: Sealed, B: Sealed> Sealed for (A, B) {}
}

#[cfg(test)]
Expand All@@ -141,6 +153,11 @@ mod tests {
// Compile-time proof that subsumption relationships hold:
fn _assert_subsumes<Super: Subsumes<Sub>, Sub: Permission>() {}

#[test]
fn tuple_permission_is_zst() {
assert_eq!(size_of::<(FsRead, NetConnect)>(), 0);
}

#[test]
fn subsumption_relationships() {
_assert_subsumes::<FsAll, FsRead>();
Expand Down
4 changes: 4 additions & 0 deletions crates/capsec-core/src/root.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,8 +83,12 @@ impl CapRoot {
/// # use capsec_core::permission::{FsRead, NetConnect};
/// let root = test_root();
///
/// // Individual capabilities:
/// let fs_cap = root.grant::<FsRead>();
/// let net_cap = root.grant::<NetConnect>();
///
/// // Or bundle multiple permissions in one token:
/// let combo = root.grant::<(FsRead, NetConnect)>();
/// ```
pub fn grant<P: Permission>(&self) -> Cap<P> {
Cap::new()
Expand Down
6 changes: 3 additions & 3 deletions crates/capsec/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@
//! - **`capsec-macro`** — `#[requires]` and `#[deny]` proc macros
//! - **`capsec-std`** — capability-gated `std` wrappers

// ── Re-exports from capsec-core ─────────────────────────────────
// Re-exports from capsec-core

pub use capsec_core::cap::{Cap, SendCap};
pub use capsec_core::error::CapSecError;
Expand All@@ -44,11 +44,11 @@ pub use capsec_core::root::test_root;

pub use capsec_core::attenuate::{Attenuated, DirScope, HostScope, Scope};

// ── Re-exports from capsec-macro ────────────────────────────────
// Re-exports from capsec-macro

pub use capsec_macro::{deny, requires};

// ── Capability-gated std wrappers ───────────────────────────────
// Capability-gated std wrappers

/// Capability-gated filesystem operations. See [`capsec_std::fs`].
pub mod fs {
Expand Down
3 changes: 3 additions & 0 deletions crates/capsec/tests/compile_fail/cap_is_not_send.stderr
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ error[E0277]: `*const ()` cannot be sent between threads safely
= help: within `capsec::Cap<capsec::FsRead>`, the trait `Send` is not implemented for `*const ()`
note: required because it appears within the type `PhantomData<*const ()>`
--> $RUST/core/src/marker.rs
|
| pub struct PhantomData<T: PointeeSized>;
| ^^^^^^^^^^^
note: required because it appears within the type `capsec::Cap<capsec::FsRead>`
--> $WORKSPACE/crates/capsec-core/src/cap.rs
|
Expand Down
3 changes: 3 additions & 0 deletions crates/capsec/tests/compile_fail/cap_is_not_sync.stderr
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ error[E0277]: `*const ()` cannot be shared between threads safely
= help: within `capsec::Cap<capsec::FsRead>`, the trait `Sync` is not implemented for `*const ()`
note: required because it appears within the type `PhantomData<*const ()>`
--> $RUST/core/src/marker.rs
|
| pub struct PhantomData<T: PointeeSized>;
| ^^^^^^^^^^^
note: required because it appears within the type `capsec::Cap<capsec::FsRead>`
--> $WORKSPACE/crates/capsec-core/src/cap.rs
|
Expand Down
16 changes: 8 additions & 8 deletions crates/capsec/tests/compile_fail/capsec_std_wrong_cap.stderr
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,14 @@ error[E0277]: the trait bound `Cap<capsec::NetConnect>: Has<FsRead>` is not sati
| required by a bound introduced by this call
|
= help: the following other types implement trait `Has<P>`:
`Cap<Ambient>` implements `Has<EnvRead>`
`Cap<Ambient>` implements `Has<EnvWrite>`
`Cap<Ambient>` implements `Has<FsAll>`
`Cap<Ambient>` implements `Has<FsRead>`
`Cap<Ambient>` implements `Has<FsWrite>`
`Cap<Ambient>` implements `Has<NetAll>`
`Cap<Ambient>` implements `Has<NetBind>`
`Cap<Ambient>` implements `Has<Spawn>`
`Cap<(Ambient, Ambient)>` implements `Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `Has<EnvRead>`
`Cap<(Ambient, EnvWrite)>` implements `Has<Ambient>`
`Cap<(Ambient, EnvWrite)>` implements `Has<EnvWrite>`
`Cap<(Ambient, FsAll)>` implements `Has<Ambient>`
`Cap<(Ambient, FsAll)>` implements `Has<FsAll>`
`Cap<(Ambient, FsRead)>` implements `Has<Ambient>`
and $N others
note: required by a bound in `capsec::fs::read_to_string`
--> $WORKSPACE/crates/capsec-std/src/fs.rs
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,14 +10,14 @@ help: the trait `capsec_core::permission::sealed::Sealed` is not implemented for
5 | struct MyPerm;
| ^^^^^^^^^^^^^
= help: the following other types implement trait `capsec_core::permission::sealed::Sealed`:
(A, B)
Ambient
EnvRead
EnvWrite
FsAll
FsRead
FsWrite
NetAll
NetBind
and $N others
note: required by a bound in `capsec::Permission`
--> $WORKSPACE/crates/capsec-core/src/permission.rs
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,14 @@ error[E0277]: the trait bound `Cap<capsec::FsRead>: capsec::Has<capsec::NetConne
| required by a bound introduced by this call
|
= help: the following other types implement trait `capsec::Has<P>`:
`Cap<Ambient>` implements `capsec::Has<EnvRead>`
`Cap<Ambient>` implements `capsec::Has<EnvWrite>`
`Cap<Ambient>` implements `capsec::Has<FsAll>`
`Cap<Ambient>` implements `capsec::Has<FsWrite>`
`Cap<Ambient>` implements `capsec::Has<NetAll>`
`Cap<Ambient>` implements `capsec::Has<NetBind>`
`Cap<Ambient>` implements `capsec::Has<Spawn>`
`Cap<Ambient>` implements `capsec::Has<capsec::FsRead>`
`Cap<(Ambient, Ambient)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `capsec::Has<EnvRead>`
`Cap<(Ambient, EnvWrite)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvWrite)>` implements `capsec::Has<EnvWrite>`
`Cap<(Ambient, FsAll)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, FsAll)>` implements `capsec::Has<FsAll>`
`Cap<(Ambient, FsWrite)>` implements `capsec::Has<Ambient>`
and $N others
note: required by a bound in `needs_net`
--> tests/compile_fail/sendcap_cannot_grant_wrong_perm.rs:5:23
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,14 @@ error[E0277]: the trait bound `Cap<capsec::FsRead>: capsec::Has<capsec::FsAll>`
| required by a bound introduced by this call
|
= help: the following other types implement trait `capsec::Has<P>`:
`Cap<Ambient>` implements `capsec::Has<EnvRead>`
`Cap<Ambient>` implements `capsec::Has<EnvWrite>`
`Cap<Ambient>` implements `capsec::Has<FsWrite>`
`Cap<Ambient>` implements `capsec::Has<NetAll>`
`Cap<Ambient>` implements `capsec::Has<NetBind>`
`Cap<Ambient>` implements `capsec::Has<NetConnect>`
`Cap<Ambient>` implements `capsec::Has<Spawn>`
`Cap<Ambient>` implements `capsec::Has<capsec::FsAll>`
`Cap<(Ambient, Ambient)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `capsec::Has<EnvRead>`
`Cap<(Ambient, EnvWrite)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvWrite)>` implements `capsec::Has<EnvWrite>`
`Cap<(Ambient, FsWrite)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, FsWrite)>` implements `capsec::Has<FsWrite>`
`Cap<(Ambient, NetAll)>` implements `capsec::Has<Ambient>`
and $N others
note: required by a bound in `needs_fs_all`
--> tests/compile_fail/subsumption_not_reversed.rs:5:26
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat: implement Has<A> + Has<B> for tuple Cap<(A, B)> via macro-generated concrete impls by bordumb · Pull Request #7 · auths-dev/capsec · GitHub
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
107 changes: 103 additions & 4 deletions crates/capsec-core/src/has.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,17 @@
//!
//! # Multiple capabilities
//!
//! For functions that need multiple permissions, use multiple parameters:
//! Bundle permissions in a single token with a tuple:
//!
//! ```rust,ignore
//! fn sync_data(cap: &(impl Has<FsRead> + Has<NetConnect>)) { ... }
//!
//! let root = test_root();
//! let cap = root.grant::<(FsRead, NetConnect)>();
//! sync_data(&cap);
//! ```
//!
//! Or use separate parameters:
//!
//! ```rust,ignore
//! fn sync_data(fs: &impl Has<FsRead>, net: &impl Has<NetConnect>) { ... }
Expand DownExpand Up@@ -49,15 +59,15 @@ pub trait Has<P: Permission> {
fn cap_ref(&self) -> Cap<P>;
}

// ── Direct: Cap<P> implements Has<P> ────────────────────────────
// Direct: Cap<P> implements Has<P>

impl<P: Permission> Has<P> for Cap<P> {
fn cap_ref(&self) -> Cap<P> {
Cap::new()
}
}

// ── Subsumption: FsAll, NetAll ──────────────────────────────────
// Subsumption: FsAll, NetAll

macro_rules! impl_subsumes {
($super:ty => $($sub:ty),+) => {
Expand All@@ -72,7 +82,7 @@ macro_rules! impl_subsumes {
impl_subsumes!(FsAll => FsRead, FsWrite);
impl_subsumes!(NetAll => NetConnect, NetBind);

// ── Ambient: satisfies everything ───────────────────────────────
// Ambient: satisfies everything

macro_rules! impl_ambient {
($($perm:ty),+) => {
Expand All@@ -88,6 +98,53 @@ impl_ambient!(
FsRead, FsWrite, FsAll, NetConnect, NetBind, NetAll, EnvRead, EnvWrite, Spawn
);

// Tuples: Cap<(A, B)> satisfies Has<A> and Has<B>
//
// Because Rust's coherence rules reject overlapping generic impls when A == B,
// we enumerate all concrete permission pairs via two macros.
//
// Macro 1: Has<first_element> for all (A, B) pairs including self-pairs (100 impls).
// Macro 2: Has<second_element> for distinct pairs only (90 impls).
//
// Total: 190 unique impls. No conflicts. No changes to the Has<P> trait signature.

macro_rules! impl_tuple_has_first {
([$($a:ident),+]; $all:tt) => {
$( impl_tuple_has_first!(@inner $a; $all); )+
};
(@inner $a:ident; [$($b:ident),+]) => {
$(
impl Has<$a> for Cap<($a, $b)> {
fn cap_ref(&self) -> Cap<$a> { Cap::new() }
}
)+
};
}

macro_rules! impl_tuple_has_second {
($first:ident $(, $rest:ident)+) => {
$(
impl Has<$first> for Cap<($rest, $first)> {
fn cap_ref(&self) -> Cap<$first> { Cap::new() }
}
impl Has<$rest> for Cap<($first, $rest)> {
fn cap_ref(&self) -> Cap<$rest> { Cap::new() }
}
)+
impl_tuple_has_second!($($rest),+);
};
($single:ident) => {};
}

impl_tuple_has_first!(
[FsRead, FsWrite, FsAll, NetConnect, NetBind, NetAll, EnvRead, EnvWrite, Spawn, Ambient];
[FsRead, FsWrite, FsAll, NetConnect, NetBind, NetAll, EnvRead, EnvWrite, Spawn, Ambient]
);

impl_tuple_has_second!(
FsRead, FsWrite, FsAll, NetConnect, NetBind, NetAll, EnvRead, EnvWrite, Spawn, Ambient
);

#[cfg(test)]
mod tests {
use super::*;
Expand DownExpand Up@@ -141,4 +198,46 @@ mod tests {
let net = root.grant::<NetConnect>();
sync_data(&fs, &net);
}

#[test]
fn tuple_cap_satisfies_both_has() {
let root = test_root();
let cap = root.grant::<(FsRead, NetConnect)>();
fn needs_fs(_: &impl Has<FsRead>) {}
fn needs_net(_: &impl Has<NetConnect>) {}
needs_fs(&cap);
needs_net(&cap);
}

#[test]
fn tuple_self_pair() {
let root = test_root();
let cap = root.grant::<(FsRead, FsRead)>();
fn needs_fs(_: &impl Has<FsRead>) {}
needs_fs(&cap);
}

#[test]
fn tuple_with_subsumption_type() {
let root = test_root();
let cap = root.grant::<(FsAll, NetConnect)>();
fn needs_fs_all(_: &impl Has<FsAll>) {}
fn needs_net(_: &impl Has<NetConnect>) {}
needs_fs_all(&cap);
needs_net(&cap);
}

#[test]
fn tuple_cap_ref_returns_correct_type() {
let root = test_root();
let cap = root.grant::<(FsRead, NetConnect)>();
let _fs: Cap<FsRead> = Has::<FsRead>::cap_ref(&cap);
let _net: Cap<NetConnect> = Has::<NetConnect>::cap_ref(&cap);
}

#[test]
fn tuple_is_zst() {
use std::mem::size_of;
assert_eq!(size_of::<Cap<(FsRead, NetConnect)>>(), 0);
}
}
33 changes: 25 additions & 8 deletions crates/capsec-core/src/permission.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,13 @@
//! | [`Spawn`] | Process | Execute subprocesses |
//! | [`Ambient`] | Everything | Full ambient authority — the "god token" |
//!
//! # Tuples
//!
//! Two permissions can be bundled via a tuple: `(FsRead, NetConnect)` is itself
//! a `Permission`, and `Cap<(FsRead, NetConnect)>` satisfies both `Has<FsRead>`
//! and `Has<NetConnect>`. All 2-tuple combinations of built-in permissions are
//! supported.
//!
//! # Subsumption
//!
//! Some permissions imply others. [`FsAll`] subsumes both [`FsRead`] and [`FsWrite`],
Expand All@@ -32,7 +39,7 @@
/// can be used as capability tokens — external crates cannot forge new permissions.
pub trait Permission: sealed::Sealed + 'static {}

// ── Filesystem ──────────────────────────────────────────────────
// Filesystem

/// Permission to read files, list directories, and check metadata.
pub struct FsRead;
Expand All@@ -43,7 +50,7 @@ pub struct FsWrite;
/// Permission for all filesystem operations. Subsumes [`FsRead`] and [`FsWrite`].
pub struct FsAll;

// ── Network ─────────────────────────────────────────────────────
// Network

/// Permission to open outbound TCP and UDP connections.
pub struct NetConnect;
Expand All@@ -54,28 +61,28 @@ pub struct NetBind;
/// Permission for all network operations. Subsumes [`NetConnect`] and [`NetBind`].
pub struct NetAll;

// ── Environment ─────────────────────────────────────────────────
// Environment

/// Permission to read environment variables.
pub struct EnvRead;

/// Permission to modify or remove environment variables.
pub struct EnvWrite;

// ── Process ─────────────────────────────────────────────────────
// Process

/// Permission to spawn and execute subprocesses via `std::process::Command`.
pub struct Spawn;

// ── Ambient ─────────────────────────────────────────────────────
// Ambient

/// Full ambient authority — grants every permission.
///
/// This is the "god token." A `Cap<Ambient>` satisfies any `Has<P>` bound.
/// Use sparingly and only at the capability root.
pub struct Ambient;

// ── Permission impls ────────────────────────────────────────────
// Permission impls

impl Permission for FsRead {}
impl Permission for FsWrite {}
Expand All@@ -88,7 +95,11 @@ impl Permission for EnvWrite {}
impl Permission for Spawn {}
impl Permission for Ambient {}

// ── Subsumption ─────────────────────────────────────────────────
// Tuple permissions

impl<A: Permission, B: Permission> Permission for (A, B) {}

// Subsumption

/// Indicates that `Self` implies permission `P`.
///
Expand All@@ -103,7 +114,7 @@ impl Subsumes<NetConnect> for NetAll {}
impl Subsumes<NetBind> for NetAll {}
impl<P: Permission> Subsumes<P> for Ambient {}

// ── Sealed ──────────────────────────────────────────────────────
// Sealed

mod sealed {
pub trait Sealed {}
Expand All@@ -117,6 +128,7 @@ mod sealed {
impl Sealed for super::EnvWrite {}
impl Sealed for super::Spawn {}
impl Sealed for super::Ambient {}
impl<A: Sealed, B: Sealed> Sealed for (A, B) {}
}

#[cfg(test)]
Expand All@@ -141,6 +153,11 @@ mod tests {
// Compile-time proof that subsumption relationships hold:
fn _assert_subsumes<Super: Subsumes<Sub>, Sub: Permission>() {}

#[test]
fn tuple_permission_is_zst() {
assert_eq!(size_of::<(FsRead, NetConnect)>(), 0);
}

#[test]
fn subsumption_relationships() {
_assert_subsumes::<FsAll, FsRead>();
Expand Down
4 changes: 4 additions & 0 deletions crates/capsec-core/src/root.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,8 +83,12 @@ impl CapRoot {
/// # use capsec_core::permission::{FsRead, NetConnect};
/// let root = test_root();
///
/// // Individual capabilities:
/// let fs_cap = root.grant::<FsRead>();
/// let net_cap = root.grant::<NetConnect>();
///
/// // Or bundle multiple permissions in one token:
/// let combo = root.grant::<(FsRead, NetConnect)>();
/// ```
pub fn grant<P: Permission>(&self) -> Cap<P> {
Cap::new()
Expand Down
6 changes: 3 additions & 3 deletions crates/capsec/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@
//! - **`capsec-macro`** — `#[requires]` and `#[deny]` proc macros
//! - **`capsec-std`** — capability-gated `std` wrappers

// ── Re-exports from capsec-core ─────────────────────────────────
// Re-exports from capsec-core

pub use capsec_core::cap::{Cap, SendCap};
pub use capsec_core::error::CapSecError;
Expand All@@ -44,11 +44,11 @@ pub use capsec_core::root::test_root;

pub use capsec_core::attenuate::{Attenuated, DirScope, HostScope, Scope};

// ── Re-exports from capsec-macro ────────────────────────────────
// Re-exports from capsec-macro

pub use capsec_macro::{deny, requires};

// ── Capability-gated std wrappers ───────────────────────────────
// Capability-gated std wrappers

/// Capability-gated filesystem operations. See [`capsec_std::fs`].
pub mod fs {
Expand Down
3 changes: 3 additions & 0 deletions crates/capsec/tests/compile_fail/cap_is_not_send.stderr
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ error[E0277]: `*const ()` cannot be sent between threads safely
= help: within `capsec::Cap<capsec::FsRead>`, the trait `Send` is not implemented for `*const ()`
note: required because it appears within the type `PhantomData<*const ()>`
--> $RUST/core/src/marker.rs
|
| pub struct PhantomData<T: PointeeSized>;
| ^^^^^^^^^^^
note: required because it appears within the type `capsec::Cap<capsec::FsRead>`
--> $WORKSPACE/crates/capsec-core/src/cap.rs
|
Expand Down
3 changes: 3 additions & 0 deletions crates/capsec/tests/compile_fail/cap_is_not_sync.stderr
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ error[E0277]: `*const ()` cannot be shared between threads safely
= help: within `capsec::Cap<capsec::FsRead>`, the trait `Sync` is not implemented for `*const ()`
note: required because it appears within the type `PhantomData<*const ()>`
--> $RUST/core/src/marker.rs
|
| pub struct PhantomData<T: PointeeSized>;
| ^^^^^^^^^^^
note: required because it appears within the type `capsec::Cap<capsec::FsRead>`
--> $WORKSPACE/crates/capsec-core/src/cap.rs
|
Expand Down
16 changes: 8 additions & 8 deletions crates/capsec/tests/compile_fail/capsec_std_wrong_cap.stderr
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,14 @@ error[E0277]: the trait bound `Cap<capsec::NetConnect>: Has<FsRead>` is not sati
| required by a bound introduced by this call
|
= help: the following other types implement trait `Has<P>`:
`Cap<Ambient>` implements `Has<EnvRead>`
`Cap<Ambient>` implements `Has<EnvWrite>`
`Cap<Ambient>` implements `Has<FsAll>`
`Cap<Ambient>` implements `Has<FsRead>`
`Cap<Ambient>` implements `Has<FsWrite>`
`Cap<Ambient>` implements `Has<NetAll>`
`Cap<Ambient>` implements `Has<NetBind>`
`Cap<Ambient>` implements `Has<Spawn>`
`Cap<(Ambient, Ambient)>` implements `Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `Has<EnvRead>`
`Cap<(Ambient, EnvWrite)>` implements `Has<Ambient>`
`Cap<(Ambient, EnvWrite)>` implements `Has<EnvWrite>`
`Cap<(Ambient, FsAll)>` implements `Has<Ambient>`
`Cap<(Ambient, FsAll)>` implements `Has<FsAll>`
`Cap<(Ambient, FsRead)>` implements `Has<Ambient>`
and $N others
note: required by a bound in `capsec::fs::read_to_string`
--> $WORKSPACE/crates/capsec-std/src/fs.rs
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,14 +10,14 @@ help: the trait `capsec_core::permission::sealed::Sealed` is not implemented for
5 | struct MyPerm;
| ^^^^^^^^^^^^^
= help: the following other types implement trait `capsec_core::permission::sealed::Sealed`:
(A, B)
Ambient
EnvRead
EnvWrite
FsAll
FsRead
FsWrite
NetAll
NetBind
and $N others
note: required by a bound in `capsec::Permission`
--> $WORKSPACE/crates/capsec-core/src/permission.rs
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,14 @@ error[E0277]: the trait bound `Cap<capsec::FsRead>: capsec::Has<capsec::NetConne
| required by a bound introduced by this call
|
= help: the following other types implement trait `capsec::Has<P>`:
`Cap<Ambient>` implements `capsec::Has<EnvRead>`
`Cap<Ambient>` implements `capsec::Has<EnvWrite>`
`Cap<Ambient>` implements `capsec::Has<FsAll>`
`Cap<Ambient>` implements `capsec::Has<FsWrite>`
`Cap<Ambient>` implements `capsec::Has<NetAll>`
`Cap<Ambient>` implements `capsec::Has<NetBind>`
`Cap<Ambient>` implements `capsec::Has<Spawn>`
`Cap<Ambient>` implements `capsec::Has<capsec::FsRead>`
`Cap<(Ambient, Ambient)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `capsec::Has<EnvRead>`
`Cap<(Ambient, EnvWrite)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvWrite)>` implements `capsec::Has<EnvWrite>`
`Cap<(Ambient, FsAll)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, FsAll)>` implements `capsec::Has<FsAll>`
`Cap<(Ambient, FsWrite)>` implements `capsec::Has<Ambient>`
and $N others
note: required by a bound in `needs_net`
--> tests/compile_fail/sendcap_cannot_grant_wrong_perm.rs:5:23
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,14 @@ error[E0277]: the trait bound `Cap<capsec::FsRead>: capsec::Has<capsec::FsAll>`
| required by a bound introduced by this call
|
= help: the following other types implement trait `capsec::Has<P>`:
`Cap<Ambient>` implements `capsec::Has<EnvRead>`
`Cap<Ambient>` implements `capsec::Has<EnvWrite>`
`Cap<Ambient>` implements `capsec::Has<FsWrite>`
`Cap<Ambient>` implements `capsec::Has<NetAll>`
`Cap<Ambient>` implements `capsec::Has<NetBind>`
`Cap<Ambient>` implements `capsec::Has<NetConnect>`
`Cap<Ambient>` implements `capsec::Has<Spawn>`
`Cap<Ambient>` implements `capsec::Has<capsec::FsAll>`
`Cap<(Ambient, Ambient)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `capsec::Has<EnvRead>`
`Cap<(Ambient, EnvWrite)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvWrite)>` implements `capsec::Has<EnvWrite>`
`Cap<(Ambient, FsWrite)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, FsWrite)>` implements `capsec::Has<FsWrite>`
`Cap<(Ambient, NetAll)>` implements `capsec::Has<Ambient>`
and $N others
note: required by a bound in `needs_fs_all`
--> tests/compile_fail/subsumption_not_reversed.rs:5:26
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' feat: implement Has<A> + Has<B> for tuple Cap<(A, B)> via macro-generated concrete impls by bordumb · Pull Request #7 · auths-dev/capsec · GitHub
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
107 changes: 103 additions & 4 deletions crates/capsec-core/src/has.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,17 @@
//!
//! # Multiple capabilities
//!
//! For functions that need multiple permissions, use multiple parameters:
//! Bundle permissions in a single token with a tuple:
//!
//! ```rust,ignore
//! fn sync_data(cap: &(impl Has<FsRead> + Has<NetConnect>)) { ... }
//!
//! let root = test_root();
//! let cap = root.grant::<(FsRead, NetConnect)>();
//! sync_data(&cap);
//! ```
//!
//! Or use separate parameters:
//!
//! ```rust,ignore
//! fn sync_data(fs: &impl Has<FsRead>, net: &impl Has<NetConnect>) { ... }
Expand DownExpand Up@@ -49,15 +59,15 @@ pub trait Has<P: Permission> {
fn cap_ref(&self) -> Cap<P>;
}

// ── Direct: Cap<P> implements Has<P> ────────────────────────────
// Direct: Cap<P> implements Has<P>

impl<P: Permission> Has<P> for Cap<P> {
fn cap_ref(&self) -> Cap<P> {
Cap::new()
}
}

// ── Subsumption: FsAll, NetAll ──────────────────────────────────
// Subsumption: FsAll, NetAll

macro_rules! impl_subsumes {
($super:ty => $($sub:ty),+) => {
Expand All@@ -72,7 +82,7 @@ macro_rules! impl_subsumes {
impl_subsumes!(FsAll => FsRead, FsWrite);
impl_subsumes!(NetAll => NetConnect, NetBind);

// ── Ambient: satisfies everything ───────────────────────────────
// Ambient: satisfies everything

macro_rules! impl_ambient {
($($perm:ty),+) => {
Expand All@@ -88,6 +98,53 @@ impl_ambient!(
FsRead, FsWrite, FsAll, NetConnect, NetBind, NetAll, EnvRead, EnvWrite, Spawn
);

// Tuples: Cap<(A, B)> satisfies Has<A> and Has<B>
//
// Because Rust's coherence rules reject overlapping generic impls when A == B,
// we enumerate all concrete permission pairs via two macros.
//
// Macro 1: Has<first_element> for all (A, B) pairs including self-pairs (100 impls).
// Macro 2: Has<second_element> for distinct pairs only (90 impls).
//
// Total: 190 unique impls. No conflicts. No changes to the Has<P> trait signature.

macro_rules! impl_tuple_has_first {
([$($a:ident),+]; $all:tt) => {
$( impl_tuple_has_first!(@inner $a; $all); )+
};
(@inner $a:ident; [$($b:ident),+]) => {
$(
impl Has<$a> for Cap<($a, $b)> {
fn cap_ref(&self) -> Cap<$a> { Cap::new() }
}
)+
};
}

macro_rules! impl_tuple_has_second {
($first:ident $(, $rest:ident)+) => {
$(
impl Has<$first> for Cap<($rest, $first)> {
fn cap_ref(&self) -> Cap<$first> { Cap::new() }
}
impl Has<$rest> for Cap<($first, $rest)> {
fn cap_ref(&self) -> Cap<$rest> { Cap::new() }
}
)+
impl_tuple_has_second!($($rest),+);
};
($single:ident) => {};
}

impl_tuple_has_first!(
[FsRead, FsWrite, FsAll, NetConnect, NetBind, NetAll, EnvRead, EnvWrite, Spawn, Ambient];
[FsRead, FsWrite, FsAll, NetConnect, NetBind, NetAll, EnvRead, EnvWrite, Spawn, Ambient]
);

impl_tuple_has_second!(
FsRead, FsWrite, FsAll, NetConnect, NetBind, NetAll, EnvRead, EnvWrite, Spawn, Ambient
);

#[cfg(test)]
mod tests {
use super::*;
Expand DownExpand Up@@ -141,4 +198,46 @@ mod tests {
let net = root.grant::<NetConnect>();
sync_data(&fs, &net);
}

#[test]
fn tuple_cap_satisfies_both_has() {
let root = test_root();
let cap = root.grant::<(FsRead, NetConnect)>();
fn needs_fs(_: &impl Has<FsRead>) {}
fn needs_net(_: &impl Has<NetConnect>) {}
needs_fs(&cap);
needs_net(&cap);
}

#[test]
fn tuple_self_pair() {
let root = test_root();
let cap = root.grant::<(FsRead, FsRead)>();
fn needs_fs(_: &impl Has<FsRead>) {}
needs_fs(&cap);
}

#[test]
fn tuple_with_subsumption_type() {
let root = test_root();
let cap = root.grant::<(FsAll, NetConnect)>();
fn needs_fs_all(_: &impl Has<FsAll>) {}
fn needs_net(_: &impl Has<NetConnect>) {}
needs_fs_all(&cap);
needs_net(&cap);
}

#[test]
fn tuple_cap_ref_returns_correct_type() {
let root = test_root();
let cap = root.grant::<(FsRead, NetConnect)>();
let _fs: Cap<FsRead> = Has::<FsRead>::cap_ref(&cap);
let _net: Cap<NetConnect> = Has::<NetConnect>::cap_ref(&cap);
}

#[test]
fn tuple_is_zst() {
use std::mem::size_of;
assert_eq!(size_of::<Cap<(FsRead, NetConnect)>>(), 0);
}
}
33 changes: 25 additions & 8 deletions crates/capsec-core/src/permission.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,13 @@
//! | [`Spawn`] | Process | Execute subprocesses |
//! | [`Ambient`] | Everything | Full ambient authority — the "god token" |
//!
//! # Tuples
//!
//! Two permissions can be bundled via a tuple: `(FsRead, NetConnect)` is itself
//! a `Permission`, and `Cap<(FsRead, NetConnect)>` satisfies both `Has<FsRead>`
//! and `Has<NetConnect>`. All 2-tuple combinations of built-in permissions are
//! supported.
//!
//! # Subsumption
//!
//! Some permissions imply others. [`FsAll`] subsumes both [`FsRead`] and [`FsWrite`],
Expand All@@ -32,7 +39,7 @@
/// can be used as capability tokens — external crates cannot forge new permissions.
pub trait Permission: sealed::Sealed + 'static {}

// ── Filesystem ──────────────────────────────────────────────────
// Filesystem

/// Permission to read files, list directories, and check metadata.
pub struct FsRead;
Expand All@@ -43,7 +50,7 @@ pub struct FsWrite;
/// Permission for all filesystem operations. Subsumes [`FsRead`] and [`FsWrite`].
pub struct FsAll;

// ── Network ─────────────────────────────────────────────────────
// Network

/// Permission to open outbound TCP and UDP connections.
pub struct NetConnect;
Expand All@@ -54,28 +61,28 @@ pub struct NetBind;
/// Permission for all network operations. Subsumes [`NetConnect`] and [`NetBind`].
pub struct NetAll;

// ── Environment ─────────────────────────────────────────────────
// Environment

/// Permission to read environment variables.
pub struct EnvRead;

/// Permission to modify or remove environment variables.
pub struct EnvWrite;

// ── Process ─────────────────────────────────────────────────────
// Process

/// Permission to spawn and execute subprocesses via `std::process::Command`.
pub struct Spawn;

// ── Ambient ─────────────────────────────────────────────────────
// Ambient

/// Full ambient authority — grants every permission.
///
/// This is the "god token." A `Cap<Ambient>` satisfies any `Has<P>` bound.
/// Use sparingly and only at the capability root.
pub struct Ambient;

// ── Permission impls ────────────────────────────────────────────
// Permission impls

impl Permission for FsRead {}
impl Permission for FsWrite {}
Expand All@@ -88,7 +95,11 @@ impl Permission for EnvWrite {}
impl Permission for Spawn {}
impl Permission for Ambient {}

// ── Subsumption ─────────────────────────────────────────────────
// Tuple permissions

impl<A: Permission, B: Permission> Permission for (A, B) {}

// Subsumption

/// Indicates that `Self` implies permission `P`.
///
Expand All@@ -103,7 +114,7 @@ impl Subsumes<NetConnect> for NetAll {}
impl Subsumes<NetBind> for NetAll {}
impl<P: Permission> Subsumes<P> for Ambient {}

// ── Sealed ──────────────────────────────────────────────────────
// Sealed

mod sealed {
pub trait Sealed {}
Expand All@@ -117,6 +128,7 @@ mod sealed {
impl Sealed for super::EnvWrite {}
impl Sealed for super::Spawn {}
impl Sealed for super::Ambient {}
impl<A: Sealed, B: Sealed> Sealed for (A, B) {}
}

#[cfg(test)]
Expand All@@ -141,6 +153,11 @@ mod tests {
// Compile-time proof that subsumption relationships hold:
fn _assert_subsumes<Super: Subsumes<Sub>, Sub: Permission>() {}

#[test]
fn tuple_permission_is_zst() {
assert_eq!(size_of::<(FsRead, NetConnect)>(), 0);
}

#[test]
fn subsumption_relationships() {
_assert_subsumes::<FsAll, FsRead>();
Expand Down
4 changes: 4 additions & 0 deletions crates/capsec-core/src/root.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,8 +83,12 @@ impl CapRoot {
/// # use capsec_core::permission::{FsRead, NetConnect};
/// let root = test_root();
///
/// // Individual capabilities:
/// let fs_cap = root.grant::<FsRead>();
/// let net_cap = root.grant::<NetConnect>();
///
/// // Or bundle multiple permissions in one token:
/// let combo = root.grant::<(FsRead, NetConnect)>();
/// ```
pub fn grant<P: Permission>(&self) -> Cap<P> {
Cap::new()
Expand Down
6 changes: 3 additions & 3 deletions crates/capsec/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@
//! - **`capsec-macro`** — `#[requires]` and `#[deny]` proc macros
//! - **`capsec-std`** — capability-gated `std` wrappers

// ── Re-exports from capsec-core ─────────────────────────────────
// Re-exports from capsec-core

pub use capsec_core::cap::{Cap, SendCap};
pub use capsec_core::error::CapSecError;
Expand All@@ -44,11 +44,11 @@ pub use capsec_core::root::test_root;

pub use capsec_core::attenuate::{Attenuated, DirScope, HostScope, Scope};

// ── Re-exports from capsec-macro ────────────────────────────────
// Re-exports from capsec-macro

pub use capsec_macro::{deny, requires};

// ── Capability-gated std wrappers ───────────────────────────────
// Capability-gated std wrappers

/// Capability-gated filesystem operations. See [`capsec_std::fs`].
pub mod fs {
Expand Down
3 changes: 3 additions & 0 deletions crates/capsec/tests/compile_fail/cap_is_not_send.stderr
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ error[E0277]: `*const ()` cannot be sent between threads safely
= help: within `capsec::Cap<capsec::FsRead>`, the trait `Send` is not implemented for `*const ()`
note: required because it appears within the type `PhantomData<*const ()>`
--> $RUST/core/src/marker.rs
|
| pub struct PhantomData<T: PointeeSized>;
| ^^^^^^^^^^^
note: required because it appears within the type `capsec::Cap<capsec::FsRead>`
--> $WORKSPACE/crates/capsec-core/src/cap.rs
|
Expand Down
3 changes: 3 additions & 0 deletions crates/capsec/tests/compile_fail/cap_is_not_sync.stderr
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ error[E0277]: `*const ()` cannot be shared between threads safely
= help: within `capsec::Cap<capsec::FsRead>`, the trait `Sync` is not implemented for `*const ()`
note: required because it appears within the type `PhantomData<*const ()>`
--> $RUST/core/src/marker.rs
|
| pub struct PhantomData<T: PointeeSized>;
| ^^^^^^^^^^^
note: required because it appears within the type `capsec::Cap<capsec::FsRead>`
--> $WORKSPACE/crates/capsec-core/src/cap.rs
|
Expand Down
16 changes: 8 additions & 8 deletions crates/capsec/tests/compile_fail/capsec_std_wrong_cap.stderr
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,14 @@ error[E0277]: the trait bound `Cap<capsec::NetConnect>: Has<FsRead>` is not sati
| required by a bound introduced by this call
|
= help: the following other types implement trait `Has<P>`:
`Cap<Ambient>` implements `Has<EnvRead>`
`Cap<Ambient>` implements `Has<EnvWrite>`
`Cap<Ambient>` implements `Has<FsAll>`
`Cap<Ambient>` implements `Has<FsRead>`
`Cap<Ambient>` implements `Has<FsWrite>`
`Cap<Ambient>` implements `Has<NetAll>`
`Cap<Ambient>` implements `Has<NetBind>`
`Cap<Ambient>` implements `Has<Spawn>`
`Cap<(Ambient, Ambient)>` implements `Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `Has<EnvRead>`
`Cap<(Ambient, EnvWrite)>` implements `Has<Ambient>`
`Cap<(Ambient, EnvWrite)>` implements `Has<EnvWrite>`
`Cap<(Ambient, FsAll)>` implements `Has<Ambient>`
`Cap<(Ambient, FsAll)>` implements `Has<FsAll>`
`Cap<(Ambient, FsRead)>` implements `Has<Ambient>`
and $N others
note: required by a bound in `capsec::fs::read_to_string`
--> $WORKSPACE/crates/capsec-std/src/fs.rs
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,14 +10,14 @@ help: the trait `capsec_core::permission::sealed::Sealed` is not implemented for
5 | struct MyPerm;
| ^^^^^^^^^^^^^
= help: the following other types implement trait `capsec_core::permission::sealed::Sealed`:
(A, B)
Ambient
EnvRead
EnvWrite
FsAll
FsRead
FsWrite
NetAll
NetBind
and $N others
note: required by a bound in `capsec::Permission`
--> $WORKSPACE/crates/capsec-core/src/permission.rs
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,14 @@ error[E0277]: the trait bound `Cap<capsec::FsRead>: capsec::Has<capsec::NetConne
| required by a bound introduced by this call
|
= help: the following other types implement trait `capsec::Has<P>`:
`Cap<Ambient>` implements `capsec::Has<EnvRead>`
`Cap<Ambient>` implements `capsec::Has<EnvWrite>`
`Cap<Ambient>` implements `capsec::Has<FsAll>`
`Cap<Ambient>` implements `capsec::Has<FsWrite>`
`Cap<Ambient>` implements `capsec::Has<NetAll>`
`Cap<Ambient>` implements `capsec::Has<NetBind>`
`Cap<Ambient>` implements `capsec::Has<Spawn>`
`Cap<Ambient>` implements `capsec::Has<capsec::FsRead>`
`Cap<(Ambient, Ambient)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `capsec::Has<EnvRead>`
`Cap<(Ambient, EnvWrite)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvWrite)>` implements `capsec::Has<EnvWrite>`
`Cap<(Ambient, FsAll)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, FsAll)>` implements `capsec::Has<FsAll>`
`Cap<(Ambient, FsWrite)>` implements `capsec::Has<Ambient>`
and $N others
note: required by a bound in `needs_net`
--> tests/compile_fail/sendcap_cannot_grant_wrong_perm.rs:5:23
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,14 @@ error[E0277]: the trait bound `Cap<capsec::FsRead>: capsec::Has<capsec::FsAll>`
| required by a bound introduced by this call
|
= help: the following other types implement trait `capsec::Has<P>`:
`Cap<Ambient>` implements `capsec::Has<EnvRead>`
`Cap<Ambient>` implements `capsec::Has<EnvWrite>`
`Cap<Ambient>` implements `capsec::Has<FsWrite>`
`Cap<Ambient>` implements `capsec::Has<NetAll>`
`Cap<Ambient>` implements `capsec::Has<NetBind>`
`Cap<Ambient>` implements `capsec::Has<NetConnect>`
`Cap<Ambient>` implements `capsec::Has<Spawn>`
`Cap<Ambient>` implements `capsec::Has<capsec::FsAll>`
`Cap<(Ambient, Ambient)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `capsec::Has<EnvRead>`
`Cap<(Ambient, EnvWrite)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvWrite)>` implements `capsec::Has<EnvWrite>`
`Cap<(Ambient, FsWrite)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, FsWrite)>` implements `capsec::Has<FsWrite>`
`Cap<(Ambient, NetAll)>` implements `capsec::Has<Ambient>`
and $N others
note: required by a bound in `needs_fs_all`
--> tests/compile_fail/subsumption_not_reversed.rs:5:26
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat: implement Has<A> + Has<B> for tuple Cap<(A, B)> via macro-generated concrete impls by bordumb · Pull Request #7 · auths-dev/capsec · GitHub
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
107 changes: 103 additions & 4 deletions crates/capsec-core/src/has.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,17 @@
//!
//! # Multiple capabilities
//!
//! For functions that need multiple permissions, use multiple parameters:
//! Bundle permissions in a single token with a tuple:
//!
//! ```rust,ignore
//! fn sync_data(cap: &(impl Has<FsRead> + Has<NetConnect>)) { ... }
//!
//! let root = test_root();
//! let cap = root.grant::<(FsRead, NetConnect)>();
//! sync_data(&cap);
//! ```
//!
//! Or use separate parameters:
//!
//! ```rust,ignore
//! fn sync_data(fs: &impl Has<FsRead>, net: &impl Has<NetConnect>) { ... }
Expand DownExpand Up@@ -49,15 +59,15 @@ pub trait Has<P: Permission> {
fn cap_ref(&self) -> Cap<P>;
}

// ── Direct: Cap<P> implements Has<P> ────────────────────────────
// Direct: Cap<P> implements Has<P>

impl<P: Permission> Has<P> for Cap<P> {
fn cap_ref(&self) -> Cap<P> {
Cap::new()
}
}

// ── Subsumption: FsAll, NetAll ──────────────────────────────────
// Subsumption: FsAll, NetAll

macro_rules! impl_subsumes {
($super:ty => $($sub:ty),+) => {
Expand All@@ -72,7 +82,7 @@ macro_rules! impl_subsumes {
impl_subsumes!(FsAll => FsRead, FsWrite);
impl_subsumes!(NetAll => NetConnect, NetBind);

// ── Ambient: satisfies everything ───────────────────────────────
// Ambient: satisfies everything

macro_rules! impl_ambient {
($($perm:ty),+) => {
Expand All@@ -88,6 +98,53 @@ impl_ambient!(
FsRead, FsWrite, FsAll, NetConnect, NetBind, NetAll, EnvRead, EnvWrite, Spawn
);

// Tuples: Cap<(A, B)> satisfies Has<A> and Has<B>
//
// Because Rust's coherence rules reject overlapping generic impls when A == B,
// we enumerate all concrete permission pairs via two macros.
//
// Macro 1: Has<first_element> for all (A, B) pairs including self-pairs (100 impls).
// Macro 2: Has<second_element> for distinct pairs only (90 impls).
//
// Total: 190 unique impls. No conflicts. No changes to the Has<P> trait signature.

macro_rules! impl_tuple_has_first {
([$($a:ident),+]; $all:tt) => {
$( impl_tuple_has_first!(@inner $a; $all); )+
};
(@inner $a:ident; [$($b:ident),+]) => {
$(
impl Has<$a> for Cap<($a, $b)> {
fn cap_ref(&self) -> Cap<$a> { Cap::new() }
}
)+
};
}

macro_rules! impl_tuple_has_second {
($first:ident $(, $rest:ident)+) => {
$(
impl Has<$first> for Cap<($rest, $first)> {
fn cap_ref(&self) -> Cap<$first> { Cap::new() }
}
impl Has<$rest> for Cap<($first, $rest)> {
fn cap_ref(&self) -> Cap<$rest> { Cap::new() }
}
)+
impl_tuple_has_second!($($rest),+);
};
($single:ident) => {};
}

impl_tuple_has_first!(
[FsRead, FsWrite, FsAll, NetConnect, NetBind, NetAll, EnvRead, EnvWrite, Spawn, Ambient];
[FsRead, FsWrite, FsAll, NetConnect, NetBind, NetAll, EnvRead, EnvWrite, Spawn, Ambient]
);

impl_tuple_has_second!(
FsRead, FsWrite, FsAll, NetConnect, NetBind, NetAll, EnvRead, EnvWrite, Spawn, Ambient
);

#[cfg(test)]
mod tests {
use super::*;
Expand DownExpand Up@@ -141,4 +198,46 @@ mod tests {
let net = root.grant::<NetConnect>();
sync_data(&fs, &net);
}

#[test]
fn tuple_cap_satisfies_both_has() {
let root = test_root();
let cap = root.grant::<(FsRead, NetConnect)>();
fn needs_fs(_: &impl Has<FsRead>) {}
fn needs_net(_: &impl Has<NetConnect>) {}
needs_fs(&cap);
needs_net(&cap);
}

#[test]
fn tuple_self_pair() {
let root = test_root();
let cap = root.grant::<(FsRead, FsRead)>();
fn needs_fs(_: &impl Has<FsRead>) {}
needs_fs(&cap);
}

#[test]
fn tuple_with_subsumption_type() {
let root = test_root();
let cap = root.grant::<(FsAll, NetConnect)>();
fn needs_fs_all(_: &impl Has<FsAll>) {}
fn needs_net(_: &impl Has<NetConnect>) {}
needs_fs_all(&cap);
needs_net(&cap);
}

#[test]
fn tuple_cap_ref_returns_correct_type() {
let root = test_root();
let cap = root.grant::<(FsRead, NetConnect)>();
let _fs: Cap<FsRead> = Has::<FsRead>::cap_ref(&cap);
let _net: Cap<NetConnect> = Has::<NetConnect>::cap_ref(&cap);
}

#[test]
fn tuple_is_zst() {
use std::mem::size_of;
assert_eq!(size_of::<Cap<(FsRead, NetConnect)>>(), 0);
}
}
33 changes: 25 additions & 8 deletions crates/capsec-core/src/permission.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,13 @@
//! | [`Spawn`] | Process | Execute subprocesses |
//! | [`Ambient`] | Everything | Full ambient authority — the "god token" |
//!
//! # Tuples
//!
//! Two permissions can be bundled via a tuple: `(FsRead, NetConnect)` is itself
//! a `Permission`, and `Cap<(FsRead, NetConnect)>` satisfies both `Has<FsRead>`
//! and `Has<NetConnect>`. All 2-tuple combinations of built-in permissions are
//! supported.
//!
//! # Subsumption
//!
//! Some permissions imply others. [`FsAll`] subsumes both [`FsRead`] and [`FsWrite`],
Expand All@@ -32,7 +39,7 @@
/// can be used as capability tokens — external crates cannot forge new permissions.
pub trait Permission: sealed::Sealed + 'static {}

// ── Filesystem ──────────────────────────────────────────────────
// Filesystem

/// Permission to read files, list directories, and check metadata.
pub struct FsRead;
Expand All@@ -43,7 +50,7 @@ pub struct FsWrite;
/// Permission for all filesystem operations. Subsumes [`FsRead`] and [`FsWrite`].
pub struct FsAll;

// ── Network ─────────────────────────────────────────────────────
// Network

/// Permission to open outbound TCP and UDP connections.
pub struct NetConnect;
Expand All@@ -54,28 +61,28 @@ pub struct NetBind;
/// Permission for all network operations. Subsumes [`NetConnect`] and [`NetBind`].
pub struct NetAll;

// ── Environment ─────────────────────────────────────────────────
// Environment

/// Permission to read environment variables.
pub struct EnvRead;

/// Permission to modify or remove environment variables.
pub struct EnvWrite;

// ── Process ─────────────────────────────────────────────────────
// Process

/// Permission to spawn and execute subprocesses via `std::process::Command`.
pub struct Spawn;

// ── Ambient ─────────────────────────────────────────────────────
// Ambient

/// Full ambient authority — grants every permission.
///
/// This is the "god token." A `Cap<Ambient>` satisfies any `Has<P>` bound.
/// Use sparingly and only at the capability root.
pub struct Ambient;

// ── Permission impls ────────────────────────────────────────────
// Permission impls

impl Permission for FsRead {}
impl Permission for FsWrite {}
Expand All@@ -88,7 +95,11 @@ impl Permission for EnvWrite {}
impl Permission for Spawn {}
impl Permission for Ambient {}

// ── Subsumption ─────────────────────────────────────────────────
// Tuple permissions

impl<A: Permission, B: Permission> Permission for (A, B) {}

// Subsumption

/// Indicates that `Self` implies permission `P`.
///
Expand All@@ -103,7 +114,7 @@ impl Subsumes<NetConnect> for NetAll {}
impl Subsumes<NetBind> for NetAll {}
impl<P: Permission> Subsumes<P> for Ambient {}

// ── Sealed ──────────────────────────────────────────────────────
// Sealed

mod sealed {
pub trait Sealed {}
Expand All@@ -117,6 +128,7 @@ mod sealed {
impl Sealed for super::EnvWrite {}
impl Sealed for super::Spawn {}
impl Sealed for super::Ambient {}
impl<A: Sealed, B: Sealed> Sealed for (A, B) {}
}

#[cfg(test)]
Expand All@@ -141,6 +153,11 @@ mod tests {
// Compile-time proof that subsumption relationships hold:
fn _assert_subsumes<Super: Subsumes<Sub>, Sub: Permission>() {}

#[test]
fn tuple_permission_is_zst() {
assert_eq!(size_of::<(FsRead, NetConnect)>(), 0);
}

#[test]
fn subsumption_relationships() {
_assert_subsumes::<FsAll, FsRead>();
Expand Down
4 changes: 4 additions & 0 deletions crates/capsec-core/src/root.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,8 +83,12 @@ impl CapRoot {
/// # use capsec_core::permission::{FsRead, NetConnect};
/// let root = test_root();
///
/// // Individual capabilities:
/// let fs_cap = root.grant::<FsRead>();
/// let net_cap = root.grant::<NetConnect>();
///
/// // Or bundle multiple permissions in one token:
/// let combo = root.grant::<(FsRead, NetConnect)>();
/// ```
pub fn grant<P: Permission>(&self) -> Cap<P> {
Cap::new()
Expand Down
6 changes: 3 additions & 3 deletions crates/capsec/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@
//! - **`capsec-macro`** — `#[requires]` and `#[deny]` proc macros
//! - **`capsec-std`** — capability-gated `std` wrappers

// ── Re-exports from capsec-core ─────────────────────────────────
// Re-exports from capsec-core

pub use capsec_core::cap::{Cap, SendCap};
pub use capsec_core::error::CapSecError;
Expand All@@ -44,11 +44,11 @@ pub use capsec_core::root::test_root;

pub use capsec_core::attenuate::{Attenuated, DirScope, HostScope, Scope};

// ── Re-exports from capsec-macro ────────────────────────────────
// Re-exports from capsec-macro

pub use capsec_macro::{deny, requires};

// ── Capability-gated std wrappers ───────────────────────────────
// Capability-gated std wrappers

/// Capability-gated filesystem operations. See [`capsec_std::fs`].
pub mod fs {
Expand Down
3 changes: 3 additions & 0 deletions crates/capsec/tests/compile_fail/cap_is_not_send.stderr
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ error[E0277]: `*const ()` cannot be sent between threads safely
= help: within `capsec::Cap<capsec::FsRead>`, the trait `Send` is not implemented for `*const ()`
note: required because it appears within the type `PhantomData<*const ()>`
--> $RUST/core/src/marker.rs
|
| pub struct PhantomData<T: PointeeSized>;
| ^^^^^^^^^^^
note: required because it appears within the type `capsec::Cap<capsec::FsRead>`
--> $WORKSPACE/crates/capsec-core/src/cap.rs
|
Expand Down
3 changes: 3 additions & 0 deletions crates/capsec/tests/compile_fail/cap_is_not_sync.stderr
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ error[E0277]: `*const ()` cannot be shared between threads safely
= help: within `capsec::Cap<capsec::FsRead>`, the trait `Sync` is not implemented for `*const ()`
note: required because it appears within the type `PhantomData<*const ()>`
--> $RUST/core/src/marker.rs
|
| pub struct PhantomData<T: PointeeSized>;
| ^^^^^^^^^^^
note: required because it appears within the type `capsec::Cap<capsec::FsRead>`
--> $WORKSPACE/crates/capsec-core/src/cap.rs
|
Expand Down
16 changes: 8 additions & 8 deletions crates/capsec/tests/compile_fail/capsec_std_wrong_cap.stderr
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,14 @@ error[E0277]: the trait bound `Cap<capsec::NetConnect>: Has<FsRead>` is not sati
| required by a bound introduced by this call
|
= help: the following other types implement trait `Has<P>`:
`Cap<Ambient>` implements `Has<EnvRead>`
`Cap<Ambient>` implements `Has<EnvWrite>`
`Cap<Ambient>` implements `Has<FsAll>`
`Cap<Ambient>` implements `Has<FsRead>`
`Cap<Ambient>` implements `Has<FsWrite>`
`Cap<Ambient>` implements `Has<NetAll>`
`Cap<Ambient>` implements `Has<NetBind>`
`Cap<Ambient>` implements `Has<Spawn>`
`Cap<(Ambient, Ambient)>` implements `Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `Has<EnvRead>`
`Cap<(Ambient, EnvWrite)>` implements `Has<Ambient>`
`Cap<(Ambient, EnvWrite)>` implements `Has<EnvWrite>`
`Cap<(Ambient, FsAll)>` implements `Has<Ambient>`
`Cap<(Ambient, FsAll)>` implements `Has<FsAll>`
`Cap<(Ambient, FsRead)>` implements `Has<Ambient>`
and $N others
note: required by a bound in `capsec::fs::read_to_string`
--> $WORKSPACE/crates/capsec-std/src/fs.rs
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,14 +10,14 @@ help: the trait `capsec_core::permission::sealed::Sealed` is not implemented for
5 | struct MyPerm;
| ^^^^^^^^^^^^^
= help: the following other types implement trait `capsec_core::permission::sealed::Sealed`:
(A, B)
Ambient
EnvRead
EnvWrite
FsAll
FsRead
FsWrite
NetAll
NetBind
and $N others
note: required by a bound in `capsec::Permission`
--> $WORKSPACE/crates/capsec-core/src/permission.rs
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,14 @@ error[E0277]: the trait bound `Cap<capsec::FsRead>: capsec::Has<capsec::NetConne
| required by a bound introduced by this call
|
= help: the following other types implement trait `capsec::Has<P>`:
`Cap<Ambient>` implements `capsec::Has<EnvRead>`
`Cap<Ambient>` implements `capsec::Has<EnvWrite>`
`Cap<Ambient>` implements `capsec::Has<FsAll>`
`Cap<Ambient>` implements `capsec::Has<FsWrite>`
`Cap<Ambient>` implements `capsec::Has<NetAll>`
`Cap<Ambient>` implements `capsec::Has<NetBind>`
`Cap<Ambient>` implements `capsec::Has<Spawn>`
`Cap<Ambient>` implements `capsec::Has<capsec::FsRead>`
`Cap<(Ambient, Ambient)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `capsec::Has<EnvRead>`
`Cap<(Ambient, EnvWrite)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvWrite)>` implements `capsec::Has<EnvWrite>`
`Cap<(Ambient, FsAll)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, FsAll)>` implements `capsec::Has<FsAll>`
`Cap<(Ambient, FsWrite)>` implements `capsec::Has<Ambient>`
and $N others
note: required by a bound in `needs_net`
--> tests/compile_fail/sendcap_cannot_grant_wrong_perm.rs:5:23
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,14 @@ error[E0277]: the trait bound `Cap<capsec::FsRead>: capsec::Has<capsec::FsAll>`
| required by a bound introduced by this call
|
= help: the following other types implement trait `capsec::Has<P>`:
`Cap<Ambient>` implements `capsec::Has<EnvRead>`
`Cap<Ambient>` implements `capsec::Has<EnvWrite>`
`Cap<Ambient>` implements `capsec::Has<FsWrite>`
`Cap<Ambient>` implements `capsec::Has<NetAll>`
`Cap<Ambient>` implements `capsec::Has<NetBind>`
`Cap<Ambient>` implements `capsec::Has<NetConnect>`
`Cap<Ambient>` implements `capsec::Has<Spawn>`
`Cap<Ambient>` implements `capsec::Has<capsec::FsAll>`
`Cap<(Ambient, Ambient)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `capsec::Has<EnvRead>`
`Cap<(Ambient, EnvWrite)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvWrite)>` implements `capsec::Has<EnvWrite>`
`Cap<(Ambient, FsWrite)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, FsWrite)>` implements `capsec::Has<FsWrite>`
`Cap<(Ambient, NetAll)>` implements `capsec::Has<Ambient>`
and $N others
note: required by a bound in `needs_fs_all`
--> tests/compile_fail/subsumption_not_reversed.rs:5:26
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat: implement Has<A> + Has<B> for tuple Cap<(A, B)> via macro-generated concrete impls by bordumb · Pull Request #7 · auths-dev/capsec · GitHub
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
107 changes: 103 additions & 4 deletions crates/capsec-core/src/has.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,17 @@
//!
//! # Multiple capabilities
//!
//! For functions that need multiple permissions, use multiple parameters:
//! Bundle permissions in a single token with a tuple:
//!
//! ```rust,ignore
//! fn sync_data(cap: &(impl Has<FsRead> + Has<NetConnect>)) { ... }
//!
//! let root = test_root();
//! let cap = root.grant::<(FsRead, NetConnect)>();
//! sync_data(&cap);
//! ```
//!
//! Or use separate parameters:
//!
//! ```rust,ignore
//! fn sync_data(fs: &impl Has<FsRead>, net: &impl Has<NetConnect>) { ... }
Expand DownExpand Up@@ -49,15 +59,15 @@ pub trait Has<P: Permission> {
fn cap_ref(&self) -> Cap<P>;
}

// ── Direct: Cap<P> implements Has<P> ────────────────────────────
// Direct: Cap<P> implements Has<P>

impl<P: Permission> Has<P> for Cap<P> {
fn cap_ref(&self) -> Cap<P> {
Cap::new()
}
}

// ── Subsumption: FsAll, NetAll ──────────────────────────────────
// Subsumption: FsAll, NetAll

macro_rules! impl_subsumes {
($super:ty => $($sub:ty),+) => {
Expand All@@ -72,7 +82,7 @@ macro_rules! impl_subsumes {
impl_subsumes!(FsAll => FsRead, FsWrite);
impl_subsumes!(NetAll => NetConnect, NetBind);

// ── Ambient: satisfies everything ───────────────────────────────
// Ambient: satisfies everything

macro_rules! impl_ambient {
($($perm:ty),+) => {
Expand All@@ -88,6 +98,53 @@ impl_ambient!(
FsRead, FsWrite, FsAll, NetConnect, NetBind, NetAll, EnvRead, EnvWrite, Spawn
);

// Tuples: Cap<(A, B)> satisfies Has<A> and Has<B>
//
// Because Rust's coherence rules reject overlapping generic impls when A == B,
// we enumerate all concrete permission pairs via two macros.
//
// Macro 1: Has<first_element> for all (A, B) pairs including self-pairs (100 impls).
// Macro 2: Has<second_element> for distinct pairs only (90 impls).
//
// Total: 190 unique impls. No conflicts. No changes to the Has<P> trait signature.

macro_rules! impl_tuple_has_first {
([$($a:ident),+]; $all:tt) => {
$( impl_tuple_has_first!(@inner $a; $all); )+
};
(@inner $a:ident; [$($b:ident),+]) => {
$(
impl Has<$a> for Cap<($a, $b)> {
fn cap_ref(&self) -> Cap<$a> { Cap::new() }
}
)+
};
}

macro_rules! impl_tuple_has_second {
($first:ident $(, $rest:ident)+) => {
$(
impl Has<$first> for Cap<($rest, $first)> {
fn cap_ref(&self) -> Cap<$first> { Cap::new() }
}
impl Has<$rest> for Cap<($first, $rest)> {
fn cap_ref(&self) -> Cap<$rest> { Cap::new() }
}
)+
impl_tuple_has_second!($($rest),+);
};
($single:ident) => {};
}

impl_tuple_has_first!(
[FsRead, FsWrite, FsAll, NetConnect, NetBind, NetAll, EnvRead, EnvWrite, Spawn, Ambient];
[FsRead, FsWrite, FsAll, NetConnect, NetBind, NetAll, EnvRead, EnvWrite, Spawn, Ambient]
);

impl_tuple_has_second!(
FsRead, FsWrite, FsAll, NetConnect, NetBind, NetAll, EnvRead, EnvWrite, Spawn, Ambient
);

#[cfg(test)]
mod tests {
use super::*;
Expand DownExpand Up@@ -141,4 +198,46 @@ mod tests {
let net = root.grant::<NetConnect>();
sync_data(&fs, &net);
}

#[test]
fn tuple_cap_satisfies_both_has() {
let root = test_root();
let cap = root.grant::<(FsRead, NetConnect)>();
fn needs_fs(_: &impl Has<FsRead>) {}
fn needs_net(_: &impl Has<NetConnect>) {}
needs_fs(&cap);
needs_net(&cap);
}

#[test]
fn tuple_self_pair() {
let root = test_root();
let cap = root.grant::<(FsRead, FsRead)>();
fn needs_fs(_: &impl Has<FsRead>) {}
needs_fs(&cap);
}

#[test]
fn tuple_with_subsumption_type() {
let root = test_root();
let cap = root.grant::<(FsAll, NetConnect)>();
fn needs_fs_all(_: &impl Has<FsAll>) {}
fn needs_net(_: &impl Has<NetConnect>) {}
needs_fs_all(&cap);
needs_net(&cap);
}

#[test]
fn tuple_cap_ref_returns_correct_type() {
let root = test_root();
let cap = root.grant::<(FsRead, NetConnect)>();
let _fs: Cap<FsRead> = Has::<FsRead>::cap_ref(&cap);
let _net: Cap<NetConnect> = Has::<NetConnect>::cap_ref(&cap);
}

#[test]
fn tuple_is_zst() {
use std::mem::size_of;
assert_eq!(size_of::<Cap<(FsRead, NetConnect)>>(), 0);
}
}
33 changes: 25 additions & 8 deletions crates/capsec-core/src/permission.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,13 @@
//! | [`Spawn`] | Process | Execute subprocesses |
//! | [`Ambient`] | Everything | Full ambient authority — the "god token" |
//!
//! # Tuples
//!
//! Two permissions can be bundled via a tuple: `(FsRead, NetConnect)` is itself
//! a `Permission`, and `Cap<(FsRead, NetConnect)>` satisfies both `Has<FsRead>`
//! and `Has<NetConnect>`. All 2-tuple combinations of built-in permissions are
//! supported.
//!
//! # Subsumption
//!
//! Some permissions imply others. [`FsAll`] subsumes both [`FsRead`] and [`FsWrite`],
Expand All@@ -32,7 +39,7 @@
/// can be used as capability tokens — external crates cannot forge new permissions.
pub trait Permission: sealed::Sealed + 'static {}

// ── Filesystem ──────────────────────────────────────────────────
// Filesystem

/// Permission to read files, list directories, and check metadata.
pub struct FsRead;
Expand All@@ -43,7 +50,7 @@ pub struct FsWrite;
/// Permission for all filesystem operations. Subsumes [`FsRead`] and [`FsWrite`].
pub struct FsAll;

// ── Network ─────────────────────────────────────────────────────
// Network

/// Permission to open outbound TCP and UDP connections.
pub struct NetConnect;
Expand All@@ -54,28 +61,28 @@ pub struct NetBind;
/// Permission for all network operations. Subsumes [`NetConnect`] and [`NetBind`].
pub struct NetAll;

// ── Environment ─────────────────────────────────────────────────
// Environment

/// Permission to read environment variables.
pub struct EnvRead;

/// Permission to modify or remove environment variables.
pub struct EnvWrite;

// ── Process ─────────────────────────────────────────────────────
// Process

/// Permission to spawn and execute subprocesses via `std::process::Command`.
pub struct Spawn;

// ── Ambient ─────────────────────────────────────────────────────
// Ambient

/// Full ambient authority — grants every permission.
///
/// This is the "god token." A `Cap<Ambient>` satisfies any `Has<P>` bound.
/// Use sparingly and only at the capability root.
pub struct Ambient;

// ── Permission impls ────────────────────────────────────────────
// Permission impls

impl Permission for FsRead {}
impl Permission for FsWrite {}
Expand All@@ -88,7 +95,11 @@ impl Permission for EnvWrite {}
impl Permission for Spawn {}
impl Permission for Ambient {}

// ── Subsumption ─────────────────────────────────────────────────
// Tuple permissions

impl<A: Permission, B: Permission> Permission for (A, B) {}

// Subsumption

/// Indicates that `Self` implies permission `P`.
///
Expand All@@ -103,7 +114,7 @@ impl Subsumes<NetConnect> for NetAll {}
impl Subsumes<NetBind> for NetAll {}
impl<P: Permission> Subsumes<P> for Ambient {}

// ── Sealed ──────────────────────────────────────────────────────
// Sealed

mod sealed {
pub trait Sealed {}
Expand All@@ -117,6 +128,7 @@ mod sealed {
impl Sealed for super::EnvWrite {}
impl Sealed for super::Spawn {}
impl Sealed for super::Ambient {}
impl<A: Sealed, B: Sealed> Sealed for (A, B) {}
}

#[cfg(test)]
Expand All@@ -141,6 +153,11 @@ mod tests {
// Compile-time proof that subsumption relationships hold:
fn _assert_subsumes<Super: Subsumes<Sub>, Sub: Permission>() {}

#[test]
fn tuple_permission_is_zst() {
assert_eq!(size_of::<(FsRead, NetConnect)>(), 0);
}

#[test]
fn subsumption_relationships() {
_assert_subsumes::<FsAll, FsRead>();
Expand Down
4 changes: 4 additions & 0 deletions crates/capsec-core/src/root.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,8 +83,12 @@ impl CapRoot {
/// # use capsec_core::permission::{FsRead, NetConnect};
/// let root = test_root();
///
/// // Individual capabilities:
/// let fs_cap = root.grant::<FsRead>();
/// let net_cap = root.grant::<NetConnect>();
///
/// // Or bundle multiple permissions in one token:
/// let combo = root.grant::<(FsRead, NetConnect)>();
/// ```
pub fn grant<P: Permission>(&self) -> Cap<P> {
Cap::new()
Expand Down
6 changes: 3 additions & 3 deletions crates/capsec/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@
//! - **`capsec-macro`** — `#[requires]` and `#[deny]` proc macros
//! - **`capsec-std`** — capability-gated `std` wrappers

// ── Re-exports from capsec-core ─────────────────────────────────
// Re-exports from capsec-core

pub use capsec_core::cap::{Cap, SendCap};
pub use capsec_core::error::CapSecError;
Expand All@@ -44,11 +44,11 @@ pub use capsec_core::root::test_root;

pub use capsec_core::attenuate::{Attenuated, DirScope, HostScope, Scope};

// ── Re-exports from capsec-macro ────────────────────────────────
// Re-exports from capsec-macro

pub use capsec_macro::{deny, requires};

// ── Capability-gated std wrappers ───────────────────────────────
// Capability-gated std wrappers

/// Capability-gated filesystem operations. See [`capsec_std::fs`].
pub mod fs {
Expand Down
3 changes: 3 additions & 0 deletions crates/capsec/tests/compile_fail/cap_is_not_send.stderr
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ error[E0277]: `*const ()` cannot be sent between threads safely
= help: within `capsec::Cap<capsec::FsRead>`, the trait `Send` is not implemented for `*const ()`
note: required because it appears within the type `PhantomData<*const ()>`
--> $RUST/core/src/marker.rs
|
| pub struct PhantomData<T: PointeeSized>;
| ^^^^^^^^^^^
note: required because it appears within the type `capsec::Cap<capsec::FsRead>`
--> $WORKSPACE/crates/capsec-core/src/cap.rs
|
Expand Down
3 changes: 3 additions & 0 deletions crates/capsec/tests/compile_fail/cap_is_not_sync.stderr
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ error[E0277]: `*const ()` cannot be shared between threads safely
= help: within `capsec::Cap<capsec::FsRead>`, the trait `Sync` is not implemented for `*const ()`
note: required because it appears within the type `PhantomData<*const ()>`
--> $RUST/core/src/marker.rs
|
| pub struct PhantomData<T: PointeeSized>;
| ^^^^^^^^^^^
note: required because it appears within the type `capsec::Cap<capsec::FsRead>`
--> $WORKSPACE/crates/capsec-core/src/cap.rs
|
Expand Down
16 changes: 8 additions & 8 deletions crates/capsec/tests/compile_fail/capsec_std_wrong_cap.stderr
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,14 @@ error[E0277]: the trait bound `Cap<capsec::NetConnect>: Has<FsRead>` is not sati
| required by a bound introduced by this call
|
= help: the following other types implement trait `Has<P>`:
`Cap<Ambient>` implements `Has<EnvRead>`
`Cap<Ambient>` implements `Has<EnvWrite>`
`Cap<Ambient>` implements `Has<FsAll>`
`Cap<Ambient>` implements `Has<FsRead>`
`Cap<Ambient>` implements `Has<FsWrite>`
`Cap<Ambient>` implements `Has<NetAll>`
`Cap<Ambient>` implements `Has<NetBind>`
`Cap<Ambient>` implements `Has<Spawn>`
`Cap<(Ambient, Ambient)>` implements `Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `Has<EnvRead>`
`Cap<(Ambient, EnvWrite)>` implements `Has<Ambient>`
`Cap<(Ambient, EnvWrite)>` implements `Has<EnvWrite>`
`Cap<(Ambient, FsAll)>` implements `Has<Ambient>`
`Cap<(Ambient, FsAll)>` implements `Has<FsAll>`
`Cap<(Ambient, FsRead)>` implements `Has<Ambient>`
and $N others
note: required by a bound in `capsec::fs::read_to_string`
--> $WORKSPACE/crates/capsec-std/src/fs.rs
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,14 +10,14 @@ help: the trait `capsec_core::permission::sealed::Sealed` is not implemented for
5 | struct MyPerm;
| ^^^^^^^^^^^^^
= help: the following other types implement trait `capsec_core::permission::sealed::Sealed`:
(A, B)
Ambient
EnvRead
EnvWrite
FsAll
FsRead
FsWrite
NetAll
NetBind
and $N others
note: required by a bound in `capsec::Permission`
--> $WORKSPACE/crates/capsec-core/src/permission.rs
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,14 @@ error[E0277]: the trait bound `Cap<capsec::FsRead>: capsec::Has<capsec::NetConne
| required by a bound introduced by this call
|
= help: the following other types implement trait `capsec::Has<P>`:
`Cap<Ambient>` implements `capsec::Has<EnvRead>`
`Cap<Ambient>` implements `capsec::Has<EnvWrite>`
`Cap<Ambient>` implements `capsec::Has<FsAll>`
`Cap<Ambient>` implements `capsec::Has<FsWrite>`
`Cap<Ambient>` implements `capsec::Has<NetAll>`
`Cap<Ambient>` implements `capsec::Has<NetBind>`
`Cap<Ambient>` implements `capsec::Has<Spawn>`
`Cap<Ambient>` implements `capsec::Has<capsec::FsRead>`
`Cap<(Ambient, Ambient)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `capsec::Has<EnvRead>`
`Cap<(Ambient, EnvWrite)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvWrite)>` implements `capsec::Has<EnvWrite>`
`Cap<(Ambient, FsAll)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, FsAll)>` implements `capsec::Has<FsAll>`
`Cap<(Ambient, FsWrite)>` implements `capsec::Has<Ambient>`
and $N others
note: required by a bound in `needs_net`
--> tests/compile_fail/sendcap_cannot_grant_wrong_perm.rs:5:23
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,14 @@ error[E0277]: the trait bound `Cap<capsec::FsRead>: capsec::Has<capsec::FsAll>`
| required by a bound introduced by this call
|
= help: the following other types implement trait `capsec::Has<P>`:
`Cap<Ambient>` implements `capsec::Has<EnvRead>`
`Cap<Ambient>` implements `capsec::Has<EnvWrite>`
`Cap<Ambient>` implements `capsec::Has<FsWrite>`
`Cap<Ambient>` implements `capsec::Has<NetAll>`
`Cap<Ambient>` implements `capsec::Has<NetBind>`
`Cap<Ambient>` implements `capsec::Has<NetConnect>`
`Cap<Ambient>` implements `capsec::Has<Spawn>`
`Cap<Ambient>` implements `capsec::Has<capsec::FsAll>`
`Cap<(Ambient, Ambient)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `capsec::Has<EnvRead>`
`Cap<(Ambient, EnvWrite)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvWrite)>` implements `capsec::Has<EnvWrite>`
`Cap<(Ambient, FsWrite)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, FsWrite)>` implements `capsec::Has<FsWrite>`
`Cap<(Ambient, NetAll)>` implements `capsec::Has<Ambient>`
and $N others
note: required by a bound in `needs_fs_all`
--> tests/compile_fail/subsumption_not_reversed.rs:5:26
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); feat: implement Has<A> + Has<B> for tuple Cap<(A, B)> via macro-generated concrete impls by bordumb · Pull Request #7 · auths-dev/capsec · GitHub
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
107 changes: 103 additions & 4 deletions crates/capsec-core/src/has.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,17 @@
//!
//! # Multiple capabilities
//!
//! For functions that need multiple permissions, use multiple parameters:
//! Bundle permissions in a single token with a tuple:
//!
//! ```rust,ignore
//! fn sync_data(cap: &(impl Has<FsRead> + Has<NetConnect>)) { ... }
//!
//! let root = test_root();
//! let cap = root.grant::<(FsRead, NetConnect)>();
//! sync_data(&cap);
//! ```
//!
//! Or use separate parameters:
//!
//! ```rust,ignore
//! fn sync_data(fs: &impl Has<FsRead>, net: &impl Has<NetConnect>) { ... }
Expand DownExpand Up@@ -49,15 +59,15 @@ pub trait Has<P: Permission> {
fn cap_ref(&self) -> Cap<P>;
}

// ── Direct: Cap<P> implements Has<P> ────────────────────────────
// Direct: Cap<P> implements Has<P>

impl<P: Permission> Has<P> for Cap<P> {
fn cap_ref(&self) -> Cap<P> {
Cap::new()
}
}

// ── Subsumption: FsAll, NetAll ──────────────────────────────────
// Subsumption: FsAll, NetAll

macro_rules! impl_subsumes {
($super:ty => $($sub:ty),+) => {
Expand All@@ -72,7 +82,7 @@ macro_rules! impl_subsumes {
impl_subsumes!(FsAll => FsRead, FsWrite);
impl_subsumes!(NetAll => NetConnect, NetBind);

// ── Ambient: satisfies everything ───────────────────────────────
// Ambient: satisfies everything

macro_rules! impl_ambient {
($($perm:ty),+) => {
Expand All@@ -88,6 +98,53 @@ impl_ambient!(
FsRead, FsWrite, FsAll, NetConnect, NetBind, NetAll, EnvRead, EnvWrite, Spawn
);

// Tuples: Cap<(A, B)> satisfies Has<A> and Has<B>
//
// Because Rust's coherence rules reject overlapping generic impls when A == B,
// we enumerate all concrete permission pairs via two macros.
//
// Macro 1: Has<first_element> for all (A, B) pairs including self-pairs (100 impls).
// Macro 2: Has<second_element> for distinct pairs only (90 impls).
//
// Total: 190 unique impls. No conflicts. No changes to the Has<P> trait signature.

macro_rules! impl_tuple_has_first {
([$($a:ident),+]; $all:tt) => {
$( impl_tuple_has_first!(@inner $a; $all); )+
};
(@inner $a:ident; [$($b:ident),+]) => {
$(
impl Has<$a> for Cap<($a, $b)> {
fn cap_ref(&self) -> Cap<$a> { Cap::new() }
}
)+
};
}

macro_rules! impl_tuple_has_second {
($first:ident $(, $rest:ident)+) => {
$(
impl Has<$first> for Cap<($rest, $first)> {
fn cap_ref(&self) -> Cap<$first> { Cap::new() }
}
impl Has<$rest> for Cap<($first, $rest)> {
fn cap_ref(&self) -> Cap<$rest> { Cap::new() }
}
)+
impl_tuple_has_second!($($rest),+);
};
($single:ident) => {};
}

impl_tuple_has_first!(
[FsRead, FsWrite, FsAll, NetConnect, NetBind, NetAll, EnvRead, EnvWrite, Spawn, Ambient];
[FsRead, FsWrite, FsAll, NetConnect, NetBind, NetAll, EnvRead, EnvWrite, Spawn, Ambient]
);

impl_tuple_has_second!(
FsRead, FsWrite, FsAll, NetConnect, NetBind, NetAll, EnvRead, EnvWrite, Spawn, Ambient
);

#[cfg(test)]
mod tests {
use super::*;
Expand DownExpand Up@@ -141,4 +198,46 @@ mod tests {
let net = root.grant::<NetConnect>();
sync_data(&fs, &net);
}

#[test]
fn tuple_cap_satisfies_both_has() {
let root = test_root();
let cap = root.grant::<(FsRead, NetConnect)>();
fn needs_fs(_: &impl Has<FsRead>) {}
fn needs_net(_: &impl Has<NetConnect>) {}
needs_fs(&cap);
needs_net(&cap);
}

#[test]
fn tuple_self_pair() {
let root = test_root();
let cap = root.grant::<(FsRead, FsRead)>();
fn needs_fs(_: &impl Has<FsRead>) {}
needs_fs(&cap);
}

#[test]
fn tuple_with_subsumption_type() {
let root = test_root();
let cap = root.grant::<(FsAll, NetConnect)>();
fn needs_fs_all(_: &impl Has<FsAll>) {}
fn needs_net(_: &impl Has<NetConnect>) {}
needs_fs_all(&cap);
needs_net(&cap);
}

#[test]
fn tuple_cap_ref_returns_correct_type() {
let root = test_root();
let cap = root.grant::<(FsRead, NetConnect)>();
let _fs: Cap<FsRead> = Has::<FsRead>::cap_ref(&cap);
let _net: Cap<NetConnect> = Has::<NetConnect>::cap_ref(&cap);
}

#[test]
fn tuple_is_zst() {
use std::mem::size_of;
assert_eq!(size_of::<Cap<(FsRead, NetConnect)>>(), 0);
}
}
33 changes: 25 additions & 8 deletions crates/capsec-core/src/permission.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,13 @@
//! | [`Spawn`] | Process | Execute subprocesses |
//! | [`Ambient`] | Everything | Full ambient authority — the "god token" |
//!
//! # Tuples
//!
//! Two permissions can be bundled via a tuple: `(FsRead, NetConnect)` is itself
//! a `Permission`, and `Cap<(FsRead, NetConnect)>` satisfies both `Has<FsRead>`
//! and `Has<NetConnect>`. All 2-tuple combinations of built-in permissions are
//! supported.
//!
//! # Subsumption
//!
//! Some permissions imply others. [`FsAll`] subsumes both [`FsRead`] and [`FsWrite`],
Expand All@@ -32,7 +39,7 @@
/// can be used as capability tokens — external crates cannot forge new permissions.
pub trait Permission: sealed::Sealed + 'static {}

// ── Filesystem ──────────────────────────────────────────────────
// Filesystem

/// Permission to read files, list directories, and check metadata.
pub struct FsRead;
Expand All@@ -43,7 +50,7 @@ pub struct FsWrite;
/// Permission for all filesystem operations. Subsumes [`FsRead`] and [`FsWrite`].
pub struct FsAll;

// ── Network ─────────────────────────────────────────────────────
// Network

/// Permission to open outbound TCP and UDP connections.
pub struct NetConnect;
Expand All@@ -54,28 +61,28 @@ pub struct NetBind;
/// Permission for all network operations. Subsumes [`NetConnect`] and [`NetBind`].
pub struct NetAll;

// ── Environment ─────────────────────────────────────────────────
// Environment

/// Permission to read environment variables.
pub struct EnvRead;

/// Permission to modify or remove environment variables.
pub struct EnvWrite;

// ── Process ─────────────────────────────────────────────────────
// Process

/// Permission to spawn and execute subprocesses via `std::process::Command`.
pub struct Spawn;

// ── Ambient ─────────────────────────────────────────────────────
// Ambient

/// Full ambient authority — grants every permission.
///
/// This is the "god token." A `Cap<Ambient>` satisfies any `Has<P>` bound.
/// Use sparingly and only at the capability root.
pub struct Ambient;

// ── Permission impls ────────────────────────────────────────────
// Permission impls

impl Permission for FsRead {}
impl Permission for FsWrite {}
Expand All@@ -88,7 +95,11 @@ impl Permission for EnvWrite {}
impl Permission for Spawn {}
impl Permission for Ambient {}

// ── Subsumption ─────────────────────────────────────────────────
// Tuple permissions

impl<A: Permission, B: Permission> Permission for (A, B) {}

// Subsumption

/// Indicates that `Self` implies permission `P`.
///
Expand All@@ -103,7 +114,7 @@ impl Subsumes<NetConnect> for NetAll {}
impl Subsumes<NetBind> for NetAll {}
impl<P: Permission> Subsumes<P> for Ambient {}

// ── Sealed ──────────────────────────────────────────────────────
// Sealed

mod sealed {
pub trait Sealed {}
Expand All@@ -117,6 +128,7 @@ mod sealed {
impl Sealed for super::EnvWrite {}
impl Sealed for super::Spawn {}
impl Sealed for super::Ambient {}
impl<A: Sealed, B: Sealed> Sealed for (A, B) {}
}

#[cfg(test)]
Expand All@@ -141,6 +153,11 @@ mod tests {
// Compile-time proof that subsumption relationships hold:
fn _assert_subsumes<Super: Subsumes<Sub>, Sub: Permission>() {}

#[test]
fn tuple_permission_is_zst() {
assert_eq!(size_of::<(FsRead, NetConnect)>(), 0);
}

#[test]
fn subsumption_relationships() {
_assert_subsumes::<FsAll, FsRead>();
Expand Down
4 changes: 4 additions & 0 deletions crates/capsec-core/src/root.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,8 +83,12 @@ impl CapRoot {
/// # use capsec_core::permission::{FsRead, NetConnect};
/// let root = test_root();
///
/// // Individual capabilities:
/// let fs_cap = root.grant::<FsRead>();
/// let net_cap = root.grant::<NetConnect>();
///
/// // Or bundle multiple permissions in one token:
/// let combo = root.grant::<(FsRead, NetConnect)>();
/// ```
pub fn grant<P: Permission>(&self) -> Cap<P> {
Cap::new()
Expand Down
6 changes: 3 additions & 3 deletions crates/capsec/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@
//! - **`capsec-macro`** — `#[requires]` and `#[deny]` proc macros
//! - **`capsec-std`** — capability-gated `std` wrappers

// ── Re-exports from capsec-core ─────────────────────────────────
// Re-exports from capsec-core

pub use capsec_core::cap::{Cap, SendCap};
pub use capsec_core::error::CapSecError;
Expand All@@ -44,11 +44,11 @@ pub use capsec_core::root::test_root;

pub use capsec_core::attenuate::{Attenuated, DirScope, HostScope, Scope};

// ── Re-exports from capsec-macro ────────────────────────────────
// Re-exports from capsec-macro

pub use capsec_macro::{deny, requires};

// ── Capability-gated std wrappers ───────────────────────────────
// Capability-gated std wrappers

/// Capability-gated filesystem operations. See [`capsec_std::fs`].
pub mod fs {
Expand Down
3 changes: 3 additions & 0 deletions crates/capsec/tests/compile_fail/cap_is_not_send.stderr
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ error[E0277]: `*const ()` cannot be sent between threads safely
= help: within `capsec::Cap<capsec::FsRead>`, the trait `Send` is not implemented for `*const ()`
note: required because it appears within the type `PhantomData<*const ()>`
--> $RUST/core/src/marker.rs
|
| pub struct PhantomData<T: PointeeSized>;
| ^^^^^^^^^^^
note: required because it appears within the type `capsec::Cap<capsec::FsRead>`
--> $WORKSPACE/crates/capsec-core/src/cap.rs
|
Expand Down
3 changes: 3 additions & 0 deletions crates/capsec/tests/compile_fail/cap_is_not_sync.stderr
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ error[E0277]: `*const ()` cannot be shared between threads safely
= help: within `capsec::Cap<capsec::FsRead>`, the trait `Sync` is not implemented for `*const ()`
note: required because it appears within the type `PhantomData<*const ()>`
--> $RUST/core/src/marker.rs
|
| pub struct PhantomData<T: PointeeSized>;
| ^^^^^^^^^^^
note: required because it appears within the type `capsec::Cap<capsec::FsRead>`
--> $WORKSPACE/crates/capsec-core/src/cap.rs
|
Expand Down
16 changes: 8 additions & 8 deletions crates/capsec/tests/compile_fail/capsec_std_wrong_cap.stderr
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,14 @@ error[E0277]: the trait bound `Cap<capsec::NetConnect>: Has<FsRead>` is not sati
| required by a bound introduced by this call
|
= help: the following other types implement trait `Has<P>`:
`Cap<Ambient>` implements `Has<EnvRead>`
`Cap<Ambient>` implements `Has<EnvWrite>`
`Cap<Ambient>` implements `Has<FsAll>`
`Cap<Ambient>` implements `Has<FsRead>`
`Cap<Ambient>` implements `Has<FsWrite>`
`Cap<Ambient>` implements `Has<NetAll>`
`Cap<Ambient>` implements `Has<NetBind>`
`Cap<Ambient>` implements `Has<Spawn>`
`Cap<(Ambient, Ambient)>` implements `Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `Has<EnvRead>`
`Cap<(Ambient, EnvWrite)>` implements `Has<Ambient>`
`Cap<(Ambient, EnvWrite)>` implements `Has<EnvWrite>`
`Cap<(Ambient, FsAll)>` implements `Has<Ambient>`
`Cap<(Ambient, FsAll)>` implements `Has<FsAll>`
`Cap<(Ambient, FsRead)>` implements `Has<Ambient>`
and $N others
note: required by a bound in `capsec::fs::read_to_string`
--> $WORKSPACE/crates/capsec-std/src/fs.rs
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,14 +10,14 @@ help: the trait `capsec_core::permission::sealed::Sealed` is not implemented for
5 | struct MyPerm;
| ^^^^^^^^^^^^^
= help: the following other types implement trait `capsec_core::permission::sealed::Sealed`:
(A, B)
Ambient
EnvRead
EnvWrite
FsAll
FsRead
FsWrite
NetAll
NetBind
and $N others
note: required by a bound in `capsec::Permission`
--> $WORKSPACE/crates/capsec-core/src/permission.rs
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,14 @@ error[E0277]: the trait bound `Cap<capsec::FsRead>: capsec::Has<capsec::NetConne
| required by a bound introduced by this call
|
= help: the following other types implement trait `capsec::Has<P>`:
`Cap<Ambient>` implements `capsec::Has<EnvRead>`
`Cap<Ambient>` implements `capsec::Has<EnvWrite>`
`Cap<Ambient>` implements `capsec::Has<FsAll>`
`Cap<Ambient>` implements `capsec::Has<FsWrite>`
`Cap<Ambient>` implements `capsec::Has<NetAll>`
`Cap<Ambient>` implements `capsec::Has<NetBind>`
`Cap<Ambient>` implements `capsec::Has<Spawn>`
`Cap<Ambient>` implements `capsec::Has<capsec::FsRead>`
`Cap<(Ambient, Ambient)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `capsec::Has<EnvRead>`
`Cap<(Ambient, EnvWrite)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvWrite)>` implements `capsec::Has<EnvWrite>`
`Cap<(Ambient, FsAll)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, FsAll)>` implements `capsec::Has<FsAll>`
`Cap<(Ambient, FsWrite)>` implements `capsec::Has<Ambient>`
and $N others
note: required by a bound in `needs_net`
--> tests/compile_fail/sendcap_cannot_grant_wrong_perm.rs:5:23
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,14 @@ error[E0277]: the trait bound `Cap<capsec::FsRead>: capsec::Has<capsec::FsAll>`
| required by a bound introduced by this call
|
= help: the following other types implement trait `capsec::Has<P>`:
`Cap<Ambient>` implements `capsec::Has<EnvRead>`
`Cap<Ambient>` implements `capsec::Has<EnvWrite>`
`Cap<Ambient>` implements `capsec::Has<FsWrite>`
`Cap<Ambient>` implements `capsec::Has<NetAll>`
`Cap<Ambient>` implements `capsec::Has<NetBind>`
`Cap<Ambient>` implements `capsec::Has<NetConnect>`
`Cap<Ambient>` implements `capsec::Has<Spawn>`
`Cap<Ambient>` implements `capsec::Has<capsec::FsAll>`
`Cap<(Ambient, Ambient)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvRead)>` implements `capsec::Has<EnvRead>`
`Cap<(Ambient, EnvWrite)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, EnvWrite)>` implements `capsec::Has<EnvWrite>`
`Cap<(Ambient, FsWrite)>` implements `capsec::Has<Ambient>`
`Cap<(Ambient, FsWrite)>` implements `capsec::Has<FsWrite>`
`Cap<(Ambient, NetAll)>` implements `capsec::Has<Ambient>`
and $N others
note: required by a bound in `needs_fs_all`
--> tests/compile_fail/subsumption_not_reversed.rs:5:26
Expand Down
Loading
Loading