CEF/ergo
1
0
Fork 0
forked from External/ergo
Code Pull requests Activity

propagate require-sasl into tor-listeners.require-sasl

Browse source
This commit is contained in:
Shivaram Lingamneni 2021-04-26 10:26:16 -04:00
parent 317720bfc8
commit 2d31a16647
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
irc/config.go
View file

@ -1333,6 +1333,12 @@ func LoadConfig(filename string) (config *Config, err error) {
config.Accounts.Registration.AllowBeforeConnect = false config.Accounts.Registration.AllowBeforeConnect = false
} }
if config.Accounts.RequireSasl.Enabled {
// minor gotcha: Tor listeners will typically be loopback and
// therefore exempted from require-sasl. if require-sasl is enabled
// for non-Tor (non-local) connections, enable it for Tor as well:
config.Server.TorListeners.RequireSasl = true
}
config.Accounts.RequireSasl.exemptedNets, err = utils.ParseNetList(config.Accounts.RequireSasl.Exempted) config.Accounts.RequireSasl.exemptedNets, err = utils.ParseNetList(config.Accounts.RequireSasl.Exempted)
if err != nil { if err != nil {
return nil, fmt.Errorf("Could not parse require-sasl exempted nets: %v", err.Error()) return nil, fmt.Errorf("Could not parse require-sasl exempted nets: %v", err.Error())