External/ergo
1
0
Fork 1
mirror of https://github.com/ergochat/ergo.git synced 2025-12-20 02:00:11 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix #1050

Browse source
This commit is contained in:
Shivaram Lingamneni 2020-06-21 15:46:08 -04:00
parent 4cadb7ad58
commit 01bd04a8ff
6 changed files with 45 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

32
irc/gateways.go
View file

@ -26,31 +26,39 @@ const (
)
type webircConfig struct {
PasswordString string `yaml:"password"`
Password []byte `yaml:"password-bytes"`
Fingerprint string
PasswordString string `yaml:"password"`
Password []byte `yaml:"password-bytes"`
Fingerprint *string // legacy name for certfp, #1050
Certfp string
Hosts []string
allowedNets []net.IPNet
}
// Populate fills out our password or fingerprint.
func (wc *webircConfig) Populate() (err error) {
if wc.Fingerprint == "" && wc.PasswordString == "" {
err = ErrNoFingerprintOrPassword
}
if err == nil && wc.PasswordString != "" {
if wc.PasswordString != "" {
wc.Password, err = decodeLegacyPasswordHash(wc.PasswordString)
if err != nil {
return
}
}
if err == nil && wc.Fingerprint != "" {
wc.Fingerprint, err = utils.NormalizeCertfp(wc.Fingerprint)
certfp := wc.Certfp
if certfp == "" && wc.Fingerprint != nil {
certfp = *wc.Fingerprint
}
if certfp != "" {
wc.Certfp, err = utils.NormalizeCertfp(certfp)
}
if err != nil {
return
}
if err == nil {
wc.allowedNets, err = utils.ParseNetList(wc.Hosts)
if wc.Certfp == "" && wc.PasswordString == "" {
return ErrNoFingerprintOrPassword
}
wc.allowedNets, err = utils.ParseNetList(wc.Hosts)
return err
}