From 0f83392e2d9bb84a5c5b86cb26b79e263be9c73a Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Thu, 7 Dec 2023 12:14:52 +0100 Subject: [PATCH] Skip options from default section when parsing "geoip-overrides". --- hub.go | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/hub.go b/hub.go index d6c3086..b668ad9 100644 --- a/hub.go +++ b/hub.go @@ -265,6 +265,17 @@ func NewHub(config *goconf.ConfigFile, events AsyncEvents, rpcServer *GrpcServer if options, _ := config.GetOptions("geoip-overrides"); len(options) > 0 { geoipOverrides = make(map[*net.IPNet]string) for _, option := range options { + value, err := config.GetString("geoip-overrides", option) + if err != nil { + var ge goconf.GetError + if errors.As(err, &ge) && ge.Reason == goconf.OptionNotFound { + // Skip options from "default" section. + continue + } + + return nil, err + } + var ip net.IP var ipNet *net.IPNet if strings.Contains(option, "/") { @@ -290,7 +301,6 @@ func NewHub(config *goconf.ConfigFile, events AsyncEvents, rpcServer *GrpcServer } } - value, _ := config.GetString("geoip-overrides", option) value = strings.ToUpper(strings.TrimSpace(value)) if value == "" { log.Printf("IP %s doesn't have a country assigned, skipping", option)