mirror of
https://github.com/ergochat/ergo.git
synced 2024-11-26 05:49:25 +01:00
unregister should boot clients if sasl is required
This commit is contained in:
parent
9ce1d31b90
commit
754934b429
@ -834,6 +834,7 @@ func (am *AccountManager) loadRawAccount(tx *buntdb.Tx, casefoldedAccount string
|
||||
}
|
||||
|
||||
func (am *AccountManager) Unregister(account string) error {
|
||||
config := am.server.Config()
|
||||
casefoldedAccount, err := CasefoldName(account)
|
||||
if err != nil {
|
||||
return errAccountDoesNotExist
|
||||
@ -906,8 +907,14 @@ func (am *AccountManager) Unregister(account string) error {
|
||||
delete(am.skeletonToAccount, additionalSkel)
|
||||
}
|
||||
for _, client := range clients {
|
||||
if config.Accounts.RequireSasl.Enabled {
|
||||
client.Quit(client.t("You are no longer authorized to be on this server"))
|
||||
// destroy acquires a semaphore so we can't call it while holding a lock
|
||||
go client.destroy(false)
|
||||
} else {
|
||||
am.logoutOfAccount(client)
|
||||
}
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
return errAccountDoesNotExist
|
||||
|
@ -452,10 +452,6 @@ func nsUnregisterHandler(server *Server, client *Client, command string, params
|
||||
return
|
||||
}
|
||||
|
||||
if cfname == client.Account() {
|
||||
client.server.accounts.Logout(client)
|
||||
}
|
||||
|
||||
err = server.accounts.Unregister(cfname)
|
||||
if err == errAccountDoesNotExist {
|
||||
nsNotice(rb, client.t(err.Error()))
|
||||
|
Loading…
Reference in New Issue
Block a user