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

Add tracing annotations

Browse Source 
This patch changes several internal packages to receive and pass tracing
annotations, making use of the new tracing library, so we can have
better debugging information.
This commit is contained in:
Alberto Bertogli
2022-03-07 01:43:58 +00:00
parent 9c6661eca2
commit 4a00a83c23
15 changed files with 151 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
internal/smtpsrv/conn.go
View File

@@ -488,8 +488,13 @@ func (c *Conn) checkSPF(addr string) (spf.Result, error) {
}
if tcp, ok := c.remoteAddr.(*net.TCPAddr); ok {
spfTr := c.tr.NewChild("SPF", tcp.IP.String())
defer spfTr.Finish()
res, err := spf.CheckHostWithSender(
tcp.IP, envelope.DomainOf(addr), addr)
tcp.IP, envelope.DomainOf(addr), addr,
spf.WithTraceFunc(func(f string, a ...interface{}) {
spfTr.Debugf(f, a...)
}))
c.tr.Debugf("SPF %v (%v)", res, err)
spfResultCount.Add(string(res), 1)
@@ -519,7 +524,7 @@ func (c *Conn) secLevelCheck(addr string) bool {
level = domaininfo.SecLevel_TLS_CLIENT
}
ok := c.dinfo.IncomingSecLevel(domain, level)
ok := c.dinfo.IncomingSecLevel(c.tr, domain, level)
if ok {
slcResults.Add("pass", 1)
c.tr.Debugf("security level check for %s passed (%s)", domain, level)
@@ -671,7 +676,7 @@ func (c *Conn) DATA(params string) (code int, msg string) {
// There are no partial failures here: we put it in the queue, and then if
// individual deliveries fail, we report via email.
// If we fail to queue, return a transient error.
msgID, err := c.queue.Put(c.mailFrom, c.rcptTo, c.data)
msgID, err := c.queue.Put(c.tr, c.mailFrom, c.rcptTo, c.data)
if err != nil {
return 451, fmt.Sprintf("4.3.0 Failed to queue message: %v", err)
}
@@ -1065,7 +1070,7 @@ func (c *Conn) AUTH(params string) (code int, msg string) {
}
// https://tools.ietf.org/html/rfc4954#section-6
authOk, err := c.authr.Authenticate(user, domain, passwd)
authOk, err := c.authr.Authenticate(c.tr, user, domain, passwd)
if err != nil {
c.tr.Errorf("error authenticating %q@%q: %v", user, domain, err)
maillog.Auth(c.remoteAddr, user+"@"+domain, false)
@@ -1093,7 +1098,7 @@ func (c *Conn) resetEnvelope() {
func (c *Conn) userExists(addr string) (bool, error) {
var ok bool
addr, ok = c.aliasesR.Exists(addr)
addr, ok = c.aliasesR.Exists(c.tr, addr)
if ok {
return true, nil
}
@@ -1103,7 +1108,7 @@ func (c *Conn) userExists(addr string) (bool, error) {
// look up "user" in our databases if the domain is local, which is what
// we want.
user, domain := envelope.Split(addr)
return c.authr.Exists(user, domain)
return c.authr.Exists(c.tr, user, domain)
}
func (c *Conn) readCommand() (cmd, params string, err error) {