grpc: provision sets the verifier on an already-existing account
All checks were successful
CI / check (push) Successful in 3m50s
All checks were successful
CI / check (push) Successful in 3m50s
An Anope import creates accounts (channel ownership, vhosts, certs) but can't carry the one-way password hash, so they exist without a verifier. provision then refused them as AlreadyExists, so the website's backfill could never give migrated members a credential — every one was locked out of password login. Make provision update the verifier in place on an existing account (logged as AccountPasswordSet), and treat an empty scram512 as absent consistently in apply(). Keyed by name, so imported channel/vhost/ban data stays attached.
This commit is contained in:
parent
d1685f7e53
commit
34bc7d69f0
5 changed files with 54 additions and 7 deletions
|
|
@ -42,12 +42,28 @@ impl Db {
|
|||
/// can't clobber a fully-credentialed account). `scram512` empty =
|
||||
/// SCRAM-SHA-512 unavailable for this account (it falls back to 256).
|
||||
pub fn provision_account(&mut self, name: &str, scram256: &str, scram512: &str, email: Option<String>) -> Result<(), RegError> {
|
||||
if self.exists(name) {
|
||||
return Err(RegError::Exists);
|
||||
}
|
||||
if name.is_empty() || scram256.is_empty() {
|
||||
return Err(RegError::Internal);
|
||||
}
|
||||
// The account may already exist without a verifier — an Anope import
|
||||
// creates accounts (channel ownership, vhosts, etc.) but can't carry the
|
||||
// one-way password hash. When the external authority then asserts a
|
||||
// verifier, set it in place rather than refusing, or migrated users could
|
||||
// never log in. Keyed by name, so all imported data stays attached.
|
||||
if self.exists(name) {
|
||||
self.log
|
||||
.append(Event::AccountPasswordSet {
|
||||
account: name.to_string(),
|
||||
scram256: scram256.to_string(),
|
||||
scram512: scram512.to_string(),
|
||||
})
|
||||
.map_err(|_| RegError::Internal)?;
|
||||
if let Some(acct) = self.accounts.get_mut(&key(name)) {
|
||||
acct.scram256 = Some(scram256.to_string());
|
||||
acct.scram512 = (!scram512.is_empty()).then(|| scram512.to_string());
|
||||
}
|
||||
return Ok(());
|
||||
}
|
||||
let account = Account {
|
||||
name: name.to_string(),
|
||||
email,
|
||||
|
|
|
|||
|
|
@ -333,7 +333,9 @@ pub(crate) fn apply(accounts: &mut HashMap<String, Account>, channels: &mut Hash
|
|||
Event::AccountPasswordSet { account, scram256, scram512 } => {
|
||||
if let Some(a) = accounts.get_mut(&key(&account)) {
|
||||
a.scram256 = Some(scram256);
|
||||
a.scram512 = Some(scram512);
|
||||
// Empty = not provided (e.g. a verifier-only backfill sets SHA-256
|
||||
// alone); keep this in step with the live provision update.
|
||||
a.scram512 = (!scram512.is_empty()).then_some(scram512);
|
||||
}
|
||||
}
|
||||
Event::AccountDropped { account } => {
|
||||
|
|
|
|||
|
|
@ -382,6 +382,33 @@
|
|||
assert!(db.authenticate("ext", "wrong").is_none(), "wrong password rejected");
|
||||
}
|
||||
|
||||
// The migration flow: an Anope import creates the account with NO verifier
|
||||
// (one-way hash can't move), then the authority provisions the verifier. That
|
||||
// second provision must SET the credential on the existing account, not be
|
||||
// refused — otherwise every migrated member is locked out of password login.
|
||||
#[test]
|
||||
fn provision_sets_verifier_on_an_imported_account() {
|
||||
let p = tmp("prov-imported");
|
||||
{
|
||||
let mut db = Db::open(&p, "N1");
|
||||
db.migrate_append(Event::AccountRegistered(Box::new(Account {
|
||||
name: "mig".into(), email: Some("m@x".into()), ts: 1, home: "N1".into(),
|
||||
scram256: None, scram512: None, certfps: vec![], verified: true, ajoin: vec![],
|
||||
suspension: None, memos: vec![], memo_ignore: vec![], memo_notify: true,
|
||||
memo_limit: None, greet: String::new(), no_autoop: false, no_protect: false,
|
||||
hide_status: false, vhost: None, vhost_request: None, last_seen: 1,
|
||||
noexpire: false, expiry_warned: false, oper_note: None,
|
||||
}))).unwrap();
|
||||
}
|
||||
// Reopen so the imported account is live in memory (as after a restart).
|
||||
let mut db = Db::open(&p, "N1");
|
||||
db.scram_iterations = 4096;
|
||||
assert!(db.authenticate("mig", "hunter2").is_none(), "imported account has no verifier yet");
|
||||
let creds = Db::derive_credentials("hunter2", 4096).unwrap();
|
||||
db.provision_account("mig", &creds.scram256, "", None).unwrap();
|
||||
assert_eq!(db.authenticate("mig", "hunter2"), Some("mig"), "provision set the verifier on the existing account");
|
||||
}
|
||||
|
||||
// A peer with an empty log converges from a node that has already compacted.
|
||||
#[test]
|
||||
fn compacted_node_still_converges() {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue