mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-01 23:29:12 +01:00
073cc891c6
The keys for setting the username and password for incoming and outgoing mail are inconsisent: one uses `USERNAME` and `PASSWORD`, the other uses `USER` and `PASSWD`. To make things simpler, allow both to be configured by either, thus, `[mailer].USERNAME` and `[mailer.PASSWORD]` will be aliases for `.USER` and `.PASSWD`, and similarly, `[email.incoming].USER` and `[email.incoming].PASSWD` will be aliases for `.USERNAME` and `.PASSWORD`. Fixes #3355. Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
54 lines
1.3 KiB
Go
54 lines
1.3 KiB
Go
// Copyright 2022 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package setting
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func Test_loadMailerFrom(t *testing.T) {
|
|
kases := map[string]*Mailer{
|
|
"smtp.mydomain.com": {
|
|
SMTPAddr: "smtp.mydomain.com",
|
|
SMTPPort: "465",
|
|
},
|
|
"smtp.mydomain.com:123": {
|
|
SMTPAddr: "smtp.mydomain.com",
|
|
SMTPPort: "123",
|
|
},
|
|
":123": {
|
|
SMTPAddr: "127.0.0.1",
|
|
SMTPPort: "123",
|
|
},
|
|
}
|
|
for host, kase := range kases {
|
|
t.Run(host, func(t *testing.T) {
|
|
cfg, _ := NewConfigProviderFromData("")
|
|
sec := cfg.Section("mailer")
|
|
sec.NewKey("ENABLED", "true")
|
|
sec.NewKey("HOST", host)
|
|
|
|
// Check mailer setting
|
|
loadMailerFrom(cfg)
|
|
|
|
assert.EqualValues(t, kase.SMTPAddr, MailService.SMTPAddr)
|
|
assert.EqualValues(t, kase.SMTPPort, MailService.SMTPPort)
|
|
})
|
|
}
|
|
|
|
t.Run("property aliases", func(t *testing.T) {
|
|
cfg, _ := NewConfigProviderFromData("")
|
|
sec := cfg.Section("mailer")
|
|
sec.NewKey("ENABLED", "true")
|
|
sec.NewKey("USERNAME", "jane.doe@example.com")
|
|
sec.NewKey("PASSWORD", "y0u'll n3v3r gUess th1S!!1")
|
|
|
|
loadMailerFrom(cfg)
|
|
|
|
assert.EqualValues(t, "jane.doe@example.com", MailService.User)
|
|
assert.EqualValues(t, "y0u'll n3v3r gUess th1S!!1", MailService.Passwd)
|
|
})
|
|
}
|