Watch
0
0
Fork
You've already forked hyperhive
0

gate ssh signing per agent: ssh permission, signing policy on the login role, ca key endpoint

This commit is contained in:
atlas 2026-11-16 18:29:06 +01:00 • committed by mara
commit 910f9a6f50

View file

@ -42,8 +42,8 @@ use crate::wanted::WantedWriter;
const MAX_ATTEMPTS: usize = 5;
/// The permissions to store for `req`, whose list is already checked. The list
/// replaces the stored one; `unrestricted_internet` and `max_repos` left out
/// keep the ones in `current`. `internet_log` is stored only as `true`, and a request that sets
/// replaces the stored one; `unrestricted_internet`, `max_repos` and `ssh` left
/// out keep the ones in `current`. `internet_log` is stored only as `true`, and a request that sets
/// `unrestricted_internet` without it turns it off: an agent that moves to
/// unrestricted and back to restricted does not come back logging.
fn into_stored(req: Permissions, current: &AgentPermissions) -> AgentPermissions {
@ -57,6 +57,7 @@ fn into_stored(req: Permissions, current: &AgentPermissions) -> AgentPermissions
unrestricted_internet: req.unrestricted_internet.or(current.unrestricted_internet),
internet_log,
max_repos: req.max_repos.or(current.max_repos),
ssh: req.ssh.or(current.ssh),
}
}
@ -123,6 +124,7 @@ fn view(v: AgentPermissions) -> Permissions {
unrestricted_internet: v.unrestricted_internet,
internet_log: v.internet_log,
max_repos: v.max_repos,
ssh: v.ssh,
}
}
@ -331,6 +333,9 @@ async fn put_with(
if value.max_repos != current.max_repos {
MAX_REPOS_CHANGED.notify_one();
}
if value.ssh != current.ssh {
crate::agent_ssh::SSH_CHANGED.notify_one();
}
if !revoking {
mirror(leaves, &agent, &before, &after)
.await
@ -390,6 +395,7 @@ async fn delete_with(
unrestricted_internet: current.unrestricted_internet,
internet_log: current.internet_log,
max_repos: current.max_repos,
ssh: current.ssh,
..AgentPermissions::default()
};
mirror(leaves, &agent, &held(&current), &held(&kept))
@ -490,6 +496,7 @@ pub(crate) fn at_create(
unrestricted_internet,
internet_log: None,
max_repos: None,
ssh: None,
})
}
@ -520,6 +527,7 @@ fn merged_at_create(
current.internet_log
},
max_repos: value.max_repos.or(current.max_repos),
ssh: value.ssh.or(current.ssh),
}
}
@ -875,6 +883,7 @@ pub(crate) mod tests {
unrestricted_internet,
internet_log,
max_repos: None,
ssh: None,
}
}
@ -1012,6 +1021,80 @@ pub(crate) mod tests {
assert_eq!(super::max_repos(&client, "atlas").await.unwrap(), MAX_REPOS);
}
/// The SSH switch is the agent's own and off by default: a `PUT` sets it and
/// wakes the role pass, a `PUT` or `DELETE` that leaves it out keeps it, and
/// another agent is not changed.
#[tokio::test]
async fn an_agents_ssh_switch_is_its_own_default_off_and_survives_other_changes() {
use crate::wanted::WantedWriter;
use swarm_wire::wanted::AgentState;
let nats = TestNats::start();
let client = nats.client().await;
let state = crate::agent_limits::tests::declared(&client).await;
WantedWriter::new(client.clone())
.set("pr1ma", "iris", AgentState::Up)
.await
.expect("declare iris");
let ssh = |on| Permissions {
ssh: Some(on),
..Permissions::default()
};
assert_eq!(get(&state, "atlas").await.ssh, None, "off until set");
while tokio::time::timeout(
std::time::Duration::from_millis(1),
crate::agent_ssh::SSH_CHANGED.notified(),
)
.await
.is_ok()
{}
assert_eq!(
put(&state, "atlas", ssh(true)).await.expect("set").0.ssh,
Some(true)
);
tokio::time::timeout(
std::time::Duration::from_secs(5),
crate::agent_ssh::SSH_CHANGED.notified(),
)
.await
.expect("the change wakes the role pass");
assert_eq!(
get(&state, "iris").await.ssh,
None,
"another agent is not changed"
);
let _ = put(&state, "atlas", granted()).await.expect("set");
assert_eq!(get(&state, "atlas").await.ssh, Some(true));
delete_agent_permissions(State(state.clone()), Path("atlas".to_owned()))
.await
.expect("cleared");
assert_eq!(get(&state, "atlas").await.ssh, Some(true));
assert_eq!(
put(&state, "atlas", ssh(false)).await.expect("set").0.ssh,
Some(false)
);
tokio::time::timeout(
std::time::Duration::from_secs(5),
crate::agent_ssh::SSH_CHANGED.notified(),
)
.await
.expect("switching off wakes the role pass too");
}
/// A create keeps the stored SSH switch and does not set one.
#[test]
fn a_create_keeps_the_ssh_switch() {
let current = stored(r#"{"ssh":true}"#);
assert_eq!(
super::merged_at_create(&stored("{}"), &current, true).ssh,
Some(true)
);
assert_eq!(super::at_create(None, None).expect("valid").ssh, None);
}
/// A stored limit above the range, as a hand edit could leave it, reads as
/// none rather than as that many repositories.
#[test]
@ -1050,6 +1133,7 @@ pub(crate) mod tests {
unrestricted_internet: None,
internet_log: None,
max_repos: None,
ssh: None,
}
}
@ -1096,6 +1180,7 @@ pub(crate) mod tests {
unrestricted_internet: None,
internet_log: None,
max_repos: None,
ssh: None,
};
let _ = put(&state, "atlas", none.clone()).await.expect("set");
assert_eq!(
@ -1125,6 +1210,7 @@ pub(crate) mod tests {
unrestricted_internet: Some(false),
internet_log: Some(true),
max_repos: None,
ssh: None,
};
let stored = put(&state, "atlas", log.clone()).await.expect("set").0;
assert_eq!(stored, log);
@ -1148,6 +1234,7 @@ pub(crate) mod tests {
unrestricted_internet: Some(true),
internet_log: None,
max_repos: None,
ssh: None,
};
let _ = put(&state, "atlas", on.clone()).await.expect("set");
let off = Permissions {
@ -1296,6 +1383,7 @@ pub(crate) mod tests {
unrestricted_internet: None,
internet_log: None,
max_repos: None,
ssh: None,
}
}