GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2026-03-14 03:08:11 +01:00
Code Issues Projects Releases Wiki Activity

remove defer in AuthenticateByCertificate (#2355)

Browse Source 
Makes the control flow unnecessarily confusing now that the check
is its own function.
This commit is contained in:
Shivaram Lingamneni 2026-03-12 09:58:29 -07:00 committed by GitHub
parent 4e65b76c67
commit 1b673f049f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
irc/accounts.go
View File

@ -2035,25 +2035,18 @@ func (am *AccountManager) AuthenticateByCertificate(client *Client, certfp strin
return errAccountInvalidCredentials
}
var clientAccount ClientAccount
defer func() {
if err != nil {
clientAccount, err := am.checkCertAuth(client.IP(), certfp, peerCerts, authzid)
if err != nil {
return
}
if client.registered {
if clientAlready := am.server.clients.Get(clientAccount.Name); clientAlready != nil && clientAlready.AlwaysOn() {
err = errNickAccountMismatch
return
}
// TODO(#1109) clean this check up?
if client.registered {
if clientAlready := am.server.clients.Get(clientAccount.Name); clientAlready != nil && clientAlready.AlwaysOn() {
err = errNickAccountMismatch
return
}
}
am.Login(client, clientAccount)
return
}()
clientAccount, err = am.checkCertAuth(client.IP(), certfp, peerCerts, authzid)
return err
}
am.Login(client, clientAccount)
return
}
func (am *AccountManager) checkCertAuth(ip net.IP, certfp string, peerCerts []*x509.Certificate, authzid string) (clientAccount ClientAccount, err error) {