Merge pull request #229 from projectdiscovery/dependabot/go_modules/dev/github.com/projectdiscovery/mapcidr-1.1.16

Author: dependabot[bot]

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/projectdiscovery/goflags v0.1.28
 	github.com/projectdiscovery/gologger v1.1.11
 	github.com/projectdiscovery/hmap v0.0.26
-	github.com/projectdiscovery/mapcidr v1.1.15
+	github.com/projectdiscovery/mapcidr v1.1.16
 	github.com/projectdiscovery/retryabledns v1.0.43
 	github.com/stretchr/testify v1.8.4
 	golang.org/x/net v0.17.0

go.sum

@@ -136,8 +136,8 @@ github.com/projectdiscovery/gologger v1.1.11 h1:8vsz9oJlDT9euw6xlj7F7dZ6RWItVIqV
 github.com/projectdiscovery/gologger v1.1.11/go.mod h1:UR2bgXl7zraOxYGnUwuO917hifWrwMJ0feKnVqMQkzY=
 github.com/projectdiscovery/hmap v0.0.26 h1:tjGViKL175CABIa5XaYvyeI0ByYaNxebZZSk8yNJw1k=
 github.com/projectdiscovery/hmap v0.0.26/go.mod h1:fCDaE8LWdoWDq9VjW7eW8CFCh14oLtviL6OgxI7T6r4=
-github.com/projectdiscovery/mapcidr v1.1.15 h1:rYAgxLvMyxPU0JunE/Y3uSK1n/TcNJHK839d6YM0ms4=
-github.com/projectdiscovery/mapcidr v1.1.15/go.mod h1:s9erRsoZqWcLGhJW+WT1SnbscqzhHRRnSX916xBw5ZM=
+github.com/projectdiscovery/mapcidr v1.1.16 h1:rjj1w5D6hbTsUQXYClLcGdfBEy9bryclgi70t0vBggo=
+github.com/projectdiscovery/mapcidr v1.1.16/go.mod h1:rGqpBhStdwOQ2uS62QM9qPsybwMwIhT7CTd2bxoHs8Q=
 github.com/projectdiscovery/retryabledns v1.0.43 h1:QQPwb1J7NvjAjyXueKS/ZmoAqofDWF3qS9zIRhFMgmg=
 github.com/projectdiscovery/retryabledns v1.0.43/go.mod h1:ZKe4nKyrmZhoxEOL5DLaqqNP7QN9lqeu15sfBigxmqU=
 github.com/projectdiscovery/utils v0.0.64 h1:umTmYC9srbLgtJcMbHK+I77oT2MjrW6SjCt7P/F9puA=

libs/client_test.go

@@ -100,36 +100,43 @@ func TestGetASNFromOrg(t *testing.T) {
 	require.Nil(t, err)
 
 	tt := []struct {
-		name   string
-		org    string
-		result []*Response
+		name     string
+		org      string
+		err      bool
+		expected []*Response
 	}{
-		{"not found", "RANDOM_TEXT", []*Response{}},
-		{"regex match", "PPLINKNET*", []*Response{
-			{
-				FirstIp: "45.239.52.0",
-				LastIp:  "45.239.55.255",
-				Input:   "PPLINKNET",
-				ASN:     268353,
-				Country: "BR",
-				Org:     "PPLINKNET SERVICOS DE COMUNICACAO LTDA - ME"},
-			{
-				FirstIp: "2804:4fd8::",
-				LastIp:  "2804:4fd8:ffff:ffff:ffff:ffff:ffff:ffff",
-				Input:   "PPLINKNET",
-				ASN:     268353,
-				Country: "BR",
-				Org:     "PPLINKNET SERVICOS DE COMUNICACAO LTDA - ME"},
-		}},
-		{"exact match", "PPLINKNET", []*Response{}},
+		{"not found", "RANDOM_TEXT", true, []*Response{}},
+		// Todo: excluding - ref: https://github.com/projectdiscovery/asnmap-server/issues/43
+		// {"regex match", "PPLINKNET*", false, []*Response{
+		// 	{
+		// 		FirstIp: "45.239.52.0",
+		// 		LastIp:  "45.239.55.255",
+		// 		Input:   "PPLINKNET",
+		// 		ASN:     268353,
+		// 		Country: "BR",
+		// 		Org:     "PPLINKNET SERVICOS DE COMUNICACAO LTDA - ME"},
+		// 	{
+		// 		FirstIp: "2804:4fd8::",
+		// 		LastIp:  "2804:4fd8:ffff:ffff:ffff:ffff:ffff:ffff",
+		// 		Input:   "PPLINKNET",
+		// 		ASN:     268353,
+		// 		Country: "BR",
+		// 		Org:     "PPLINKNET SERVICOS DE COMUNICACAO LTDA - ME"},
+		// }},
+		{"exact match", "PPLINKNET", false, []*Response{}},
 	}
 
 	for _, tc := range tt {
 		t.Run(tc.name, func(t *testing.T) {
 			i, err := client.GetData(tc.org)
-			require.Nil(t, err)
+			if tc.err {
+				require.NotNil(t, err)
+				return
+			} else {
+				require.Nil(t, err)
+			}
 			// // Expecting true from comparision
-			for _, result := range tc.result {
+			for _, result := range tc.expected {
 				x := compareResponse(i, result)
 				require.True(t, x)
 			}
@@ -140,12 +147,10 @@ func TestGetASNFromOrg(t *testing.T) {
 // compareResponse compares ASN & ORG against given domain with expected output's ASN & ORG
 // Have excluded IPs for now as they might change in future.
 func compareResponse(respA []*Response, respB *Response) bool {
-	compareResult := false
-
-	for ind := range respA {
-		if respA[ind].ASN == respB.ASN && respA[ind].Org == respB.Org {
-			compareResult = true
+	for _, r := range respA {
+		if r.Equal(*respB) {
+			return true
 		}
 	}
-	return compareResult
+	return false
 }

libs/formatter.go

@@ -28,6 +28,10 @@ type Response struct {
 	Org     string `json:"org,omitempty"`
 }
 
+func (r Response) Equal(r2 Response) bool {
+	return r.ASN == r2.ASN && strings.EqualFold(r.Org, r2.Org)
+}
+
 // attachPrefix func attaches 'AS' prefix to ASN numbers
 func attachPrefix(input string) string {
 	inp := input

runner/runner_test.go

@@ -27,7 +27,7 @@ func TestRunner(t *testing.T) {
 					Input:   "104.16.99.52",
 					ASN:     13335,
 					Country: "US",
-					Org:     "CLOUDFLARENET"},
+					Org:     "cloudflarenet"},
 			},
 		},
 		{
@@ -42,7 +42,7 @@ func TestRunner(t *testing.T) {
 					Input:   "14421",
 					ASN:     14421,
 					Country: "US",
-					Org:     "THERAVANCE"},
+					Org:     "theravance"},
 			},
 		},
 		{
@@ -141,8 +141,8 @@ func TestProcessForDomainInput(t *testing.T) {
 // compareResponse compares ASN & ORG against given domain with expected output's ASN & ORG
 // Have excluded IPs for now as they might change in future.
 func compareResponse(respA []*asnmap.Response, respB *asnmap.Response) bool {
-	for ind := range respA {
-		if respA[ind].ASN == respB.ASN && respA[ind].Org == respB.Org {
+	for _, r := range respA {
+		if r.Equal(*respB) {
 			return true
 		}
 	}