Mirrors/go-chasquid-smtp
1
0
Fork 0
mirror of https://blitiri.com.ar/repos/chasquid synced 2025-12-18 14:47:03 +00:00
Code Releases Activity

queue: Always use the main domain for sending DSNs

Browse Source 
Today, we pick the domain used to send the DSN from based on what we
presented to the client at EHLO time, which itself may be based on the
TLS negotiation (which is not necessarily trusted).

This is complex, not necessarily correct, and involves passing the
domain around through the queue and persisting it in the items.

So this patch simplifies that handling by always using the main domain
as specified by the configuration.
This commit is contained in:
Alberto Bertogli
2016-10-13 12:08:21 +01:00
parent b8c0ac98f4
commit fe146f00e5
8 changed files with 54 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
internal/queue/queue.go
View File

@@ -105,11 +105,14 @@ type Queue struct {
// Aliases resolver.
aliases *aliases.Resolver
// Domain we use to send delivery status notifications from.
dsnDomain string
}
// Load the queue and launch the sending loops on startup.
// New creates a new Queue instance.
func New(path string, localDomains *set.String, aliases *aliases.Resolver,
localC, remoteC courier.Courier) *Queue {
localC, remoteC courier.Courier, dsnDomain string) *Queue {
os.MkdirAll(path, 0700)
@@ -120,9 +123,11 @@ func New(path string, localDomains *set.String, aliases *aliases.Resolver,
localDomains: localDomains,
path: path,
aliases: aliases,
dsnDomain: dsnDomain,
}
}
// Load the queue and launch the sending loops on startup.
func (q *Queue) Load() error {
files, err := filepath.Glob(q.path + "/" + itemFilePrefix + "*")
if err != nil {
@@ -153,7 +158,7 @@ func (q *Queue) Len() int {
}
// Put an envelope in the queue.
func (q *Queue) Put(hostname, from string, to []string, data []byte) (string, error) {
func (q *Queue) Put(from string, to []string, data []byte) (string, error) {
if q.Len() >= maxQueueSize {
return "", errQueueFull
}
@@ -161,10 +166,9 @@ func (q *Queue) Put(hostname, from string, to []string, data []byte) (string, er
item := &Item{
Message: Message{
ID: <-newID,
From: from,
Data: data,
Hostname: hostname,
ID: <-newID,
From: from,
Data: data,
},
CreatedAt: time.Now(),
}
@@ -423,13 +427,13 @@ func (item *Item) countRcpt(status Recipient_Status) int {
func sendDSN(tr *trace.Trace, q *Queue, item *Item) {
tr.Debugf("sending DSN")
msg, err := deliveryStatusNotification(item)
msg, err := deliveryStatusNotification(q.dsnDomain, item)
if err != nil {
tr.Errorf("failed to build DSN: %v", err)
return
}
id, err := q.Put(item.Hostname, "<>", []string{item.From}, msg)
id, err := q.Put("<>", []string{item.From}, msg)
if err != nil {
tr.Errorf("failed to queue DSN: %v", err)
return