From 12c9f95eb112e67b48dd5ca1b90926f20f09a411 Mon Sep 17 00:00:00 2001 From: Pierre-Alain TORET Date: Thu, 20 Sep 2018 10:12:35 +0200 Subject: [PATCH] middleware/clientapproval : add error when using blacklist and whitelist at the same time --- middleware/clientapproval/clientapproval.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/middleware/clientapproval/clientapproval.go b/middleware/clientapproval/clientapproval.go index aaddc7c..7f1af1b 100644 --- a/middleware/clientapproval/clientapproval.go +++ b/middleware/clientapproval/clientapproval.go @@ -56,6 +56,10 @@ func NewHook(cfg Config) (middleware.Hook, error) { unapproved: make(map[bittorrent.ClientID]struct{}), } + if len(cfg.Whitelist) > 0 && len(cfg.Blacklist) > 0 { + return nil, fmt.Errorf("using both whitelist and blacklist is invalid") + } + for _, cidString := range cfg.Whitelist { cidBytes := []byte(cidString) if len(cidBytes) != 6 {