mirrors/maddy
1
0
Fork 0
mirror of https://github.com/foxcpp/maddy.git synced 2025-04-07 06:57:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

msgpipeline: Fix to use Raw from go-message 0.12

Browse source
This commit is contained in:
fox.cpp 2020-05-31 14:33:34 +03:00
parent 4498462abb
commit e85e6b24bd
No known key found for this signature in database
GPG key ID: 5B991F6215D2FCC0
3 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
go.mod
View file

@ -13,7 +13,7 @@ require (
github.com/emersion/go-imap-move v0.0.0-20190710073258-6e5a51a5b342
github.com/emersion/go-imap-specialuse v0.0.0-20161227184202-ba031ced6a62
github.com/emersion/go-imap-unselect v0.0.0-20171113212723-b985794e5f26
github.com/emersion/go-message v0.11.3-0.20200429151259-c5125629c3f8
github.com/emersion/go-message v0.12.0
github.com/emersion/go-milter v0.1.1-0.20200513090417-c3e74efc8df9
github.com/emersion/go-msgauth v0.4.1-0.20200429175443-e4c87369d72f
github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21

2
go.sum
View file

@ -39,6 +39,8 @@ github.com/emersion/go-message v0.11.2 h1:oxO9SQ+3wgBAQRdk07eqfkCJ26Tl8ZHF7CcpGV
github.com/emersion/go-message v0.11.2/go.mod h1:C4jnca5HOTo4bGN9YdqNQM9sITuT3Y0K6bSUw9RklvY=
github.com/emersion/go-message v0.11.3-0.20200429151259-c5125629c3f8 h1:FiBAeT0Qr/4qr/qlr6tvOmeKggwiWTyNqWl3u9vicWk=
github.com/emersion/go-message v0.11.3-0.20200429151259-c5125629c3f8/go.mod h1:C4jnca5HOTo4bGN9YdqNQM9sITuT3Y0K6bSUw9RklvY=
github.com/emersion/go-message v0.12.0 h1:mZnv35eZ6lB6EftTQBgYXspOH0FQdhpFhSUhA9i6/Zg=
github.com/emersion/go-message v0.12.0/go.mod h1:C4jnca5HOTo4bGN9YdqNQM9sITuT3Y0K6bSUw9RklvY=
github.com/emersion/go-milter v0.0.0-20190311184326-c3095a41a6fe/go.mod h1:aEaq7U51ARlk+2UeXTtdrDYeYWAUn/QjEwWzs7lD8OU=
github.com/emersion/go-milter v0.1.1-0.20200513090417-c3e74efc8df9 h1:8eIuvmSjG0aIbHbe8u4anq+oPAmLl+u4RwMqzcuYyuA=
github.com/emersion/go-milter v0.1.1-0.20200513090417-c3e74efc8df9/go.mod h1:ablHK0pbLB83kMFBznp/Rj8aV+Kc3jw8cxzzmCNLIOY=

12
internal/msgpipeline/check_runner.go
View file

@ -171,7 +171,11 @@ func (cr *checkRunner) runAndMergeResults(states []module.CheckState, runner fun
if subCheckRes.Header.Len() != 0 {
data.headerLock.Lock()
for field := subCheckRes.Header.Fields(); field.Next(); {
cr.mergedRes.Header.AddRaw(field.Raw())
formatted, err := field.Raw()
if err != nil {
cr.log.Error("malformed header field added by check", err)
}
cr.mergedRes.Header.AddRaw(formatted)
}
data.headerLock.Unlock()
}
@ -303,7 +307,11 @@ func (cr *checkRunner) applyResults(hostname string, header *textproto.Header) e
}
for field := cr.mergedRes.Header.Fields(); field.Next(); {
header.AddRaw(field.Raw())
formatted, err := field.Raw()
if err != nil {
cr.log.Error("malformed header field added by check", err)
}
header.AddRaw(formatted)
}
return nil
}