mirror/bgp-stayrtr
1
0
Fork 0
mirror of https://github.com/bgp/stayrtr.git synced 2024-05-06 15:54:54 +00:00
Code Issues Activity

Add length checks

Browse Source
This commit is contained in:
Job Snijders
2021-07-27 20:40:38 +00:00
parent 2305bc7144
commit e9eba5e63f
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cmd/stayrtr/stayrtr.go
View File

@ -10,6 +10,7 @@ import (
"flag"
"fmt"
"io/ioutil"
"net"
"net/http"
"os"
"os/signal"
@ -180,6 +181,16 @@ func decodeJSON(data []byte) (*prefixfile.VRPList, error) {
return &vrplistjson, err
}
func checkPrefixLengths(prefix *net.IPNet, maxLength uint8) (bool) {
plen, max := net.IPMask.Size(prefix.Mask)
if (uint8(plen) > maxLength || maxLength > uint8(max)) {
log.Errorf("%s Maxlength wrong: %d - %d", prefix, plen, maxLength)
return false
}
return true
}
func processData(vrplistjson []prefixfile.VRPJson) ([]rtr.VRP, int, int, int) {
filterDuplicates := make(map[string]bool)
@ -200,12 +211,16 @@ func processData(vrplistjson []prefixfile.VRPJson) ([]rtr.VRP, int, int, int) {
continue
}
count++
if !checkPrefixLengths(prefix, v.Length) {
continue
}
if prefix.IP.To4() != nil {
countv4++
} else if prefix.IP.To16() != nil {
countv6++
}
count++
key := fmt.Sprintf("%s,%d,%d", prefix, asn, v.Length)
_, exists := filterDuplicates[key]

8
prefixfile/slurm_test.go
View File

@ -97,6 +97,11 @@ func TestFilterOnVRPs(t *testing.T) {
Prefix: "10.0.0.0/24",
Length: 24,
},
VRPJson{
ASN: uint32(65005),
Prefix: "10.1.0.0/24",
Length: 16, // this VRP is broken, maxlength can't be smaller than plen
},
}
slurm := SlurmValidationOutputFilters{
@ -115,8 +120,9 @@ func TestFilterOnVRPs(t *testing.T) {
}
added, removed := slurm.FilterOnVRPs(vrps)
assert.Len(t, added, 1)
assert.Len(t, removed, 3)
assert.Len(t, removed, 4)
assert.Equal(t, uint32(65001), removed[0].GetASN())
assert.Equal(t, uint32(65005), removed[3].GetASN())
}
func TestAssertVRPs(t *testing.T) {