NickServ: add SET HIDE STATUS for last-seen privacy
Lets an account keep its last-seen/online line in INFO visible only to itself and to opers. Default stays public (Anope's default). Accepts STATUS (with USERMASK as an alias) per Anope's SET HIDE <field> grammar.
This commit is contained in:
parent
39d7421c06
commit
053f8cf832
12 changed files with 116 additions and 19 deletions
|
|
@ -466,6 +466,8 @@ pub struct AccountView {
|
||||||
pub greet: String,
|
pub greet: String,
|
||||||
// Unix time this account was last active (coalesced); never below `ts`.
|
// Unix time this account was last active (coalesced); never below `ts`.
|
||||||
pub last_seen: u64,
|
pub last_seen: u64,
|
||||||
|
// Whether the last-seen/online line is hidden from non-owner, non-oper viewers.
|
||||||
|
pub hide_status: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
// One channel access-list entry (account -> level). `level` is either a legacy
|
// One channel access-list entry (account -> level). `level` is either a legacy
|
||||||
|
|
@ -922,6 +924,9 @@ pub trait Store {
|
||||||
// NickServ SET KILL: whether this account's nicks are enforcer-protected.
|
// NickServ SET KILL: whether this account's nicks are enforcer-protected.
|
||||||
fn set_account_kill(&mut self, account: &str, on: bool) -> Result<(), RegError>;
|
fn set_account_kill(&mut self, account: &str, on: bool) -> Result<(), RegError>;
|
||||||
fn account_wants_protect(&self, account: &str) -> bool;
|
fn account_wants_protect(&self, account: &str) -> bool;
|
||||||
|
// NickServ SET HIDE STATUS: whether this account hides its last-seen line.
|
||||||
|
fn set_account_hide_status(&mut self, account: &str, on: bool) -> Result<(), RegError>;
|
||||||
|
fn account_hides_status(&self, account: &str) -> bool;
|
||||||
// HostServ vhosts.
|
// HostServ vhosts.
|
||||||
fn set_vhost(&mut self, account: &str, host: &str, setter: &str, ttl: Option<u64>) -> Result<(), RegError>;
|
fn set_vhost(&mut self, account: &str, host: &str, setter: &str, ttl: Option<u64>) -> Result<(), RegError>;
|
||||||
fn del_vhost(&mut self, account: &str) -> Result<bool, RegError>;
|
fn del_vhost(&mut self, account: &str) -> Result<bool, RegError>;
|
||||||
|
|
|
||||||
|
|
@ -10,21 +10,24 @@ pub fn handle(me: &str, from: &Sender, args: &[&str], ctx: &mut ServiceCtx, net:
|
||||||
ctx.notice(me, from.uid, format!("\x02{name}\x02 isn't registered."));
|
ctx.notice(me, from.uid, format!("\x02{name}\x02 isn't registered."));
|
||||||
return;
|
return;
|
||||||
};
|
};
|
||||||
|
let is_owner = from.account == Some(acct.name.as_str());
|
||||||
|
let privileged = is_owner || from.privs.has(Priv::Auspex);
|
||||||
ctx.notice(me, from.uid, format!("Information for \x02{}\x02:", acct.name));
|
ctx.notice(me, from.uid, format!("Information for \x02{}\x02:", acct.name));
|
||||||
ctx.notice(me, from.uid, format!(" Registered : {}", human_time(acct.ts)));
|
ctx.notice(me, from.uid, format!(" Registered : {}", human_time(acct.ts)));
|
||||||
// Last-seen is public (Anope shows it by default); a live session reads as online.
|
// Last-seen is public by default; SET HIDE STATUS keeps it to owner and opers.
|
||||||
let last_seen = if net.uids_logged_into(&acct.name).is_empty() {
|
if privileged || !acct.hide_status {
|
||||||
human_time(acct.last_seen)
|
let last_seen = if net.uids_logged_into(&acct.name).is_empty() {
|
||||||
} else {
|
human_time(acct.last_seen)
|
||||||
"now (online)".to_string()
|
} else {
|
||||||
};
|
"now (online)".to_string()
|
||||||
ctx.notice(me, from.uid, format!(" Last seen : {last_seen}"));
|
};
|
||||||
|
ctx.notice(me, from.uid, format!(" Last seen : {last_seen}"));
|
||||||
|
}
|
||||||
// A greet is public — the bot shows it in-channel to everyone anyway.
|
// A greet is public — the bot shows it in-channel to everyone anyway.
|
||||||
if !acct.greet.is_empty() {
|
if !acct.greet.is_empty() {
|
||||||
ctx.notice(me, from.uid, format!(" Greet : {}", acct.greet));
|
ctx.notice(me, from.uid, format!(" Greet : {}", acct.greet));
|
||||||
}
|
}
|
||||||
let is_owner = from.account == Some(acct.name.as_str());
|
if privileged {
|
||||||
if is_owner || from.privs.has(Priv::Auspex) {
|
|
||||||
if let Some(s) = db.suspension(&acct.name) {
|
if let Some(s) = db.suspension(&acct.name) {
|
||||||
ctx.notice(me, from.uid, format!(" Suspended : by \x02{}\x02 — {}", s.by, s.reason));
|
ctx.notice(me, from.uid, format!(" Suspended : by \x02{}\x02 — {}", s.by, s.reason));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -54,7 +54,7 @@ const TOPICS: &[HelpEntry] = &[
|
||||||
HelpEntry { cmd: "LOGOUT", summary: "log out to a guest nick", detail: "Syntax: \x02LOGOUT\x02\nLogs you out and moves you to a guest nick. Also \x02LOGOFF\x02." },
|
HelpEntry { cmd: "LOGOUT", summary: "log out to a guest nick", detail: "Syntax: \x02LOGOUT\x02\nLogs you out and moves you to a guest nick. Also \x02LOGOFF\x02." },
|
||||||
HelpEntry { cmd: "INFO", summary: "show account information", detail: "Syntax: \x02INFO [account]\x02\nShows account information. The email is shown only to the owner." },
|
HelpEntry { cmd: "INFO", summary: "show account information", detail: "Syntax: \x02INFO [account]\x02\nShows account information. The email is shown only to the owner." },
|
||||||
HelpEntry { cmd: "ALIST", summary: "list channels you have access on", detail: "Syntax: \x02ALIST\x02\nLists the channels you hold access on." },
|
HelpEntry { cmd: "ALIST", summary: "list channels you have access on", detail: "Syntax: \x02ALIST\x02\nLists the channels you hold access on." },
|
||||||
HelpEntry { cmd: "SET", summary: "change password, email, or preferences", detail: "Syntax: \x02SET PASSWORD <new>\x02, \x02SET EMAIL <address>\x02, \x02SET GREET [message]\x02, \x02SET AUTOOP {ON|OFF}\x02, or \x02SET KILL {ON|OFF}\x02\nChanges your password, email, greet, auto-op, or nick-protection preference." },
|
HelpEntry { cmd: "SET", summary: "change password, email, or preferences", detail: "Syntax: \x02SET PASSWORD <new>\x02, \x02SET EMAIL <address>\x02, \x02SET GREET [message]\x02, \x02SET AUTOOP {ON|OFF}\x02, \x02SET KILL {ON|OFF}\x02, or \x02SET HIDE STATUS {ON|OFF}\x02\nChanges your password, email, greet, auto-op, nick-protection, or last-seen privacy." },
|
||||||
HelpEntry { cmd: "SASET", summary: "change another account's settings (operator)", detail: "Syntax: \x02SASET <account> PASSWORD <new>\x02, \x02EMAIL [address]\x02, or \x02GREET [message]\x02\nEdits another account's settings. Operators only." },
|
HelpEntry { cmd: "SASET", summary: "change another account's settings (operator)", detail: "Syntax: \x02SASET <account> PASSWORD <new>\x02, \x02EMAIL [address]\x02, or \x02GREET [message]\x02\nEdits another account's settings. Operators only." },
|
||||||
HelpEntry { cmd: "GROUP", summary: "link this nick to an account", detail: "Syntax: \x02GROUP <account> <password>\x02\nLinks your current nick to an account as an alias, so identifying under it logs into that account." },
|
HelpEntry { cmd: "GROUP", summary: "link this nick to an account", detail: "Syntax: \x02GROUP <account> <password>\x02\nLinks your current nick to an account as an alias, so identifying under it logs into that account." },
|
||||||
HelpEntry { cmd: "GLIST", summary: "list your grouped nicks", detail: "Syntax: \x02GLIST\x02\nLists the nicks grouped to your account." },
|
HelpEntry { cmd: "GLIST", summary: "list your grouped nicks", detail: "Syntax: \x02GLIST\x02\nLists the nicks grouped to your account." },
|
||||||
|
|
|
||||||
|
|
@ -35,6 +35,26 @@ pub fn handle(me: &str, from: &Sender, args: &[&str], ctx: &mut ServiceCtx, db:
|
||||||
Err(_) => ctx.notice(me, from.uid, "Sorry, that didn't work. Please try again in a moment."),
|
Err(_) => ctx.notice(me, from.uid, "Sorry, that didn't work. Please try again in a moment."),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Some("HIDE") => {
|
||||||
|
// Anope grammar is SET HIDE <field> {ON|OFF}. The only field that is
|
||||||
|
// public here is the last-seen/online line (STATUS); USERMASK is an
|
||||||
|
// accepted alias for it.
|
||||||
|
match args.get(2).map(|s| s.to_ascii_uppercase()).as_deref() {
|
||||||
|
Some("STATUS") | Some("USERMASK") => {
|
||||||
|
let Some(on) = args.get(3).and_then(|s| parse_toggle(s)) else {
|
||||||
|
let state = if db.account_hides_status(account) { "ON" } else { "OFF" };
|
||||||
|
ctx.notice(me, from.uid, format!("HIDE STATUS is \x02{state}\x02. Syntax: SET HIDE STATUS {{ON|OFF}}"));
|
||||||
|
return;
|
||||||
|
};
|
||||||
|
match db.set_account_hide_status(account, on) {
|
||||||
|
Ok(()) if on => ctx.notice(me, from.uid, "Your last-seen and online status are now hidden from other users."),
|
||||||
|
Ok(()) => ctx.notice(me, from.uid, "Your last-seen and online status are visible to everyone again."),
|
||||||
|
Err(_) => ctx.notice(me, from.uid, "Sorry, that didn't work. Please try again in a moment."),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_ => ctx.notice(me, from.uid, "Syntax: SET HIDE STATUS {ON|OFF}"),
|
||||||
|
}
|
||||||
|
}
|
||||||
Some("KILL") => {
|
Some("KILL") => {
|
||||||
// Anope accepts ON/QUICK/IMMED/OFF; grace here is a fixed interval, so
|
// Anope accepts ON/QUICK/IMMED/OFF; grace here is a fixed interval, so
|
||||||
// the finer variants simply enable protection like ON.
|
// the finer variants simply enable protection like ON.
|
||||||
|
|
@ -76,7 +96,7 @@ pub fn handle(me: &str, from: &Sender, args: &[&str], ctx: &mut ServiceCtx, db:
|
||||||
Err(_) => ctx.notice(me, from.uid, "Sorry, that didn't work. Please try again in a moment."),
|
Err(_) => ctx.notice(me, from.uid, "Sorry, that didn't work. Please try again in a moment."),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
_ => ctx.notice(me, from.uid, "Syntax: SET PASSWORD <newpassword> | SET EMAIL [address] | SET GREET [message] | SET AUTOOP {ON|OFF} | SET KILL {ON|OFF}"),
|
_ => ctx.notice(me, from.uid, "Syntax: SET PASSWORD <newpassword> | SET EMAIL [address] | SET GREET [message] | SET AUTOOP {ON|OFF} | SET KILL {ON|OFF} | SET HIDE STATUS {ON|OFF}"),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ impl Db {
|
||||||
ajoin: Vec::new(),
|
ajoin: Vec::new(),
|
||||||
suspension: None,
|
suspension: None,
|
||||||
memos: Vec::new(), memo_ignore: Vec::new(), memo_notify: true, memo_limit: None,
|
memos: Vec::new(), memo_ignore: Vec::new(), memo_notify: true, memo_limit: None,
|
||||||
greet: String::new(), no_autoop: false, no_protect: false,
|
greet: String::new(), no_autoop: false, no_protect: false, hide_status: false,
|
||||||
vhost: None,
|
vhost: None,
|
||||||
vhost_request: None,
|
vhost_request: None,
|
||||||
last_seen: now(),
|
last_seen: now(),
|
||||||
|
|
@ -60,7 +60,7 @@ impl Db {
|
||||||
ajoin: Vec::new(),
|
ajoin: Vec::new(),
|
||||||
suspension: None,
|
suspension: None,
|
||||||
memos: Vec::new(), memo_ignore: Vec::new(), memo_notify: true, memo_limit: None,
|
memos: Vec::new(), memo_ignore: Vec::new(), memo_notify: true, memo_limit: None,
|
||||||
greet: String::new(), no_autoop: false, no_protect: false,
|
greet: String::new(), no_autoop: false, no_protect: false, hide_status: false,
|
||||||
vhost: None,
|
vhost: None,
|
||||||
vhost_request: None,
|
vhost_request: None,
|
||||||
last_seen: now(),
|
last_seen: now(),
|
||||||
|
|
@ -450,6 +450,22 @@ impl Db {
|
||||||
self.accounts.get(&key(account)).is_none_or(|a| !a.no_protect)
|
self.accounts.get(&key(account)).is_none_or(|a| !a.no_protect)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Set whether `account` hides its last-seen/online line from other users.
|
||||||
|
pub fn set_account_hide_status(&mut self, account: &str, on: bool) -> Result<(), RegError> {
|
||||||
|
let k = key(account);
|
||||||
|
if !self.accounts.contains_key(&k) {
|
||||||
|
return Err(RegError::Internal);
|
||||||
|
}
|
||||||
|
self.log.append(Event::AccountHideStatusSet { account: account.to_string(), on }).map_err(|_| RegError::Internal)?;
|
||||||
|
self.accounts.get_mut(&k).unwrap().hide_status = on;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Whether `account` hides its last-seen/online line from others (default false).
|
||||||
|
pub fn account_hides_status(&self, account: &str) -> bool {
|
||||||
|
self.accounts.get(&key(account)).is_some_and(|a| a.hide_status)
|
||||||
|
}
|
||||||
|
|
||||||
/// Replace `account`'s password with freshly derived credentials.
|
/// Replace `account`'s password with freshly derived credentials.
|
||||||
pub fn set_credentials(&mut self, account: &str, creds: Credentials) -> Result<(), RegError> {
|
pub fn set_credentials(&mut self, account: &str, creds: Credentials) -> Result<(), RegError> {
|
||||||
let k = key(account);
|
let k = key(account);
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@ pub enum Event {
|
||||||
AccountGreetSet { account: String, greet: String },
|
AccountGreetSet { account: String, greet: String },
|
||||||
AccountAutoOpSet { account: String, on: bool },
|
AccountAutoOpSet { account: String, on: bool },
|
||||||
AccountKillSet { account: String, on: bool },
|
AccountKillSet { account: String, on: bool },
|
||||||
|
AccountHideStatusSet { account: String, on: bool },
|
||||||
AccountPasswordSet { account: String, scram256: String, scram512: String },
|
AccountPasswordSet { account: String, scram256: String, scram512: String },
|
||||||
AccountDropped { account: String },
|
AccountDropped { account: String },
|
||||||
AccountVerified { account: String },
|
AccountVerified { account: String },
|
||||||
|
|
@ -151,6 +152,7 @@ impl Event {
|
||||||
| Event::AccountGreetSet { .. }
|
| Event::AccountGreetSet { .. }
|
||||||
| Event::AccountAutoOpSet { .. }
|
| Event::AccountAutoOpSet { .. }
|
||||||
| Event::AccountKillSet { .. }
|
| Event::AccountKillSet { .. }
|
||||||
|
| Event::AccountHideStatusSet { .. }
|
||||||
| Event::AccountPasswordSet { .. }
|
| Event::AccountPasswordSet { .. }
|
||||||
| Event::AccountDropped { .. }
|
| Event::AccountDropped { .. }
|
||||||
| Event::AccountVerified { .. }
|
| Event::AccountVerified { .. }
|
||||||
|
|
@ -287,6 +289,11 @@ pub(crate) fn apply(accounts: &mut HashMap<String, Account>, channels: &mut Hash
|
||||||
a.no_protect = !on;
|
a.no_protect = !on;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Event::AccountHideStatusSet { account, on } => {
|
||||||
|
if let Some(a) = accounts.get_mut(&key(&account)) {
|
||||||
|
a.hide_status = on;
|
||||||
|
}
|
||||||
|
}
|
||||||
Event::AccountPasswordSet { account, scram256, scram512 } => {
|
Event::AccountPasswordSet { account, scram256, scram512 } => {
|
||||||
if let Some(a) = accounts.get_mut(&key(&account)) {
|
if let Some(a) = accounts.get_mut(&key(&account)) {
|
||||||
a.scram256 = Some(scram256);
|
a.scram256 = Some(scram256);
|
||||||
|
|
|
||||||
|
|
@ -101,6 +101,11 @@ pub struct Account {
|
||||||
// inverted so the default (protection enabled) is the zero value.
|
// inverted so the default (protection enabled) is the zero value.
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
pub no_protect: bool,
|
pub no_protect: bool,
|
||||||
|
// NickServ SET HIDE STATUS: when set, the last-seen / online line in INFO is
|
||||||
|
// shown only to the account's owner and to opers, not to other users. Default
|
||||||
|
// (visible) is the zero value.
|
||||||
|
#[serde(default)]
|
||||||
|
pub hide_status: bool,
|
||||||
// Assigned vhost (HostServ), applied to the displayed host on identify.
|
// Assigned vhost (HostServ), applied to the displayed host on identify.
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
pub vhost: Option<Vhost>,
|
pub vhost: Option<Vhost>,
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,7 @@ impl Store for Db {
|
||||||
verified: a.verified,
|
verified: a.verified,
|
||||||
greet: a.greet.clone(),
|
greet: a.greet.clone(),
|
||||||
last_seen: a.last_seen,
|
last_seen: a.last_seen,
|
||||||
|
hide_status: a.hide_status,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
fn resolve_account(&self, name: &str) -> Option<&str> {
|
fn resolve_account(&self, name: &str) -> Option<&str> {
|
||||||
|
|
@ -20,7 +21,7 @@ impl Store for Db {
|
||||||
fn accounts_matching(&self, pattern: &str) -> Vec<AccountView> {
|
fn accounts_matching(&self, pattern: &str) -> Vec<AccountView> {
|
||||||
self.accounts()
|
self.accounts()
|
||||||
.filter(|a| super::glob_match(pattern, &a.name))
|
.filter(|a| super::glob_match(pattern, &a.name))
|
||||||
.map(|a| AccountView { name: a.name.clone(), email: a.email.clone(), ts: a.ts, verified: a.verified, greet: a.greet.clone(), last_seen: a.last_seen })
|
.map(|a| AccountView { name: a.name.clone(), email: a.email.clone(), ts: a.ts, verified: a.verified, greet: a.greet.clone(), last_seen: a.last_seen, hide_status: a.hide_status })
|
||||||
.collect()
|
.collect()
|
||||||
}
|
}
|
||||||
fn accounts_by_email(&self, pattern: &str) -> Vec<String> {
|
fn accounts_by_email(&self, pattern: &str) -> Vec<String> {
|
||||||
|
|
@ -95,6 +96,12 @@ impl Store for Db {
|
||||||
fn account_wants_protect(&self, account: &str) -> bool {
|
fn account_wants_protect(&self, account: &str) -> bool {
|
||||||
Db::account_wants_protect(self, account)
|
Db::account_wants_protect(self, account)
|
||||||
}
|
}
|
||||||
|
fn set_account_hide_status(&mut self, account: &str, on: bool) -> Result<(), RegError> {
|
||||||
|
Db::set_account_hide_status(self, account, on)
|
||||||
|
}
|
||||||
|
fn account_hides_status(&self, account: &str) -> bool {
|
||||||
|
Db::account_hides_status(self, account)
|
||||||
|
}
|
||||||
fn set_vhost(&mut self, account: &str, host: &str, setter: &str, ttl: Option<u64>) -> Result<(), RegError> {
|
fn set_vhost(&mut self, account: &str, host: &str, setter: &str, ttl: Option<u64>) -> Result<(), RegError> {
|
||||||
Db::set_vhost(self, account, host, setter, ttl)
|
Db::set_vhost(self, account, host, setter, ttl)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@
|
||||||
// which of the two competing registrations we're looking at.
|
// which of the two competing registrations we're looking at.
|
||||||
let alice = |tag: &str, ts: u64, home: &str| Account {
|
let alice = |tag: &str, ts: u64, home: &str| Account {
|
||||||
name: "alice".into(), email: Some(tag.into()),
|
name: "alice".into(), email: Some(tag.into()),
|
||||||
ts, home: home.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, vhost: None, vhost_request: None, last_seen: ts, noexpire: false, expiry_warned: false, oper_note: None,
|
ts, home: home.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: ts, noexpire: false, expiry_warned: false, oper_note: None,
|
||||||
};
|
};
|
||||||
let converge = |first: &Account, second: &Account| {
|
let converge = |first: &Account, second: &Account| {
|
||||||
let (mut acc, mut ch, mut gr, mut bo, mut hc, mut nd) = (HashMap::new(), HashMap::new(), HashMap::new(), HashMap::new(), HostConfig::default(), NetData::default());
|
let (mut acc, mut ch, mut gr, mut bo, mut hc, mut nd) = (HashMap::new(), HashMap::new(), HashMap::new(), HashMap::new(), HostConfig::default(), NetData::default());
|
||||||
|
|
@ -329,7 +329,7 @@
|
||||||
db.register("alice", "pw", None).unwrap();
|
db.register("alice", "pw", None).unwrap();
|
||||||
let bob = Account {
|
let bob = Account {
|
||||||
name: "bob".into(), email: None,
|
name: "bob".into(), email: None,
|
||||||
ts: 0, home: "peer".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, vhost: None, vhost_request: None, last_seen: 0, noexpire: false, expiry_warned: false, oper_note: None,
|
ts: 0, home: "peer".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: 0, noexpire: false, expiry_warned: false, oper_note: None,
|
||||||
};
|
};
|
||||||
let entry = LogEntry { origin: "peer".into(), seq: 0, lamport: 1, event: Event::AccountRegistered(Box::new(bob)) };
|
let entry = LogEntry { origin: "peer".into(), seq: 0, lamport: 1, event: Event::AccountRegistered(Box::new(bob)) };
|
||||||
db.ingest(entry).unwrap();
|
db.ingest(entry).unwrap();
|
||||||
|
|
|
||||||
|
|
@ -1183,7 +1183,7 @@ fn audit_summary(event: &db::Event) -> Option<String> {
|
||||||
format!("{verb} channel \x02{channel}\x02 against expiry")
|
format!("{verb} channel \x02{channel}\x02 against expiry")
|
||||||
}
|
}
|
||||||
// Private, self-service, or cosmetic — not surfaced.
|
// Private, self-service, or cosmetic — not surfaced.
|
||||||
AjoinAdded { .. } | AjoinRemoved { .. } | AccountGreetSet { .. } | AccountAutoOpSet { .. } | AccountKillSet { .. } | VhostRequested { .. }
|
AjoinAdded { .. } | AjoinRemoved { .. } | AccountGreetSet { .. } | AccountAutoOpSet { .. } | AccountKillSet { .. } | AccountHideStatusSet { .. } | VhostRequested { .. }
|
||||||
| VhostRequestCleared { .. } | MemoSent { .. } | MemoRead { .. } | MemoDeleted { .. }
|
| VhostRequestCleared { .. } | MemoSent { .. } | MemoRead { .. } | MemoDeleted { .. }
|
||||||
| MemoIgnoreAdd { .. } | MemoIgnoreDel { .. } | MemoPrefsSet { .. }
|
| MemoIgnoreAdd { .. } | MemoIgnoreDel { .. } | MemoPrefsSet { .. }
|
||||||
| ChannelMlock { .. } | ChannelDescSet { .. } | ChannelEntryMsgSet { .. } | ChannelSettingsSet { .. }
|
| ChannelMlock { .. } | ChannelDescSet { .. } | ChannelEntryMsgSet { .. } | ChannelSettingsSet { .. }
|
||||||
|
|
|
||||||
|
|
@ -411,7 +411,7 @@
|
||||||
// An earlier claim from another node wins and takes the name over.
|
// An earlier claim from another node wins and takes the name over.
|
||||||
let winner = db::Account {
|
let winner = db::Account {
|
||||||
name: "alice".into(), email: None,
|
name: "alice".into(), email: None,
|
||||||
ts: 0, home: "peer".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, vhost: None, vhost_request: None, last_seen: 0, noexpire: false, expiry_warned: false, oper_note: None,
|
ts: 0, home: "peer".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: 0, noexpire: false, expiry_warned: false, oper_note: None,
|
||||||
};
|
};
|
||||||
let entry = LogEntry::for_test("peer", 0, 1, db::Event::AccountRegistered(Box::new(winner)));
|
let entry = LogEntry::for_test("peer", 0, 1, db::Event::AccountRegistered(Box::new(winner)));
|
||||||
e.gossip_ingest(entry).unwrap();
|
e.gossip_ingest(entry).unwrap();
|
||||||
|
|
@ -473,6 +473,39 @@
|
||||||
assert!(notice(&to_ns(&mut e, "ALIST"), "#a"));
|
assert!(notice(&to_ns(&mut e, "ALIST"), "#a"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SET HIDE STATUS keeps the last-seen/online line to the owner and opers.
|
||||||
|
#[test]
|
||||||
|
fn nickserv_set_hide_status() {
|
||||||
|
let path = std::env::temp_dir().join("echo-nshide.jsonl");
|
||||||
|
let _ = std::fs::remove_file(&path);
|
||||||
|
let mut db = Db::open(&path, "test");
|
||||||
|
db.scram_iterations = 4096;
|
||||||
|
db.register("alice", "sesame", None).unwrap();
|
||||||
|
db.register("bob", "hunter2", None).unwrap();
|
||||||
|
let ns = NickServ { uid: "42SAAAAAA".into(), guest_nick: "Guest".into(), guest_seq: 0 };
|
||||||
|
let mut e = Engine::new(vec![Box::new(ns)], db);
|
||||||
|
let send = |e: &mut Engine, uid: &str, text: &str| e.handle(NetEvent::Privmsg { from: uid.into(), to: "42SAAAAAA".into(), text: text.into() });
|
||||||
|
let notice = |out: &[NetAction], needle: &str| out.iter().any(|a| matches!(a, NetAction::Notice { text, .. } if text.contains(needle)));
|
||||||
|
e.handle(NetEvent::UserConnect { uid: "000AAAAAA".into(), nick: "alice".into(), host: "h".into(), ip: "0.0.0.0".into() });
|
||||||
|
send(&mut e, "000AAAAAA", "IDENTIFY sesame");
|
||||||
|
e.handle(NetEvent::UserConnect { uid: "000AAAAAB".into(), nick: "bob".into(), host: "h".into(), ip: "0.0.0.0".into() });
|
||||||
|
send(&mut e, "000AAAAAB", "IDENTIFY hunter2");
|
||||||
|
|
||||||
|
// Default: a stranger (bob) sees alice's last-seen line.
|
||||||
|
assert!(notice(&send(&mut e, "000AAAAAB", "INFO alice"), "Last seen"), "last-seen public by default");
|
||||||
|
|
||||||
|
// alice hides it: strangers lose the line, owner keeps it.
|
||||||
|
assert!(notice(&send(&mut e, "000AAAAAA", "SET HIDE STATUS ON"), "hidden"), "hide confirmed");
|
||||||
|
let stranger = send(&mut e, "000AAAAAB", "INFO alice");
|
||||||
|
assert!(notice(&stranger, "Registered"), "stranger still sees registration: {stranger:?}");
|
||||||
|
assert!(!notice(&stranger, "Last seen"), "stranger no longer sees last-seen: {stranger:?}");
|
||||||
|
assert!(notice(&send(&mut e, "000AAAAAA", "INFO"), "Last seen"), "owner still sees their own last-seen");
|
||||||
|
|
||||||
|
// Turn it off: public again.
|
||||||
|
assert!(notice(&send(&mut e, "000AAAAAA", "SET HIDE STATUS OFF"), "visible"), "unhide confirmed");
|
||||||
|
assert!(notice(&send(&mut e, "000AAAAAB", "INFO alice"), "Last seen"), "last-seen public again");
|
||||||
|
}
|
||||||
|
|
||||||
// SET EMAIL stores an email; SET PASSWORD defers derivation, and once
|
// SET EMAIL stores an email; SET PASSWORD defers derivation, and once
|
||||||
// completed the new password authenticates and the old one no longer does.
|
// completed the new password authenticates and the old one no longer does.
|
||||||
#[test]
|
#[test]
|
||||||
|
|
|
||||||
|
|
@ -130,6 +130,7 @@ fn to_wire(entry: &LogEntry) -> Option<ReplicationEvent> {
|
||||||
| Event::AccountGreetSet { .. }
|
| Event::AccountGreetSet { .. }
|
||||||
| Event::AccountAutoOpSet { .. }
|
| Event::AccountAutoOpSet { .. }
|
||||||
| Event::AccountKillSet { .. }
|
| Event::AccountKillSet { .. }
|
||||||
|
| Event::AccountHideStatusSet { .. }
|
||||||
| Event::AjoinAdded { .. }
|
| Event::AjoinAdded { .. }
|
||||||
| Event::AjoinRemoved { .. }
|
| Event::AjoinRemoved { .. }
|
||||||
| Event::VhostSet { .. }
|
| Event::VhostSet { .. }
|
||||||
|
|
@ -463,7 +464,7 @@ mod tests {
|
||||||
memo_ignore: vec![],
|
memo_ignore: vec![],
|
||||||
memo_notify: true,
|
memo_notify: true,
|
||||||
memo_limit: None,
|
memo_limit: None,
|
||||||
greet: String::new(), no_autoop: false, no_protect: false,
|
greet: String::new(), no_autoop: false, no_protect: false, hide_status: false,
|
||||||
vhost: None,
|
vhost: None,
|
||||||
vhost_request: None,
|
vhost_request: None,
|
||||||
last_seen: 111,
|
last_seen: 111,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue