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

Merge pull request #1138 from slingamn/deviceid

Browse Source 
read device ID from SASL as well
This commit is contained in:
Shivaram Lingamneni 2020-06-16 02:02:59 -07:00 committed by GitHub
commit 4edf7516eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
irc/handlers.go
View File

@ -241,6 +241,9 @@ func authPlainHandler(server *Server, client *Client, mechanism string, value []
// distinguish user/ident from account name // distinguish user/ident from account name
if strudelIndex := strings.IndexByte(authcid, '@'); strudelIndex != -1 { if strudelIndex := strings.IndexByte(authcid, '@'); strudelIndex != -1 {
authcid = authcid[:strudelIndex] authcid = authcid[:strudelIndex]
if !client.registered {
rb.session.deviceID = authcid[strudelIndex+1:]
}
} }
password := string(splitValue[2]) password := string(splitValue[2])
err := server.accounts.AuthenticateByPassphrase(client, authcid, password) err := server.accounts.AuthenticateByPassphrase(client, authcid, password)
@ -294,6 +297,9 @@ func authExternalHandler(server *Server, client *Client, mechanism string, value
// distinguish user/ident from account name // distinguish user/ident from account name
if strudelIndex := strings.IndexByte(authzid, '@'); strudelIndex != -1 { if strudelIndex := strings.IndexByte(authzid, '@'); strudelIndex != -1 {
authzid = authzid[:strudelIndex] authzid = authzid[:strudelIndex]
if !client.registered {
rb.session.deviceID = authzid[strudelIndex+1:]
}
} }
err = server.accounts.AuthenticateByCertFP(client, rb.session.certfp, authzid) err = server.accounts.AuthenticateByCertFP(client, rb.session.certfp, authzid)
} }