frontend: resolve asn in dns/whois/fail order & fix tests

frontend/bgpmap.go

@@ -11,21 +11,21 @@ func getASNRepresentation(asn string) string {
 	if setting.dnsInterface != "" {
 		// get ASN representation using DNS
 		records, err := net.LookupTXT(fmt.Sprintf("AS%s.%s", asn, setting.dnsInterface))
-		if err != nil {
+		if err == nil {
-			// DNS query failed, only use ASN as output
-			return fmt.Sprintf("AS%s", asn)
-		}
-
 			result := strings.Join(records, " ")
 			if resultSplit := strings.Split(result, " | "); len(resultSplit) > 1 {
 				result = strings.Join(resultSplit[1:], "\\n")
 			}
 			return fmt.Sprintf("AS%s\\n%s", asn, result)
-	} else {
+		}
+	}
+
+	if setting.whoisServer != "" {
 		// get ASN representation using WHOIS
 		records := whois(fmt.Sprintf("AS%s", asn))
+		if records != "" {
 			recordsSplit := strings.Split(records, "\n")
-		result := "\\n"
+			result := ""
 			for _, line := range recordsSplit {
 				if strings.Contains(line, "as-name:") || strings.Contains(line, "ASName:") {
 					result = result + strings.TrimSpace(strings.SplitN(line, ":", 2)[1])
@@ -33,9 +33,14 @@ func getASNRepresentation(asn string) string {
 					result = result + "\\n" + strings.TrimSpace(strings.SplitN(line, ":", 2)[1])
 				}
 			}
-		return fmt.Sprintf("AS%s%s", asn, result)
+			if result != "" {
+				return fmt.Sprintf("AS%s\\n%s", asn, result)
 			}
 		}
+	}
+
+	return fmt.Sprintf("AS%s", asn)
+}
 
 func birdRouteToGraphviz(servers []string, responses []string, target string) string {
 	graph := make(map[string]string)

frontend/bgpmap_test.go

@@ -5,8 +5,18 @@ import (
 	"testing"
 )
 
-func TestGetASNRepresentation(t *testing.T) {
+func TestGetASNRepresentationDNS(t *testing.T) {
 	setting.dnsInterface = "asn.cymru.com"
+	setting.whoisServer = ""
+	result := getASNRepresentation("6939")
+	if !strings.Contains(result, "HURRICANE") {
+		t.Errorf("Lookup AS6939 failed, got %s", result)
+	}
+}
+
+func TestGetASNRepresentationWhois(t *testing.T) {
+	setting.dnsInterface = ""
+	setting.whoisServer = "whois.arin.net"
 	result := getASNRepresentation("6939")
 	if !strings.Contains(result, "HURRICANE") {
 		t.Errorf("Lookup AS6939 failed, got %s", result)
@@ -15,6 +25,7 @@ func TestGetASNRepresentation(t *testing.T) {
 
 func TestGetASNRepresentationFallback(t *testing.T) {
 	setting.dnsInterface = ""
+	setting.whoisServer = ""
 	result := getASNRepresentation("6939")
 	if result != "AS6939" {
 		t.Errorf("Lookup AS6939 failed, got %s", result)

frontend/whois.go

@@ -7,6 +7,10 @@ import (
 
 // Send a whois request
 func whois(s string) string {
+	if setting.whoisServer == "" {
+		return ""
+	}
+
 	conn, err := net.Dial("tcp", setting.whoisServer+":43")
 	if err != nil {
 		return err.Error()

frontend/whois_test.go

@@ -0,0 +1,22 @@
+package main
+
+import (
+	"strings"
+	"testing"
+)
+
+func TestWhois(t *testing.T) {
+	setting.whoisServer = "whois.arin.net"
+	result := whois("AS6939")
+	if !strings.Contains(result, "HURRICANE") {
+		t.Errorf("Whois AS6939 failed, got %s", result)
+	}
+}
+
+func TestWhoisWithoutServer(t *testing.T) {
+	setting.whoisServer = ""
+	result := whois("AS6939")
+	if result != "" {
+		t.Errorf("Whois AS6939 without server produced output, got %s", result)
+	}
+}