mirror of
https://github.com/mjl-/mox.git
synced 2025-07-12 18:24:35 +03:00
expose fewer internals in packages, for easier software reuse
- prometheus is now behind an interface, they aren't dependencies for the reusable components anymore. - some dependencies have been inverted: instead of packages importing a main package to get configuration, the main package now sets configuration in these packages. that means fewer internals are pulled in. - some functions now have new parameters for values that were retrieved from package "mox-".
This commit is contained in:
@ -688,15 +688,14 @@ func composeMessage(ctx context.Context, log mlog.Log, mf *os.File, policyDomain
|
||||
|
||||
xc.Flush()
|
||||
|
||||
selectors := map[string]config.Selector{}
|
||||
for name, sel := range confDKIM.Selectors {
|
||||
selectors := mox.DKIMSelectors(confDKIM)
|
||||
for i, sel := range selectors {
|
||||
// Also sign the TLS-Report headers. ../rfc/8460:940
|
||||
sel.HeadersEffective = append(append([]string{}, sel.HeadersEffective...), "TLS-Report-Domain", "TLS-Report-Submitter")
|
||||
selectors[name] = sel
|
||||
sel.Headers = append(append([]string{}, sel.Headers...), "TLS-Report-Domain", "TLS-Report-Submitter")
|
||||
selectors[i] = sel
|
||||
}
|
||||
confDKIM.Selectors = selectors
|
||||
|
||||
dkimHeader, err := dkim.Sign(ctx, log.Logger, fromAddr.Localpart, fromAddr.Domain, confDKIM, smtputf8, mf)
|
||||
dkimHeader, err := dkim.Sign(ctx, log.Logger, fromAddr.Localpart, fromAddr.Domain, selectors, smtputf8, mf)
|
||||
xc.Checkf(err, "dkim-signing report message")
|
||||
|
||||
return dkimHeader, xc.Has8bit, xc.SMTPUTF8, messageID, nil
|
||||
|
Reference in New Issue
Block a user