From d13f58acf02220ceec8521cfd2c9c5d9111918e4 Mon Sep 17 00:00:00 2001 From: Shivaram Lingamneni Date: Mon, 25 Feb 2019 22:56:08 -0500 Subject: [PATCH] review fixes --- irc/client.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/irc/client.go b/irc/client.go index 2752ea76..898feadc 100644 --- a/irc/client.go +++ b/irc/client.go @@ -205,11 +205,11 @@ func (client *Client) doIdentLookup(conn net.Conn) { func (client *Client) isAuthorized(config *Config) bool { saslSent := client.account != "" // 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 } // 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 } // finally, enforce require-sasl