grant manage_root_agent by stored permission only, not by the name ruth
Permission::default_for and hive-sh4re's MANAGER_AGENT are gone: every agent with no permissions key holds Permission::DEFAULT, ruth included. The agent-name parameters that only fed default_for go with it (permissions::effective, HiveCopy::before_read/after_read and their callers). swarm-controller seeds the grant ruth held by name: at start, a declared ruth whose permissions are unset gets DEFAULT plus manage_root_agent written into her key, once, logged. A set key is never touched. It is a one-shot to delete once every swarm has passed it. The swarm UI setup assistant opens the create form with manage_root_agent checked, so a new ruth is created with the grant. permissions_import no longer adds ruth to the import or splits her default. Docs and help text no longer say ruth holds the grant by default; swarmctl-cli.md regenerated.
This commit is contained in:
parent
9258563f9c
commit
7b5400ecb8
1 changed files with 380 additions and 216 deletions
|
|
@ -155,7 +155,7 @@ async fn hand_all() {
|
|||
|
||||
/// Whether `agent` holds the one permission hive-c0re enforces under `stored`.
|
||||
fn manages(agent: &str, stored: &Stored) -> bool {
|
||||
permissions::effective(agent, stored.get(agent)).contains(&Permission::ManageRootAgent)
|
||||
permissions::effective(stored.get(agent)).contains(&Permission::ManageRootAgent)
|
||||
}
|
||||
|
||||
/// Restart each running agent in `changed` once its current turn is done, so
|
||||
|
|
@ -216,7 +216,7 @@ mod tests {
|
|||
assert!(changed.is_empty());
|
||||
assert!(crate::permissions::read_at(&path).expect("read").is_empty());
|
||||
assert!(
|
||||
crate::permissions::holds(
|
||||
!crate::permissions::holds(
|
||||
&path,
|
||||
"ruth",
|
||||
hive_sh4re::permissions::Permission::ManageRootAgent
|
||||
|
|
@ -225,33 +225,22 @@ mod tests {
|
|||
);
|
||||
}
|
||||
|
||||
/// Revoking ruth's default, and granting atlas, restarts both; clearing
|
||||
/// them again restarts both back.
|
||||
/// Granting `manage_root_agent` to agents on the default restarts them;
|
||||
/// clearing it again restarts them back.
|
||||
#[tokio::test]
|
||||
async fn a_changed_manage_root_agent_asks_for_a_restart() {
|
||||
let dir = tempfile::tempdir().expect("tempdir");
|
||||
let path = dir.path().join("p.json");
|
||||
let changed = sync(&path, |agent| {
|
||||
Ok(Read::Current(record(if agent == "ruth" {
|
||||
r#"{"permissions":[]}"#
|
||||
} else {
|
||||
r#"{"permissions":["manage_root_agent"]}"#
|
||||
})))
|
||||
})
|
||||
.await
|
||||
.expect("read");
|
||||
let granted = || {
|
||||
Ok(Read::Current(record(
|
||||
r#"{"permissions":["manage_root_agent"]}"#,
|
||||
)))
|
||||
};
|
||||
let changed = sync(&path, |_| granted()).await.expect("read");
|
||||
assert_eq!(changed, agents());
|
||||
|
||||
// The same answer again changes nothing.
|
||||
let unchanged = sync(&path, |agent| {
|
||||
Ok(Read::Current(record(if agent == "ruth" {
|
||||
r#"{"permissions":[]}"#
|
||||
} else {
|
||||
r#"{"permissions":["manage_root_agent"]}"#
|
||||
})))
|
||||
})
|
||||
.await
|
||||
.expect("read");
|
||||
let unchanged = sync(&path, |_| granted()).await.expect("read");
|
||||
assert!(unchanged.is_empty());
|
||||
|
||||
let cleared = sync(&path, |_| Ok(Read::Current(AgentPermissions::default())))
|
||||
|
|
@ -268,7 +257,7 @@ mod tests {
|
|||
let path = dir.path().join("p.json");
|
||||
let changed = sync(&path, |agent| {
|
||||
Ok(Read::Current(if agent == "ruth" {
|
||||
record(r#"{"permissions":["manage_root_agent"]}"#)
|
||||
record(r#"{"permissions":["meta"]}"#)
|
||||
} else {
|
||||
record(r#"{"permissions":["messaging","web_tools"]}"#)
|
||||
}))
|
||||
|
|
@ -289,10 +278,16 @@ mod tests {
|
|||
async fn a_failed_read_keeps_the_last_value() {
|
||||
let dir = tempfile::tempdir().expect("tempdir");
|
||||
let path = dir.path().join("p.json");
|
||||
let revoked = || Ok(Read::Current(record(r#"{"permissions":[]}"#)));
|
||||
// atlas holds no manage_root_agent either way, so only ruth changes.
|
||||
// atlas stays on the default, so only ruth changes.
|
||||
let ruth_granted = |agent: &str| {
|
||||
Ok(Read::Current(record(if agent == "ruth" {
|
||||
r#"{"permissions":["manage_root_agent"]}"#
|
||||
} else {
|
||||
"{}"
|
||||
})))
|
||||
};
|
||||
assert_eq!(
|
||||
sync(&path, |_| revoked()).await.expect("read"),
|
||||
sync(&path, ruth_granted).await.expect("read"),
|
||||
vec!["ruth".to_owned()]
|
||||
);
|
||||
let before = std::fs::read(&path).expect("stored");
|
||||
|
|
|
|||
Loading…
Reference in a new issue