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

smtpsrv: Clean up post-data hook tracing output

Browse Source 
This patch does some cleanups on the tracing output for the post-data
hook, to quote the output better and more consistently.
This commit is contained in:
Alberto Bertogli
2019-10-22 21:29:19 +01:00
parent 5782a7705e
commit 5f72f723db
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/smtpsrv/conn.go
View File

@@ -741,7 +741,6 @@ func (c *Conn) runPostDataHook(data []byte) ([]byte, bool, error) {
} }
tr := trace.New("Hook.Post-DATA", c.conn.RemoteAddr().String()) tr := trace.New("Hook.Post-DATA", c.conn.RemoteAddr().String())
defer tr.Finish() defer tr.Finish()
tr.Debugf("running")
ctx, cancel := context.WithTimeout(context.Background(), 1*time.Minute) ctx, cancel := context.WithTimeout(context.Background(), 1*time.Minute)
defer cancel() defer cancel()
@@ -769,14 +768,14 @@ func (c *Conn) runPostDataHook(data []byte) ([]byte, bool, error) {
cmd.Env = append(cmd.Env, "SPF_PASS="+boolToStr(c.spfResult == spf.Pass)) cmd.Env = append(cmd.Env, "SPF_PASS="+boolToStr(c.spfResult == spf.Pass))
out, err := cmd.Output() out, err := cmd.Output()
tr.Debugf("stdout: %q", out)
if err != nil { if err != nil {
hookResults.Add("post-data:fail", 1) hookResults.Add("post-data:fail", 1)
tr.Error(err) tr.Error(err)
tr.Debugf("stdout: %s", out)
permanent := false permanent := false
if ee, ok := err.(*exec.ExitError); ok { if ee, ok := err.(*exec.ExitError); ok {
tr.Printf("stderr: %s", string(ee.Stderr)) tr.Printf("stderr: %q", string(ee.Stderr))
if status, ok := ee.Sys().(syscall.WaitStatus); ok { if status, ok := ee.Sys().(syscall.WaitStatus); ok {
permanent = status.ExitStatus() == 20 permanent = status.ExitStatus() == 20
} }
@@ -792,12 +791,11 @@ func (c *Conn) runPostDataHook(data []byte) ([]byte, bool, error) {
// contents. If it does not, just skip it. // contents. If it does not, just skip it.
if !isHeader(out) { if !isHeader(out) {
hookResults.Add("post-data:badoutput", 1) hookResults.Add("post-data:badoutput", 1)
tr.Errorf("error parsing post-data output: '%s'", out) tr.Errorf("error parsing post-data output: %q", out)
return nil, false, nil return nil, false, nil
} }
tr.Debugf("success") tr.Debugf("success")
tr.Debugf("stdout: %s", out)
hookResults.Add("post-data:success", 1) hookResults.Add("post-data:success", 1)
return out, false, nil return out, false, nil
} }