1 parent
d2f14ede7a
commit
cfe4401b70
32 files changed
+893
-318
No files matched your search
@@ -352,6 +352,8 @@ func configSectionFromPath(path string) (config.Section, bool) {
|
||||
switch parts[3] {
|
||||
case "base":
|
||||
return config.SectionRoot, true
|
||||
case "mail":
|
||||
return config.SectionMail, true
|
||||
case "smtp":
|
||||
return config.SectionSMTP, true
|
||||
case "email":
|
||||
@@ -461,6 +463,27 @@ func publicConfigSection(runtime config.RuntimeConfig, section config.Section) (
|
||||
},
|
||||
"relayPasswordStatus": publicSecret(runtime.SMTP.Relay.Password),
|
||||
}, nil
|
||||
case config.SectionMail:
|
||||
ports := config.ResolveMailPorts(runtime.SMTP, runtime.Email)
|
||||
return map[string]any{
|
||||
"meta": runtime.SMTP.Meta,
|
||||
"listener": config.SMTPListenerConfig{Port: ports.SMTP, STARTTLSPort: ports.SMTPSTARTTLS, TLSPort: ports.SMTPTLS},
|
||||
"relay": map[string]any{
|
||||
"relayHost": runtime.SMTP.Relay.RelayHost,
|
||||
"relayPort": runtime.SMTP.Relay.RelayPort,
|
||||
"username": runtime.SMTP.Relay.Username,
|
||||
"security": runtime.SMTP.Relay.Security,
|
||||
"from": runtime.SMTP.Relay.From,
|
||||
"fromDomain": runtime.SMTP.Relay.FromDomain,
|
||||
"verificationEnabled": runtime.SMTP.Relay.VerificationEnabled,
|
||||
"loginPolicy": runtime.SMTP.Relay.LoginPolicy,
|
||||
"password": nil,
|
||||
},
|
||||
"imap": config.IMAPListenerConfig{TLSPort: ports.IMAP},
|
||||
"pop3": config.POP3ListenerConfig{Port: ports.POP3, TLSPort: ports.POP3TLS},
|
||||
"policy": runtime.Email.Policy,
|
||||
"relayPasswordStatus": publicSecret(runtime.SMTP.Relay.Password),
|
||||
}, nil
|
||||
case config.SectionEmail:
|
||||
ports := config.ResolveMailPorts(runtime.SMTP, runtime.Email)
|
||||
value := runtime.Email
|
||||
|
||||
@@ -20,6 +20,30 @@ func TestPublicMailPortsMatchListenersWithoutChangingSnapshot(t *testing.T) {
|
||||
}
|
||||
before := runtime.Email
|
||||
want := config.ResolveMailPorts(runtime.SMTP, runtime.Email)
|
||||
mailPublic, err := publicConfigSection(runtime, config.SectionMail)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
mailData, err := json.Marshal(mailPublic)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
var writableMail map[string]json.RawMessage
|
||||
if err := json.Unmarshal(mailData, &writableMail); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
delete(writableMail, "relayPasswordStatus")
|
||||
mailData, err = json.Marshal(writableMail)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
var mail config.MailSectionConfig
|
||||
if err := config.ParseStrict(mailData, &mail); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if mail.Listener.Port != want.SMTP || mail.Listener.STARTTLSPort != want.SMTPSTARTTLS || mail.Listener.TLSPort != want.SMTPTLS || mail.IMAP.TLSPort != want.IMAP || mail.POP3.Port != want.POP3 || mail.POP3.TLSPort != want.POP3TLS {
|
||||
t.Fatal("combined public mail ports differ from listener configuration")
|
||||
}
|
||||
smtpPublic, err := publicConfigSection(runtime, config.SectionSMTP)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
|
||||
@@ -63,6 +63,10 @@ func TestPublicConfigSectionsDoNotExposeSecretsAndRemainStrictlyDecodable(t *tes
|
||||
var value config.SMTPSectionConfig
|
||||
return config.ParseStrict(data, &value)
|
||||
}},
|
||||
{config.SectionMail, func(data []byte) error {
|
||||
var value config.MailSectionConfig
|
||||
return config.ParseStrict(data, &value)
|
||||
}},
|
||||
{config.SectionEmail, func(data []byte) error {
|
||||
var value config.EmailSectionConfig
|
||||
return config.ParseStrict(data, &value)
|
||||
@@ -90,12 +94,24 @@ func TestPublicConfigSectionsDoNotExposeSecretsAndRemainStrictlyDecodable(t *tes
|
||||
if strings.Contains(string(data), "database-secret") || strings.Contains(string(data), "relay-secret") {
|
||||
t.Fatalf("public configuration contains secret data: %s", data)
|
||||
}
|
||||
if strings.Contains(string(data), "enc:v1:") {
|
||||
t.Fatalf("public configuration contains encrypted secret material: %s", data)
|
||||
}
|
||||
writableData := make(map[string]json.RawMessage)
|
||||
if err := json.Unmarshal(data, &writableData); err != nil {
|
||||
t.Fatalf("public configuration is not a JSON object: %v", err)
|
||||
}
|
||||
delete(writableData, "databasePasswordStatus")
|
||||
delete(writableData, "relayPasswordStatus")
|
||||
if test.section == config.SectionMail {
|
||||
var relay map[string]json.RawMessage
|
||||
if err := json.Unmarshal(writableData["relay"], &relay); err != nil {
|
||||
t.Fatalf("mail relay public configuration is not an object: %v", err)
|
||||
}
|
||||
if password, ok := relay["password"]; !ok || string(password) != "null" {
|
||||
t.Fatalf("mail relay password placeholder is invalid: %s", password)
|
||||
}
|
||||
}
|
||||
if test.section == config.SectionPlugins {
|
||||
var plugins map[string]json.RawMessage
|
||||
if err := json.Unmarshal(writableData["plugins"], &plugins); err != nil {
|
||||
|
||||
Reference in new issue
Block a user