GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2024-12-23 03:02:48 +01:00
Code Issues Projects Releases Wiki Activity

review fixes

Browse Source
This commit is contained in:
Shivaram Lingamneni 2019-02-25 22:56:08 -05:00
parent b0f89062fa
commit d13f58acf0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
irc/client.go
View File

@ -205,11 +205,11 @@ func (client *Client) doIdentLookup(conn net.Conn) {
func (client *Client) isAuthorized(config *Config) bool { func (client *Client) isAuthorized(config *Config) bool {
saslSent := client.account != "" saslSent := client.account != ""
// PASS requirement // PASS requirement
if !((config.Server.passwordBytes == nil) || client.sentPassCommand || (config.Accounts.SkipServerPassword && saslSent)) { if (config.Server.passwordBytes != nil) && !client.sentPassCommand && !(config.Accounts.SkipServerPassword && saslSent) {
return false return false
} }
// Tor connections may be required to authenticate with SASL // Tor connections may be required to authenticate with SASL
if config.Server.TorListeners.RequireSasl && !saslSent { if client.isTor && config.Server.TorListeners.RequireSasl && !saslSent {
return false return false
} }
// finally, enforce require-sasl // finally, enforce require-sasl