GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2024-11-10 22:19:31 +01:00
Code Issues Projects Releases Wiki Activity

retain nickname protections after unregistration

Browse Source
This commit is contained in:
Shivaram Lingamneni 2020-03-25 14:46:28 -04:00
parent c238f07543
commit b61d258d0c
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
irc/accounts.go
View File

@ -165,6 +165,24 @@ func (am *AccountManager) buildNickToAccountIndex(config *Config) {
return err return err
}) })
if config.Accounts.NickReservation.Method == NickEnforcementStrict {
unregisteredPrefix := fmt.Sprintf(keyAccountUnregistered, "")
am.server.store.View(func(tx *buntdb.Tx) error {
tx.AscendGreaterOrEqual("", unregisteredPrefix, func(key, value string) bool {
if !strings.HasPrefix(key, unregisteredPrefix) {
return false
}
account := strings.TrimPrefix(key, unregisteredPrefix)
accountName := value
nickToAccount[account] = account
skeleton, _ := Skeleton(accountName)
skeletonToAccount[skeleton] = account
return true
})
return nil
})
}
if err != nil { if err != nil {
am.server.logger.Error("internal", "couldn't read reserved nicks", err.Error()) am.server.logger.Error("internal", "couldn't read reserved nicks", err.Error())
} else { } else {
@ -1113,16 +1131,18 @@ func (am *AccountManager) Unregister(account string, erase bool) error {
var accountName string var accountName string
var channelsStr string var channelsStr string
keepProtections := false
am.server.store.Update(func(tx *buntdb.Tx) error { am.server.store.Update(func(tx *buntdb.Tx) error {
accountName, _ = tx.Get(accountNameKey)
if erase { if erase {
tx.Delete(unregisteredKey) tx.Delete(unregisteredKey)
} else { } else {
if _, err := tx.Get(verifiedKey); err == nil { if _, err := tx.Get(verifiedKey); err == nil {
tx.Set(unregisteredKey, "1", nil) tx.Set(unregisteredKey, accountName, nil)
keepProtections = true
} }
} }
tx.Delete(accountKey) tx.Delete(accountKey)
accountName, _ = tx.Get(accountNameKey)
tx.Delete(accountNameKey) tx.Delete(accountNameKey)
tx.Delete(verifiedKey) tx.Delete(verifiedKey)
tx.Delete(registeredTimeKey) tx.Delete(registeredTimeKey)
@ -1168,8 +1188,11 @@ func (am *AccountManager) Unregister(account string, erase bool) error {
clients = am.accountToClients[casefoldedAccount] clients = am.accountToClients[casefoldedAccount]
delete(am.accountToClients, casefoldedAccount) delete(am.accountToClients, casefoldedAccount)
// protect the account name itself where applicable, but not any grouped nicks
if !(keepProtections && config.Accounts.NickReservation.Method == NickEnforcementStrict) {
delete(am.nickToAccount, casefoldedAccount) delete(am.nickToAccount, casefoldedAccount)
delete(am.skeletonToAccount, skeleton) delete(am.skeletonToAccount, skeleton)
}
for _, nick := range additionalNicks { for _, nick := range additionalNicks {
delete(am.nickToAccount, nick) delete(am.nickToAccount, nick)
additionalSkel, _ := Skeleton(nick) additionalSkel, _ := Skeleton(nick)