mirror of
https://github.com/ergochat/ergo.git
synced 2024-11-29 07:29:31 +01:00
Merge pull request #1636 from slingamn/tor_require_sasl
propagate require-sasl into tor-listeners.require-sasl
This commit is contained in:
commit
5c157adf45
@ -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())
|
||||||
|
Loading…
Reference in New Issue
Block a user