Allow public IP and siteinfo netblock mismatch (#44)

Author: stephen-soltesz

siteannotator/server.go

@@ -62,17 +62,22 @@ func (g *siteAnnotator) Annotate(ID *inetdiag.SockID, annotations *annotator.Ann
 	return nil
 }
 
+// NOTE: in a cloud environment, the local IP and public IPs will be in
+// different netblocks. The siteinfo configuration only knows about the public
+// IP address. Rather than exclude annotations for these cases, `annotate()`
+// uses the v4 config (if present) for IPv4 src addresses, and the v6 config (if
+// present) for IPv6 src addresses.
 func (g *siteAnnotator) annotate(src string, server *annotator.ServerAnnotations) {
 	n := net.ParseIP(src)
-	if g.v4.Contains(n) || g.v6.Contains(n) {
-		// NOTE: this will not annotate private IP addrs.
+	switch {
+	case n.To4() != nil && g.v4.IP != nil:
+		// If src and config are IPv4 addresses.
 		*server = *g.server
-		if g.v4.Contains(n) {
-			(*server).Network.CIDR = g.v4.String()
-		}
-		if g.v6.Contains(n) {
-			(*server).Network.CIDR = g.v6.String()
-		}
+		(*server).Network.CIDR = g.v4.String()
+	case n.To4() == nil && g.v6.IP != nil:
+		// If src and config are IPv6 addresses.
+		*server = *g.server
+		(*server).Network.CIDR = g.v6.String()
 	}
 }
 

siteannotator/server_test.go

@@ -115,7 +115,7 @@ func TestNew(t *testing.T) {
 			},
 		},
 		{
-			name:     "success-empty-ipv4-with-ipv6-connection",
+			name:     "success-no-ipv4-config-with-ipv6-connection",
 			localIPs: []net.IP{net.ParseIP("2001:5a0:4300::2")},
 			provider: &localRawfile,
 			hostname: "mlab1.six02.measurement-lab.org",
@@ -130,7 +130,7 @@ func TestNew(t *testing.T) {
 			},
 		},
 		{
-			name:     "success-empty-ipv4-with-ipv4-connection",
+			name:     "success-no-ipv4-config-with-ipv4-connection",
 			localIPs: []net.IP{net.ParseIP("64.86.148.137")},
 			provider: &localRawfile,
 			hostname: "mlab1.six02.measurement-lab.org",
@@ -143,7 +143,7 @@ func TestNew(t *testing.T) {
 			want: annotator.Annotations{},
 		},
 		{
-			name:     "success-empty-ipv6-with-ipv4-connection",
+			name:     "success-no-ipv6-config-with-ipv4-connection",
 			localIPs: []net.IP{net.ParseIP("64.86.148.130")},
 			provider: &localRawfile,
 			hostname: "mlab1.six01.measurement-lab.org",
@@ -158,7 +158,7 @@ func TestNew(t *testing.T) {
 			},
 		},
 		{
-			name:     "success-empty-ipv6-with-ipv6-connection",
+			name:     "success-no-ipv6-config-with-ipv6-connection",
 			localIPs: []net.IP{net.ParseIP("2001:5a0:4300::2")},
 			provider: &localRawfile,
 			hostname: "mlab1.six01.measurement-lab.org",