aboutsummaryrefslogtreecommitdiffstats
path: root/src/access
diff options
context:
space:
mode:
Diffstat (limited to 'src/access')
-rw-r--r--src/access/challenge.rs34
-rw-r--r--src/access/token.rs38
2 files changed, 64 insertions, 8 deletions
diff --git a/src/access/challenge.rs b/src/access/challenge.rs
index e61ea85..8df0f08 100644
--- a/src/access/challenge.rs
+++ b/src/access/challenge.rs
@@ -79,6 +79,31 @@ pub(crate) fn take(
used: &mut Used,
per_user: usize,
) -> Result<(), String> {
+ take_with(key, challenge, user, now, used, per_user, |challenge| {
+ let signer = sshsig::verify(signature, NAMESPACE, challenge.as_bytes())?;
+ let entry = registry::user(doc, user).ok_or_else(|| format!("no user {user}"))?;
+ if entry.disabled {
+ return Err(format!("{user} is disabled"));
+ }
+ if !entry.keys.values().any(|known| *known == signer) {
+ return Err(format!("{user} has no key {}", signer.fingerprint()));
+ }
+ Ok(())
+ })
+}
+
+/// Takes `challenge` as a login of `user`, where `check` says that `user` signed it: a
+/// challenge of `key`'s node, unexpired at `now`, not used before (then used, in `used`),
+/// with fewer than `per_user` of `user`'s own still remembered. Why not, if not.
+pub(crate) fn take_with(
+ key: &NodeKey,
+ challenge: &str,
+ user: &str,
+ now: u64,
+ used: &mut Used,
+ per_user: usize,
+ check: impl FnOnce(&str) -> Result<(), String>,
+) -> Result<(), String> {
let mut parts = challenge.split('.');
let (Some(PREFIX), Some(payload), Some(signed), None) =
(parts.next(), parts.next(), parts.next(), parts.next())
@@ -116,14 +141,7 @@ pub(crate) fn take(
if used.0.len() >= MAX_USED {
return Err("too many logins by key at once: try again in a while".to_owned());
}
- let signer = sshsig::verify(signature, NAMESPACE, challenge.as_bytes())?;
- let entry = registry::user(doc, user).ok_or_else(|| format!("no user {user}"))?;
- if entry.disabled {
- return Err(format!("{user} is disabled"));
- }
- if !entry.keys.values().any(|known| *known == signer) {
- return Err(format!("{user} has no key {}", signer.fingerprint()));
- }
+ check(challenge)?;
used.0.insert(payload.nonce, (payload.exp, user.to_owned()));
Ok(())
}
diff --git a/src/access/token.rs b/src/access/token.rs
index 0920410..650a5c4 100644
--- a/src/access/token.rs
+++ b/src/access/token.rs
@@ -58,6 +58,13 @@ pub(crate) struct Claims {
/// Less than the user may do: only what these allow too.
#[serde(default, skip_serializing_if = "Option::is_none")]
pub(crate) limit: Option<Vec<Capability>>,
+ /// Of a party's session, on a node holding a federated store: the key, as the
+ /// federation spells it, that `user`, the party, logged in with
+ /// (`api::login::login_party`). Such a token does federation work alone, while that
+ /// key signs for the party (`api::access::federated`); a build from before it reads
+ /// none (`deny_unknown_fields`), so never takes it for its user's.
+ #[serde(default, skip_serializing_if = "Option::is_none")]
+ pub(crate) party: Option<String>,
}
/// `claims`, signed by `key`, as a token.
@@ -243,6 +250,7 @@ mod tests {
session_exp: 10_000,
login_exp: 10_000,
limit: None,
+ party: None,
}
}
@@ -251,6 +259,36 @@ mod tests {
change(doc, |tx| store::write_path(tx, &path, &json!({})).unwrap());
}
+ /// A party's session names the key it logged in with, which a token of a user's
+ /// leaves out: a build from before it reads none (its claims deny fields it doesn't
+ /// know), so never takes it for its user's.
+ #[test]
+ fn a_partys_session_names_its_key() {
+ let key = NodeKey::from_seed([1; 32]);
+ let mut doc = Document::new();
+ member(&mut doc, &key);
+ let party = Claims {
+ user: "tv".to_owned(),
+ login: "party".to_owned(),
+ party: Some("ssh-ed25519 AAAA".to_owned()),
+ ..claims(&key)
+ };
+ let token = issue(&key, &party);
+ assert_eq!(verify(&doc, &token, "s", 1_500), Ok(party));
+ let (_, payload) = token.split_once('.').unwrap();
+ let (payload, _) = payload.split_once('.').unwrap();
+ let payload = String::from_utf8(BASE64URL.decode(payload).unwrap()).unwrap();
+ assert!(
+ payload.contains(r#""party":"ssh-ed25519 AAAA""#),
+ "{payload}"
+ );
+ let user = issue(&key, &claims(&key));
+ let (_, payload) = user.split_once('.').unwrap();
+ let (payload, _) = payload.split_once('.').unwrap();
+ let payload = String::from_utf8(BASE64URL.decode(payload).unwrap()).unwrap();
+ assert!(!payload.contains("party"), "{payload}");
+ }
+
#[test]
fn issued_and_taken() {
let key = NodeKey::from_seed([1; 32]);