ScuroNeko/mtg
1
0
Fork 0
mirror of https://github.com/ScuroNeko/mtg.git synced 2026-08-31 12:54:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken whitelists

Browse Source
This commit is contained in:
9seconds
2022-03-11 10:50:15 +03:00
parent 01e201365b
commit 0ce0c668b9
6 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/cli/run_proxy.go
+5 -3
View File
@@ -110,6 +110,8 @@ func makeIPBlocklist(conf config.ListConfig, logger mtglib.Logger, ntw mtglib.Ne
return nil, fmt.Errorf("incorrect parameters for firehol: %w", err)
}
go firehol.Run(conf.UpdateEach.Get(ipblocklist.DefaultFireholUpdateEach))
return firehol, nil
}
@@ -162,7 +164,7 @@ func runProxy(conf *config.Config, version string) error { // nolint: funlen
return fmt.Errorf("cannot build network: %w", err)
}
blocklist, err := makeIPBlocklist(conf.Defense.Blocklist, logger, ntw)
blocklist, err := makeIPBlocklist(conf.Defense.Blocklist, logger.Named("blocklist"), ntw)
if err != nil {
return fmt.Errorf("cannot build ip blocklist: %w", err)
}
@@ -170,9 +172,9 @@ func runProxy(conf *config.Config, version string) error { // nolint: funlen
var whitelist mtglib.IPBlocklist
if conf.Defense.Allowlist.Enabled.Get(false) {
whlist, err := makeIPBlocklist(conf.Defense.Allowlist, logger, ntw)
whlist, err := makeIPBlocklist(conf.Defense.Allowlist, logger.Named("allowlist"), ntw)
if err != nil {
return fmt.Errorf("cannot build ip blocklist: %w", err)
return fmt.Errorf("cannot build ip allowlist: %w", err)
}
whitelist = whlist