luxolus
/
open-vault
2
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

only check Contains if IP address (#14487) 

* only check Contains if IP address

* fix typo

* add bug fix changelog
This commit is contained in:
swayne275 2022-03-15 09:55:50 -06:00 committed by GitHub
parent dd4a3b339e
commit 6ae9c76970
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelog/14487.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:bug
sdk/cidrutil: Only check if cidr contains remote address for IP addresses
```

6
sdk/helper/cidrutil/cidr.go
View File

@ -10,6 +10,10 @@ import (
sockaddr "github.com/hashicorp/go-sockaddr"
)
func isIPAddr(cidr sockaddr.SockAddr) bool {
return (cidr.Type() & sockaddr.TypeIP) != 0
}
// RemoteAddrIsOk checks if the given remote address is either:
// - OK because there's no CIDR whitelist
// - OK because it's in the CIDR whitelist
@ -24,7 +28,7 @@ func RemoteAddrIsOk(remoteAddr string, boundCIDRs []*sockaddr.SockAddrMarshaler)
return false
}
for _, cidr := range boundCIDRs {
if cidr.Contains(remoteSockAddr) {
if isIPAddr(cidr) && cidr.Contains(remoteSockAddr) {
// Whitelisted.
return true
}