mirrors/tranquil-pds
1
0
Fork 0
mirror of https://tangled.org/tranquil.farm/tranquil-pds synced 2026-08-01 15:06:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: prevent rpc scopes from escaping permission set namespace

Browse Source 
Signed-off-by: Trezy <tre@trezy.com>
This commit is contained in:
Trezy
2026-07-24 20:11:27 +03:00
committed by Tangled
parent 19e7ec29f5
commit fa50d7d54e
1 changed files with 46 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/tranquil-scopes/src/permission_set.rs
+46 -9
View File
@@ -364,13 +364,15 @@ fn build_expanded_scopes(
if let Some(lxms) = &perm.lxm {
let perm_aud = perm.aud.as_deref().or(default_aud);
lxms.iter().for_each(|lxm| {
let scope = match perm_aud {
Some(aud) => format!("rpc:{}?aud={}", lxm, aud),
None => format!("rpc:{}", lxm),
};
scopes.push(scope);
});
lxms.iter()
.filter(|lxm| is_under_authority(lxm, namespace_authority))
.for_each(|lxm| {
let scope = match perm_aud {
Some(aud) => format!("rpc:{}?aud={}", lxm, aud),
None => format!("rpc:{}", lxm),
};
scopes.push(scope);
});
}
}
_ => {}
@@ -492,7 +494,7 @@ mod tests {
let expanded = build_expanded_scopes(&permissions, None, "io.atcr");
assert!(expanded.contains("rpc:io.atcr.getManifest?aud=*"));
assert!(expanded.contains("rpc:com.atproto.repo.getRecord?aud=*"));
assert!(!expanded.contains("com.atproto.repo.getRecord"));
}
#[test]
@@ -545,7 +547,42 @@ mod tests {
let expanded = build_expanded_scopes(&permissions, None, "io.atcr");
assert!(expanded.contains("repo:io.atcr.manifest?action=create"));
assert!(expanded.contains("rpc:com.atproto.repo.getRecord?aud=*"));
assert!(!expanded.contains("com.atproto.repo.getRecord"));
}
#[test]
fn test_build_expanded_scopes_rpc_cannot_escape_namespace() {
let permissions = vec![PermissionEntry {
resource: "rpc".to_string(),
action: None,
collection: None,
lxm: Some(vec![
"com.atproto.repo.deleteRecord".to_string(),
"chat.bsky.convo.sendMessage".to_string(),
"io.atcrEVIL.getManifest".to_string(),
]),
aud: Some("*".to_string()),
}];
let expanded = build_expanded_scopes(&permissions, None, "io.atcr");
assert!(
expanded.is_empty(),
"cross-namespace lxm values must all be dropped, got: {expanded}"
);
}
#[test]
fn test_build_expanded_scopes_rpc_allows_child_namespace() {
let permissions = vec![PermissionEntry {
resource: "rpc".to_string(),
action: None,
collection: None,
lxm: Some(vec!["io.atcr.sailor.star.getThing".to_string()]),
aud: None,
}];
let expanded = build_expanded_scopes(&permissions, None, "io.atcr");
assert_eq!(expanded, "rpc:io.atcr.sailor.star.getThing");
}
#[test]