deblan-mirror/nextcloud-spreed-signaling
deblan-mirror/nextcloud-spreed-signaling
1
0
Fork 0
mirror of https://github.com/strukturag/nextcloud-spreed-signaling synced 2024-04-30 04:52:46 +02:00
Code Issues Releases Wiki Activity

Skip options from default section when parsing "geoip-overrides".

Browse source
This commit is contained in:
Joachim Bauch 2023-12-07 12:14:52 +01:00
parent 0d15971506
commit 0f83392e2d
No known key found for this signature in database
GPG key ID: 77C1D22D53E15F02
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
hub.go
View file

@ -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)