fedserv/echo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enforce the email-forbid policy on gRPC Register and SetEmail
All checks were successful
CI / check (push) Successful in 4m10s
Details

Browse source
This commit is contained in:
Jean Chevronnet 2026-07-19 15:37:33 +00:00
parent 03d39c1329
commit 16d2a5035a
No known key found for this signature in database
1 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/engine/register.rs
View file

@ -58,6 +58,12 @@ impl Engine {
pub fn authority_register(&mut self, name: &str, creds: Option<db::Credentials>, email: Option<String>) -> AuthorityStatus { pub fn authority_register(&mut self, name: &str, creds: Option<db::Credentials>, email: Option<String>) -> AuthorityStatus {
let Some(creds) = creds else { return AuthorityStatus::Internal }; let Some(creds) = creds else { return AuthorityStatus::Internal };
// The IRC REGISTER rejects a FORBIDden email; a website write must too.
if let Some(addr) = &email {
if self.db.is_forbidden(echo_api::ForbidKind::Email, addr).is_some() {
return AuthorityStatus::Invalid;
}
}
let addr = email.clone(); let addr = email.clone();
let status = match self.db.register_prepared(name, creds, email) { let status = match self.db.register_prepared(name, creds, email) {
Ok(()) => AuthorityStatus::Ok, Ok(()) => AuthorityStatus::Ok,
@ -93,6 +99,11 @@ impl Engine {
} }
pub fn authority_set_email(&mut self, account: &str, email: Option<String>) -> AuthorityStatus { pub fn authority_set_email(&mut self, account: &str, email: Option<String>) -> AuthorityStatus {
if let Some(addr) = &email {
if self.db.is_forbidden(echo_api::ForbidKind::Email, addr).is_some() {
return AuthorityStatus::Invalid; // same email-forbid policy as IRC SET
}
}
match self.db.set_email(account, email) { match self.db.set_email(account, email) {
Ok(()) => AuthorityStatus::Ok, Ok(()) => AuthorityStatus::Ok,
Err(_) => AuthorityStatus::NotFound, Err(_) => AuthorityStatus::NotFound,