mirror of
https://github.com/foxcpp/maddy.git
synced 2025-04-04 21:47:40 +03:00
7583e418cb
In general, the checks interface with added scoring and quarantining support was not convenient to use enough. Also it was problematic to add support for Authentication-Results header field generation. Per-sender and per-recipient checks were not applied to body. This is fixed now. Checks inspecting the message header was able to see header modifications done by other checks. This could lead to unwanted side-effects and so now checks can't modify the header directly and instead can only prepend fields to it by returning them. Additionally, it allows checks to return values for Authentication-Results field. Each server handling the message should add only one field, so it is not possible to implement it using header prepending. MsgMetadata.CheckScore is removed, now it is managed internally by dispatcher code and not exposed where it is not needed. MsgMetadata.Quarantine is no longer set directly by checks code. Future refactoring may be remove it altogether as it is discouraged to have mutable flags in MsgMetadata. On top of that, tests are added for all new code.
65 lines
1.5 KiB
Go
65 lines
1.5 KiB
Go
package maddy
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/emersion/go-message/textproto"
|
|
"github.com/foxcpp/maddy/buffer"
|
|
"github.com/foxcpp/maddy/config"
|
|
"github.com/foxcpp/maddy/module"
|
|
)
|
|
|
|
type testCheck struct {
|
|
connRes module.CheckResult
|
|
senderRes module.CheckResult
|
|
rcptRes module.CheckResult
|
|
bodyRes module.CheckResult
|
|
}
|
|
|
|
func (tc *testCheck) NewMessage(msgMeta *module.MsgMetadata) (module.CheckState, error) {
|
|
return &testCheckState{msgMeta, tc}, nil
|
|
}
|
|
|
|
func (tc *testCheck) Init(*config.Map) error {
|
|
return nil
|
|
}
|
|
|
|
func (tc *testCheck) Name() string {
|
|
return "test_check"
|
|
}
|
|
|
|
func (tc *testCheck) InstanceName() string {
|
|
return "test_check"
|
|
}
|
|
|
|
type testCheckState struct {
|
|
msgMeta *module.MsgMetadata
|
|
check *testCheck
|
|
}
|
|
|
|
func (tcs *testCheckState) CheckConnection(ctx context.Context) module.CheckResult {
|
|
return tcs.check.connRes
|
|
}
|
|
|
|
func (tcs *testCheckState) CheckSender(ctx context.Context, from string) module.CheckResult {
|
|
return tcs.check.senderRes
|
|
}
|
|
|
|
func (tcs *testCheckState) CheckRcpt(ctx context.Context, to string) module.CheckResult {
|
|
return tcs.check.rcptRes
|
|
}
|
|
|
|
func (tcs *testCheckState) CheckBody(ctx context.Context, header textproto.Header, body buffer.Buffer) module.CheckResult {
|
|
return tcs.check.bodyRes
|
|
}
|
|
|
|
func (tcs *testCheckState) Close() error {
|
|
return nil
|
|
}
|
|
|
|
func init() {
|
|
module.Register("test_check", func(modName, instanceName string, aliases []string) (module.Module, error) {
|
|
return &testCheck{}, nil
|
|
})
|
|
module.RegisterInstance(&testCheck{}, nil)
|
|
}
|