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

Merge pull request #2032 from slingamn/scram.1

Browse Source 
recommended default: advertise SCRAM
This commit is contained in:
Shivaram Lingamneni 2023-01-15 04:16:28 -08:00 committed by GitHub
commit b2087977d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
default.yaml
View File

@ -450,6 +450,10 @@ accounts:
# this is useful for compatibility with old clients that don't support SASL # this is useful for compatibility with old clients that don't support SASL
login-via-pass-command: true login-via-pass-command: true
# advertise the SCRAM-SHA-256 authentication method. set to false in case of
# compatibility issues with certain clients:
advertise-scram: true
# require-sasl controls whether clients are required to have accounts # require-sasl controls whether clients are required to have accounts
# (and sign into them using SASL) to connect to the server # (and sign into them using SASL) to connect to the server
require-sasl: require-sasl:

3
irc/config.go
View File

@ -303,7 +303,7 @@ func (t *ThrottleConfig) UnmarshalYAML(unmarshal func(interface{}) error) (err e
type AccountConfig struct { type AccountConfig struct {
Registration AccountRegistrationConfig Registration AccountRegistrationConfig
AuthenticationEnabled bool `yaml:"authentication-enabled"` AuthenticationEnabled bool `yaml:"authentication-enabled"`
AdvertiseSCRAM bool `yaml:"advertise-scram"` // undocumented, see #1782 AdvertiseSCRAM bool `yaml:"advertise-scram"`
RequireSasl struct { RequireSasl struct {
Enabled bool Enabled bool
Exempted []string Exempted []string
@ -1390,7 +1390,6 @@ func LoadConfig(filename string) (config *Config, err error) {
} }
saslCapValue := "PLAIN,EXTERNAL,SCRAM-SHA-256" saslCapValue := "PLAIN,EXTERNAL,SCRAM-SHA-256"
// TODO(#1782) clean this up:
if !config.Accounts.AdvertiseSCRAM { if !config.Accounts.AdvertiseSCRAM {
saslCapValue = "PLAIN,EXTERNAL" saslCapValue = "PLAIN,EXTERNAL"
} }

4
traditional.yaml
View File

@ -423,6 +423,10 @@ accounts:
# this is useful for compatibility with old clients that don't support SASL # this is useful for compatibility with old clients that don't support SASL
login-via-pass-command: false login-via-pass-command: false
# advertise the SCRAM-SHA-256 authentication method. set to false in case of
# compatibility issues with certain clients:
advertise-scram: true
# require-sasl controls whether clients are required to have accounts # require-sasl controls whether clients are required to have accounts
# (and sign into them using SASL) to connect to the server # (and sign into them using SASL) to connect to the server
require-sasl: require-sasl: