aboutsummaryrefslogtreecommitdiffstats
path: root/src/access/challenge.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/access/challenge.rs')
-rw-r--r--src/access/challenge.rs34
1 files changed, 26 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(())
}