mirror of
https://github.com/safing/portmaster
synced 2025-04-20 10:59:10 +00:00
* Move portbase into monorepo * Add new simple module mgr * [WIP] Switch to new simple module mgr * Add StateMgr and more worker variants * [WIP] Switch more modules * [WIP] Switch more modules * [WIP] swtich more modules * [WIP] switch all SPN modules * [WIP] switch all service modules * [WIP] Convert all workers to the new module system * [WIP] add new task system to module manager * [WIP] Add second take for scheduling workers * [WIP] Add FIXME for bugs in new scheduler * [WIP] Add minor improvements to scheduler * [WIP] Add new worker scheduler * [WIP] Fix more bug related to new module system * [WIP] Fix start handing of the new module system * [WIP] Improve startup process * [WIP] Fix minor issues * [WIP] Fix missing subsystem in settings * [WIP] Initialize managers in constructor * [WIP] Move module event initialization to constrictors * [WIP] Fix setting for enabling and disabling the SPN module * [WIP] Move API registeration into module construction * [WIP] Update states mgr for all modules * [WIP] Add CmdLine operation support * Add state helper methods to module group and instance * Add notification and module status handling to status package * Fix starting issues * Remove pilot widget and update security lock to new status data * Remove debug logs * Improve http server shutdown * Add workaround for cleanly shutting down firewall+netquery * Improve logging * Add syncing states with notifications for new module system * Improve starting, stopping, shutdown; resolve FIXMEs/TODOs * [WIP] Fix most unit tests * Review new module system and fix minor issues * Push shutdown and restart events again via API * Set sleep mode via interface * Update example/template module * [WIP] Fix spn/cabin unit test * Remove deprecated UI elements * Make log output more similar for the logging transition phase * Switch spn hub and observer cmds to new module system * Fix log sources * Make worker mgr less error prone * Fix tests and minor issues * Fix observation hub * Improve shutdown and restart handling * Split up big connection.go source file * Move varint and dsd packages to structures repo * Improve expansion test * Fix linter warnings * Fix interception module on windows * Fix linter errors --------- Co-authored-by: Vladimir Stoilov <vladimir@safing.io>
103 lines
2.4 KiB
Go
103 lines
2.4 KiB
Go
package intel
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/miekg/dns"
|
|
|
|
"github.com/safing/portmaster/base/log"
|
|
"github.com/safing/portmaster/service/nameserver/nsutil"
|
|
)
|
|
|
|
// ListMatch represents an entity that has been
|
|
// matched against filterlists.
|
|
type ListMatch struct {
|
|
Entity string
|
|
ActiveLists []string
|
|
InactiveLists []string
|
|
}
|
|
|
|
func (lm *ListMatch) String() string {
|
|
inactive := ""
|
|
if len(lm.InactiveLists) > 0 {
|
|
inactive = " and in deactivated lists " + strings.Join(lm.InactiveLists, ", ")
|
|
}
|
|
return fmt.Sprintf(
|
|
"%s in activated lists %s%s",
|
|
lm.Entity,
|
|
strings.Join(lm.ActiveLists, ","),
|
|
inactive,
|
|
)
|
|
}
|
|
|
|
// ListBlockReason is a list of list matches.
|
|
type ListBlockReason []ListMatch
|
|
|
|
func (br ListBlockReason) String() string {
|
|
if len(br) == 0 {
|
|
return ""
|
|
}
|
|
|
|
matches := make([]string, len(br))
|
|
for idx, lm := range br {
|
|
matches[idx] = lm.String()
|
|
}
|
|
|
|
return strings.Join(matches, " and ")
|
|
}
|
|
|
|
// Context returns br wrapped into a map. It implements
|
|
// the endpoints.Reason interface.
|
|
func (br ListBlockReason) Context() interface{} {
|
|
return br
|
|
}
|
|
|
|
// MarshalJSON marshals the list block reason into a map
|
|
// prefixed with filterlists.
|
|
func (br ListBlockReason) MarshalJSON() ([]byte, error) {
|
|
return json.Marshal(map[string]interface{}{
|
|
// we convert to []ListMatch to avoid recursing
|
|
// here.
|
|
"filterlists": []ListMatch(br),
|
|
})
|
|
}
|
|
|
|
// GetExtraRRs implements the nsutil.RRProvider interface
|
|
// and adds additional TXT records justifying the reason
|
|
// the request was blocked.
|
|
func (br ListBlockReason) GetExtraRRs(ctx context.Context, _ *dns.Msg) []dns.RR {
|
|
rrs := make([]dns.RR, 0, len(br))
|
|
|
|
for _, lm := range br {
|
|
blockedBy, err := nsutil.MakeMessageRecord(log.InfoLevel, fmt.Sprintf(
|
|
"%s is blocked by filter lists %s",
|
|
lm.Entity,
|
|
strings.Join(lm.ActiveLists, ", "),
|
|
))
|
|
if err == nil {
|
|
rrs = append(rrs, blockedBy)
|
|
} else {
|
|
log.Tracer(ctx).Errorf("intel: failed to create TXT RR for block reason: %s", err)
|
|
}
|
|
|
|
if len(lm.InactiveLists) > 0 {
|
|
wouldBeBlockedBy, err := nsutil.MakeMessageRecord(log.InfoLevel, fmt.Sprintf(
|
|
"%s would be blocked by filter lists %s",
|
|
lm.Entity,
|
|
strings.Join(lm.InactiveLists, ", "),
|
|
))
|
|
if err == nil {
|
|
rrs = append(rrs, wouldBeBlockedBy)
|
|
} else {
|
|
log.Tracer(ctx).Errorf("intel: failed to create TXT RR for block reason: %s", err)
|
|
}
|
|
}
|
|
}
|
|
|
|
return rrs
|
|
}
|
|
|
|
var _ nsutil.RRProvider = ListBlockReason(nil)
|