maxmind-geoip2 1.2.0 → 1.3.0

data/test/data/pkg/writer/geoip2.go

@@ -16,6 +16,7 @@ import (
 // WriteGeoIP2TestDB writes GeoIP2 test mmdb files.
 func (w *Writer) WriteGeoIP2TestDB() error {
 	dbTypes := []string{
+		"GeoIP-Anonymous-Plus",
 		"GeoIP2-Anonymous-IP",
 		"GeoIP2-City",
 		"GeoIP2-Connection-Type",
@@ -23,6 +24,7 @@ func (w *Writer) WriteGeoIP2TestDB() error {
 		"GeoIP2-DensityIncome",
 		"GeoIP2-Domain",
 		"GeoIP2-Enterprise",
+		"GeoIP2-IP-Risk",
 		"GeoIP2-ISP",
 		"GeoIP2-Precision-Enterprise",
 		"GeoIP2-Static-IP-Score",
@@ -58,18 +60,18 @@ func (w *Writer) WriteGeoIP2TestDB() error {
 			return fmt.Errorf("creating mmdbwriter: %w", err)
 		}
 
-		if dbType == "GeoIP2-Anonymous-IP" {
+		if dbType == "GeoIP2-Anonymous-IP" || dbType == "GeoIP-Anonymous-Plus" {
 			if err := populateAllNetworks(dbWriter); err != nil {
 				return fmt.Errorf("inserting all networks: %w", err)
 			}
 		}
 
-		jsonFileName := fmt.Sprintf("%s-Test.json", dbType)
+		jsonFileName := dbType + "-Test.json"
 		if err := w.insertJSON(dbWriter, jsonFileName); err != nil {
 			return fmt.Errorf("inserting json: %w", err)
 		}
 
-		dbFileName := fmt.Sprintf("%s-Test.mmdb", dbType)
+		dbFileName := dbType + "-Test.mmdb"
 		if err := w.write(dbWriter, dbFileName); err != nil {
 			return fmt.Errorf("writing database: %w", err)
 		}
@@ -146,7 +148,7 @@ func toMMDBType(key string, value any) (mmdbtype.DataType, error) {
 		return s, nil
 	case float64:
 		switch key {
-		case "accuracy_radius", "confidence", "metro_code":
+		case "accuracy_radius", "anonymizer_confidence", "confidence", "metro_code":
 			return mmdbtype.Uint16(v), nil
 		case "autonomous_system_number", "average_income",
 			"geoname_id", "ipv4_24", "ipv4_32", "ipv6_32",
@@ -156,7 +158,7 @@ func toMMDBType(key string, value any) (mmdbtype.DataType, error) {
 			"static_ip_score":
 			return mmdbtype.Float64(v), nil
 		default:
-			return nil, fmt.Errorf("unsupported numberic type for key %q: %T", key, value)
+			return nil, fmt.Errorf("unsupported numeric type for key %q: %T", key, value)
 		}
 	default:
 		return nil, fmt.Errorf("unsupported type for key %q: %T", key, value)

data/test/data/pkg/writer/maxmind.go

@@ -53,7 +53,8 @@ func (w *Writer) WriteIPv6TestDB() error {
 	return nil
 }
 
-// WriteMixedIPTestDB writes mmdb files for a mixed ip version range between ::1:ffff:ffff and ::2:0000:0059
+// WriteMixedIPTestDB writes mmdb files for a mixed ip version range between ::1:ffff:ffff and
+// ::2:0000:0059
 // with various record sizes.
 func (w *Writer) WriteMixedIPTestDB() error {
 	ipv6Range, err := parseIPRange("::1:ffff:ffff", "::2:0000:0059")

data/test/data/pkg/writer/writer.go

@@ -3,7 +3,9 @@
 package writer
 
 import (
+	"errors"
 	"fmt"
+	"io/fs"
 	"os"
 	"path/filepath"
 
@@ -29,11 +31,12 @@ type Writer struct {
 // New initializes a new test database writer struct.
 func New(source, target string) (*Writer, error) {
 	s := filepath.Clean(source)
-	if _, err := os.Stat(s); os.IsNotExist(err) {
+	if _, err := os.Stat(s); errors.Is(err, fs.ErrNotExist) {
 		return nil, fmt.Errorf("source directory does not exist: %w", err)
 	}
 
 	t := filepath.Clean(target)
+	//nolint:gosec // not security sensitive.
 	if err := os.MkdirAll(t, os.ModePerm); err != nil {
 		return nil, fmt.Errorf("creating target directory: %w", err)
 	}

data/test/data/source-data/GeoIP-Anonymous-Plus-Test.json

@@ -0,0 +1,175 @@
+[
+  {
+    "1.2.0.0/32": {
+      "is_anonymous": true,
+      "is_anonymous_vpn": true
+    }
+  },
+  {
+    "1.2.0.1/32": {
+      "anonymizer_confidence": 30,
+      "is_anonymous": true,
+      "is_anonymous_vpn": true,
+      "network_last_seen": "2025-04-14",
+      "provider_name": "foo"
+    }
+  },
+  {
+    "1.2.0.2/32": {
+      "anonymizer_confidence": 99,
+      "is_anonymous": true,
+      "is_anonymous_vpn": true
+    }
+  },
+  {
+    "1.2.0.3/32": {
+      "is_anonymous": true,
+      "is_anonymous_vpn": true,
+      "network_last_seen": "2025-04-14"
+    }
+  },
+  {
+    "1.2.0.4/32": {
+      "is_anonymous": true,
+      "is_anonymous_vpn": true,
+      "provider_name": "foo"
+    }
+  },
+  {
+    "1.2.0.5/32": {
+      "is_anonymous": true,
+      "is_anonymous_vpn": true
+    }
+  },
+  {
+    "1.2.0.6/31": {
+      "is_anonymous": true,
+      "is_anonymous_vpn": true
+    }
+  },
+  {
+    "1.2.0.8/29": {
+      "is_anonymous": true,
+      "is_anonymous_vpn": true
+    }
+  },
+  {
+    "1.2.0.16/28": {
+      "is_anonymous": true,
+      "is_anonymous_vpn": true
+    }
+  },
+  {
+    "1.2.0.32/27": {
+      "is_anonymous": true,
+      "is_anonymous_vpn": true
+    }
+  },
+  {
+    "1.2.0.64/26": {
+      "is_anonymous": true,
+      "is_anonymous_vpn": true
+    }
+  },
+  {
+    "1.2.0.128/25": {
+      "is_anonymous": true,
+      "is_anonymous_vpn": true
+    }
+  },
+  {
+    "1.2.1.0/24": {
+      "is_anonymous": true,
+      "is_anonymous_vpn": true
+    }
+  },
+  {
+    "1.2.2.0/23": {
+      "is_anonymous": true,
+      "is_anonymous_vpn": true
+    }
+  },
+  {
+    "1.2.4.0/22": {
+      "is_anonymous": true,
+      "is_anonymous_vpn": true
+    }
+  },
+  {
+    "1.2.8.0/21": {
+      "is_anonymous": true,
+      "is_anonymous_vpn": true
+    }
+  },
+  {
+    "1.2.16.0/20": {
+      "is_anonymous": true,
+      "is_anonymous_vpn": true
+    }
+  },
+  {
+    "1.2.32.0/19": {
+      "is_anonymous": true,
+      "is_anonymous_vpn": true
+    }
+  },
+  {
+    "1.2.64.0/18": {
+      "is_anonymous": true,
+      "is_anonymous_vpn": true
+    }
+  },
+  {
+    "1.2.128.0/17": {
+      "is_anonymous": true,
+      "is_anonymous_vpn": true
+    }
+  },
+  {
+    "::1.124.213.1/128": {
+      "is_anonymous": true,
+      "is_anonymous_vpn": true,
+      "is_tor_exit_node": true
+    }
+  },
+  {
+    "::81.2.69.0/120": {
+      "is_anonymous": true,
+      "is_anonymous_vpn": true,
+      "is_hosting_provider": true,
+      "is_public_proxy": true,
+      "is_residential_proxy": true,
+      "is_tor_exit_node": true
+    }
+  },
+  {
+    "::71.160.223.0/120": {
+      "is_anonymous": true,
+      "is_hosting_provider": true
+    }
+  },
+  {
+    "::186.30.236.0/120": {
+      "is_anonymous": true,
+      "is_public_proxy": true
+    }
+  },
+  {
+    "::65.0.0.0/109": {
+      "is_anonymous": true,
+      "is_tor_exit_node": true
+    }
+  },
+  {
+    "abcd:1000::/112": {
+      "is_anonymous": true,
+      "is_public_proxy": true
+    }
+  },
+  {
+    "2001:480:3a::/64": {
+      "is_anonymous": true,
+      "is_public_proxy": true
+    }
+  }
+]

data/test/data/source-data/GeoIP2-Anonymous-IP-Test.json

@@ -45,5 +45,11 @@
          "is_anonymous" : true,
          "is_public_proxy" : true
       }
+   },
+   {
+      "2001:480:3a::/64" : {
+         "is_anonymous" : true,
+         "is_public_proxy" : true
+      }
    }
 ]

data/test/data/source-data/GeoIP2-City-Test.json

@@ -252,9 +252,9 @@
    },
    {
       "214.1.1.0/24" : {
-          "traits": {
-              "is_anycast": true
-          }
+         "traits" : {
+            "is_anycast" : true
+         }
       }
    },
    {
@@ -12151,7 +12151,76 @@
             "names" : {
                "en" : "Boxford"
             }
-         }
+         },
+         "continent" : {
+            "code" : "EU",
+            "geoname_id" : 6255148,
+            "names" : {
+               "de" : "Europa",
+               "en" : "Europe",
+               "es" : "Europa",
+               "fr" : "Europe",
+               "ja" : "ヨーロッパ",
+               "pt-BR" : "Europa",
+               "ru" : "Европа",
+               "zh-CN" : "欧洲"
+            }
+         },
+         "country" : {
+            "geoname_id" : 2635167,
+            "iso_code" : "GB",
+            "names" : {
+               "de" : "Vereinigtes Königreich",
+               "en" : "United Kingdom",
+               "es" : "Reino Unido",
+               "fr" : "Royaume-Uni",
+               "ja" : "イギリス",
+               "pt-BR" : "Reino Unido",
+               "ru" : "Великобритания",
+               "zh-CN" : "英国"
+            }
+         },
+         "location" : {
+            "accuracy_radius" : 100,
+            "latitude" : 51.75,
+            "longitude" : -1.25,
+            "time_zone" : "Europe/London"
+         },
+         "registered_country" : {
+            "geoname_id" : 2635167,
+            "iso_code" : "GB",
+            "names" : {
+               "de" : "Vereinigtes Königreich",
+               "en" : "United Kingdom",
+               "es" : "Reino Unido",
+               "fr" : "Royaume-Uni",
+               "ja" : "イギリス",
+               "pt-BR" : "Reino Unido",
+               "ru" : "Великобритания",
+               "zh-CN" : "英国"
+            }
+         },
+         "subdivisions" : [
+            {
+               "geoname_id" : 6269131,
+               "iso_code" : "ENG",
+               "names" : {
+                  "en" : "England",
+                  "es" : "Inglaterra",
+                  "fr" : "Angleterre",
+                  "pt-BR" : "Inglaterra"
+               }
+            },
+            {
+               "geoname_id" : 3333217,
+               "iso_code" : "WBK",
+               "names" : {
+                  "en" : "West Berkshire",
+                  "ru" : "Западный Беркшир",
+                  "zh-CN" : "西伯克郡"
+               }
+            }
+         ]
       }
    },
    {
@@ -12886,9 +12955,6 @@
                "ru" : "Румыния",
                "zh-CN" : "罗马尼亚"
             }
-         },
-         "traits" : {
-            "is_anonymous_proxy" : true
          }
       }
    },

data/test/data/source-data/GeoIP2-Country-Test.json

@@ -15211,10 +15211,6 @@
                "ru" : "США",
                "zh-CN" : "美国"
             }
-         },
-         "traits" : {
-            "is_anonymous_proxy" : true,
-            "is_satellite_provider" : true
          }
       }
    },
@@ -15261,10 +15257,6 @@
                "ru" : "США",
                "zh-CN" : "美国"
             }
-         },
-         "traits" : {
-            "is_anonymous_proxy" : true,
-            "is_satellite_provider" : true
          }
       }
    },
@@ -15638,9 +15630,6 @@
                "ru" : "Румыния",
                "zh-CN" : "罗马尼亚"
             }
-         },
-         "traits" : {
-            "is_anonymous_proxy" : true
          }
       }
    },
@@ -15797,20 +15786,6 @@
          }
       }
    },
-   {
-      "::212.47.235.81/128" : {
-         "traits" : {
-            "is_anonymous_proxy" : true
-         }
-      }
-   },
-   {
-      "::212.47.235.82/128" : {
-         "traits" : {
-            "is_satellite_provider" : true
-         }
-      }
-   },
    {
       "::217.65.48.0/125" : {
          "continent" : {
@@ -15903,9 +15878,9 @@
    },
    {
       "214.1.1.0/24" : {
-          "traits": {
-              "is_anycast": true
-          }
+         "traits" : {
+            "is_anycast" : true
+         }
       }
    },
    {

data/test/data/source-data/GeoIP2-Enterprise-Test.json

@@ -75,6 +75,7 @@
                }
             },
             {
+               "confidence" : 60,
                "geoname_id" : 3333217,
                "iso_code" : "WBK",
                "names" : {
@@ -144,7 +145,6 @@
          "traits" : {
             "autonomous_system_number" : 35908,
             "domain" : "shoesfin.NET",
-            "is_anonymous_proxy" : true,
             "isp" : "Loud Packet",
             "organization" : "zudoarichikito_",
             "static_ip_score" : 0.34,
@@ -237,9 +237,7 @@
             "autonomous_system_organization" : "FairPoint Communications",
             "connection_type" : "Cable/DSL",
             "domain" : "frpt.net",
-            "is_anonymous_proxy" : true,
             "is_legitimate_proxy" : true,
-            "is_satellite_provider" : true,
             "isp" : "Fairpoint Communications",
             "organization" : "Fairpoint Communications",
             "static_ip_score" : 0.34,
@@ -780,9 +778,9 @@
    },
    {
       "214.1.1.0/24" : {
-          "traits": {
-              "is_anycast": true
-          }
+         "traits" : {
+            "is_anycast" : true
+         }
       }
    },
    {
@@ -1075,7 +1073,6 @@
    {
       "::212.47.235.81/128" : {
          "traits" : {
-            "is_anonymous_proxy" : true,
             "static_ip_score" : 1.47
          }
       }
@@ -1083,9 +1080,31 @@
    {
       "::212.47.235.82/128" : {
          "traits" : {
-            "is_satellite_provider" : true,
             "static_ip_score" : 1.47
          }
       }
+   },
+   {
+      "214.214.214.216/32" : {
+         "traits" : {
+            "static_ip_score" : 0.4,
+            "user_type" : "traveler"
+         }
+      }
+   },
+   {
+      "214.214.214.220/32" : {
+         "traits" : {
+            "static_ip_score" : 0.4,
+            "user_type" : "hosting"
+         }
+      }
+   },
+   {
+      "214.214.214.221/32" : {
+         "traits" : {
+            "user_type" : "content_delivery_network"
+         }
+      }
    }
 ]

data/test/data/source-data/GeoIP2-IP-Risk-Test.json

@@ -0,0 +1,31 @@
+[
+   {
+      "::214.2.3.0/126" : {
+         "ip_risk" : 25,
+         "is_anonymous" : true,
+         "is_anonymous_vpn" : true
+      }
+   },
+   {
+      "::214.2.3.4/128" : {
+         "ip_risk" : 50,
+         "is_anonymous" : true,
+         "is_anonymous_vpn" : true,
+         "is_tor_exit_node" : true
+      }
+   },
+   {
+      "::214.2.3.5/128" : {
+         "ip_risk" : 90,
+         "is_anonymous" : true,
+         "is_anonymous_vpn" : true,
+         "is_residential_proxy" : true,
+         "is_tor_exit_node" : true
+      }
+   },
+   {
+      "::214.2.3.6/128" : {
+         "ip_risk" : 85
+      }
+   }
+]