Merge pull request #7

Extend support for resolving autonomous systems

.github/workflows/go.yml

@@ -16,12 +16,12 @@ jobs:
  - name: Check out code into the Go module directory
  uses: actions/checkout@v4
 
- - name: Make all (go generate, build + test)
- run: make all
-
  - name: Update AS Data
  run: ./updateASData.sh
 
+ - name: Make all (go generate, build + test)
+ run: make all
+
  - name: Smoke Test
  run: sudo timeout --preserve-status --signal=INT 10s ./bin/amd64/socket-connect-bpf -a
 
@@ -31,8 +31,8 @@ jobs:
  mkdir -p bin/arm64/as
  cp ./README.md bin/amd64/
  cp ./README.md bin/arm64/
- cp as/ip2asn-v4-u32.tsv bin/amd64/as/
- cp as/ip2asn-v4-u32.tsv bin/arm64/as/
+ cp as/*.tsv bin/amd64/as/
+ cp as/*.tsv bin/arm64/as/
  mkdir artifacts
  tar czf artifacts/socket-connect-bpf-linux-amd64.tar.gz --directory=bin/amd64/ .
  tar czf artifacts/socket-connect-bpf-linux-arm64.tar.gz --directory=bin/arm64/ .

.gitignore

@@ -6,3 +6,5 @@ bin/**/socket-connect-bpf
 *.o
 bpf_*_bpfeb.go
 bpf_*_bpfel.go
+
+*.tsv

as/asnumbers.go → as/asnumbersIPv4.go

@@ -14,8 +14,8 @@ import (
 
 var asMap = make(map[uint8][]ASInfo)
 
-// ParseASNumbers parses the autonomous system (AS) Numbers and IP ranges from a .tsv file
-func ParseASNumbers(asTsvFile string) {
+// ParseASNumbersIPv4 parses the autonomous system (AS) Numbers and IPv4 ranges from a .tsv file
+func ParseASNumbersIPv4(asTsvFile string) {
  csvFile, err := os.Open(asTsvFile)
 
  if err != nil {
@@ -76,7 +76,7 @@ func getNameOnly(desc string) string {
 }
 
 // GetASInfo returns information about an autonomous system (AS) of which the given IP is part of.
-func GetASInfo(ip net.IP) ASInfo {
+func GetASInfoIPv4(ip net.IP) ASInfo {
  ipAddr := conv.ToUint(ip)
  bs := make([]byte, 4)
  binary.BigEndian.PutUint32(bs, ipAddr)

as/asnumbers_test.go → as/asnumbersIPv4_test.go

@@ -5,10 +5,10 @@ import (
  "testing"
 )
 
-func TestIPToAsRange(t *testing.T) {
- ParseASNumbers("./ip2asn-v4-u32.tsv")
+func TestIP4ToAsRange(t *testing.T) {
+ ParseASNumbersIPv4("./ip2asn-v4-u32.tsv")
  ip := "82.197.176.1"
- got := GetASInfo(net.ParseIP(ip))
+ got := GetASInfoIPv4(net.ParseIP(ip))
  wantName := "INIT7"
  if got.Name != wantName {
  t.Errorf("GetASInfo(%s) = %s; want %s", ip, got.Name, wantName)

as/asnumbersIPv6.go

@@ -0,0 +1,74 @@
+package as
+
+import (
+ "bufio"
+ "bytes"
+ "fmt"
+ "net"
+ "os"
+ "strconv"
+ "strings"
+)
+
+var asList []ASInfoIPv6
+
+// ParseASNumbersIPv6 parses the autonomous system (AS) Numbers and IPv6 ranges from a .tsv file
+func ParseASNumbersIPv6(asTsvFile string) {
+ csvFile, err := os.Open(asTsvFile)
+
+ if err != nil {
+ fmt.Println("Could not read AS Number file")
+ fmt.Println(err)
+ return
+ }
+
+ defer csvFile.Close()
+
+ scanner := bufio.NewScanner(csvFile)
+ for scanner.Scan() {
+ fields := strings.Fields(scanner.Text())
+ if len(fields) != 5 {
+ continue // Skip invalid lines
+ }
+
+ start := net.ParseIP(fields[0])
+ end := net.ParseIP(fields[1])
+ if start == nil || end == nil {
+ continue // Skip invalid IP ranges
+ }
+
+ asNumber, _ := strconv.ParseUint(fields[2], 10, 32)
+
+ asList = append(asList, ASInfoIPv6{
+ StartIP: start,
+ EndIP: end,
+ AsNumber: uint32(asNumber),
+ Name: fields[4],
+ })
+ }
+
+ if err := scanner.Err(); err != nil {
+ fmt.Println("Could not read AS Number file")
+ fmt.Println(err)
+ return
+ }
+}
+
+// GetASInfoIPv6 returns information about an autonomous system (AS) of which the given IP is part of.
+func GetASInfoIPv6(ip net.IP) ASInfoIPv6 {
+ for _, r := range asList {
+ if bytes.Compare(ip, r.StartIP) >= 0 && bytes.Compare(ip, r.EndIP) <= 0 {
+ return r
+ }
+ }
+ var empty ASInfoIPv6
+ return empty
+}
+
+// ASInfoIPv6 contains information about an autonomous system (AS)
+type ASInfoIPv6 struct {
+ StartIP net.IP
+ EndIP net.IP
+ AsNumber uint32
+ Name string
+}

as/asnumbersIPv6_test.go

@@ -0,0 +1,20 @@
+package as
+
+import (
+ "net"
+ "testing"
+)
+
+func TestIP6ToAsRange(t *testing.T) {
+ ParseASNumbersIPv6("./ip2asn-v6.tsv")
+ ip := "2620:2d:4000:1::1"
+ got := GetASInfoIPv6(net.ParseIP(ip))
+ wantName := "CANONICAL-AS"
+ if got.Name != wantName {
+ t.Errorf("GetASInfo(%s) = %s; want %s", ip, got.Name, wantName)
+ }
+ wantAsNumber := uint32(41231)
+ if got.AsNumber != wantAsNumber {
+ t.Errorf("GetASInfo(%s) = %d; want %d", ip, got.AsNumber, wantAsNumber)
+ }
+}