mirror of
https://github.com/foxcpp/maddy.git
synced 2025-04-05 22:17:39 +03:00
cf9e81d8a1
Previous error reporting code was inconsistent in terms of what is
logged, when and by whom. This caused several problems such as: logs
missing important error context, duplicated error messages, too verbose
messages, etc.
Instead of logging all generated errors, module should log
only errors it 'handles' somehow and does not simply pass it to the
caller. This removes duplication, however, also it removes context
information. To fix this, exterrors package was extended to provide
utilities for error wrapping. These utilities provide ability to
'attach' arbitrary key-value ('fields') pairs to any error object while
preserving the original value (using to Go 1.13 error handling
primitives).
In additional to solving problems described above this commit makes logs
machine-readable, creating the possibility for automated analysis.
Three new functions were added to the Logger object, providing
loosely-typed structured logging. However, they do not completely
replace plain logging and are used only where they are useful (to allow
automated analysis of message processing logs).
So, basically, instead of being logged god knows where and when,
all context information is attached to the error object and then it is
passed up until it is handled somewhere, at this point it is logged
together with all context information and then discarded.
45 lines
1.1 KiB
Go
45 lines
1.1 KiB
Go
package check
|
|
|
|
import (
|
|
"github.com/foxcpp/maddy/config"
|
|
"github.com/foxcpp/maddy/module"
|
|
)
|
|
|
|
type FailAction struct {
|
|
Quarantine bool
|
|
Reject bool
|
|
}
|
|
|
|
func FailActionDirective(m *config.Map, node *config.Node) (interface{}, error) {
|
|
if len(node.Args) == 0 {
|
|
return nil, m.MatchErr("expected at least 1 argument")
|
|
}
|
|
if len(node.Children) != 0 {
|
|
return nil, m.MatchErr("can't declare block here")
|
|
}
|
|
|
|
switch node.Args[0] {
|
|
case "reject", "quarantine", "ignore":
|
|
if len(node.Args) > 1 {
|
|
return nil, m.MatchErr("too many arguments")
|
|
}
|
|
return FailAction{
|
|
Reject: node.Args[0] == "reject",
|
|
Quarantine: node.Args[0] == "quarantine",
|
|
}, nil
|
|
default:
|
|
return nil, m.MatchErr("invalid action")
|
|
}
|
|
}
|
|
|
|
// Apply merges the result of check execution with action configuration specified
|
|
// in the check configuration.
|
|
func (cfa FailAction) Apply(originalRes module.CheckResult) module.CheckResult {
|
|
if originalRes.Reason == nil {
|
|
return originalRes
|
|
}
|
|
|
|
originalRes.Quarantine = cfa.Quarantine || originalRes.Quarantine
|
|
originalRes.Reject = cfa.Reject || originalRes.Reject
|
|
return originalRes
|
|
}
|