sad/soju
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

downstream: inline authenticate function

Browse Source
This commit is contained in:
Simon Ser 2023-04-05 15:43:35 +02:00
parent 53017a7a5c
commit 8637550e68
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
downstream.go
View File

@ -1274,21 +1274,6 @@ func (dc *downstreamConn) setUser(username, clientName, networkName string) erro
return nil return nil
} }
func (dc *downstreamConn) authenticate(ctx context.Context, username, password string) error {
username, clientName, networkName := unmarshalUsername(username)
plainAuth, ok := dc.srv.Config().Auth.(auth.PlainAuthenticator)
if !ok {
return fmt.Errorf("PLAIN authentication unsupported")
}
if err := plainAuth.AuthPlain(ctx, dc.srv.db, username, password); err != nil {
return err
}
return dc.setUser(username, clientName, networkName)
}
func (dc *downstreamConn) register(ctx context.Context) error { func (dc *downstreamConn) register(ctx context.Context) error {
if dc.registered { if dc.registered {
panic("tried to register twice") panic("tried to register twice")
@ -1319,13 +1304,26 @@ func (dc *downstreamConn) register(ctx context.Context) error {
} }
} }
if err := dc.authenticate(ctx, dc.registration.username, password); err != nil { plainAuth, ok := dc.srv.Config().Auth.(auth.PlainAuthenticator)
if !ok {
return ircError{&irc.Message{
Command: irc.ERR_PASSWDMISMATCH,
Params: []string{dc.nick, "PASS authentication disabled"},
}}
}
username, clientName, networkName := unmarshalUsername(dc.registration.username)
if err := plainAuth.AuthPlain(ctx, dc.srv.db, username, password); err != nil {
dc.logger.Printf("PASS authentication error for user %q: %v", dc.registration.username, err) dc.logger.Printf("PASS authentication error for user %q: %v", dc.registration.username, err)
return ircError{&irc.Message{ return ircError{&irc.Message{
Command: irc.ERR_PASSWDMISMATCH, Command: irc.ERR_PASSWDMISMATCH,
Params: []string{dc.nick, authErrorReason(err)}, Params: []string{dc.nick, authErrorReason(err)},
}} }}
} }
if err := dc.setUser(username, clientName, networkName); err != nil {
return err
}
} }
_, fallbackClientName, fallbackNetworkName := unmarshalUsername(dc.registration.username) _, fallbackClientName, fallbackNetworkName := unmarshalUsername(dc.registration.username)