maxmind-geoip2 1.1.0 → 1.3.0

data/test/data/source-data/GeoIP2-Static-IP-Score-Test.json

@@ -734,6 +734,21 @@
          "score" : 1.47
       }
    },
+   {
+      "::214.2.3.0/126" : {
+         "score" : 0.04
+      }
+   },
+   {
+      "::214.2.3.4/128" : {
+         "score" : 0.05
+      }
+   },
+   {
+      "::214.2.3.5/128" : {
+         "score" : 0.06
+      }
+   },
    {
       "::1:0:0:0/80" : {
          "score" : 1.48

data/test/data/source-data/GeoIP2-User-Count-Test.json

@@ -881,6 +881,24 @@
          "ipv4_32" : 0
       }
    },
+   {
+      "::214.2.3.0/126" : {
+         "ipv4_24" : 4,
+         "ipv4_32" : 0
+      }
+   },
+   {
+      "::214.2.3.4/128" : {
+         "ipv4_24" : 4,
+         "ipv4_32" : 3
+      }
+   },
+   {
+      "::214.2.3.5/128" : {
+         "ipv4_24" : 4,
+         "ipv4_32" : 1
+      }
+   },
    {
       "::1:0:0:0/80" : {
          "ipv6_32" : 0,

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

@@ -132,9 +132,6 @@
                "ru" : "Румыния",
                "zh-CN" : "罗马尼亚"
             }
-         },
-         "traits" : {
-            "is_anonymous_proxy" : true
          }
       }
    },
@@ -12800,5 +12797,173 @@
             }
          }
       }
+   },
+   {
+      "214.78.0.0/19" : {
+         "city" : {
+            "geoname_id" : 5391811,
+            "names" : {
+               "de" : "San Diego",
+               "en" : "San Diego",
+               "es" : "San Diego",
+               "fr" : "San Diego",
+               "ja" : "サンディエゴ",
+               "pt-BR" : "San Diego",
+               "ru" : "Сан-Диего"
+            }
+         },
+         "continent" : {
+            "code" : "NA",
+            "geoname_id" : 6255149,
+            "names" : {
+               "de" : "Nordamerika",
+               "en" : "North America",
+               "es" : "Norteamérica",
+               "fr" : "Amérique du Nord",
+               "ja" : "北アメリカ",
+               "pt-BR" : "América do Norte",
+               "ru" : "Северная Америка",
+               "zh-CN" : "北美洲"
+            }
+         },
+         "country" : {
+            "geoname_id" : 6252001,
+            "iso_code" : "US",
+            "names" : {
+               "de" : "Vereinigte Staaten",
+               "en" : "United States",
+               "es" : "Estados Unidos",
+               "fr" : "États Unis",
+               "ja" : "アメリカ",
+               "pt-BR" : "EUA",
+               "ru" : "США",
+               "zh-CN" : "美国"
+            }
+         },
+         "location" : {
+            "accuracy_radius" : 10,
+            "latitude" : 32.6783,
+            "longitude" : -117.1291,
+            "metro_code" : 825,
+            "time_zone" : "America/Los_Angeles"
+         },
+         "postal" : {
+            "code" : "92136"
+         },
+         "registered_country" : {
+            "geoname_id" : 6252001,
+            "iso_code" : "US",
+            "names" : {
+               "de" : "Vereinigte Staaten",
+               "en" : "United States",
+               "es" : "Estados Unidos",
+               "fr" : "États Unis",
+               "ja" : "アメリカ",
+               "pt-BR" : "EUA",
+               "ru" : "США",
+               "zh-CN" : "美国"
+            }
+         },
+         "subdivisions" : [
+            {
+               "geoname_id" : 5332921,
+               "iso_code" : "CA",
+               "names" : {
+                  "de" : "Kalifornien",
+                  "en" : "California",
+                  "es" : "California",
+                  "fr" : "Californie",
+                  "ja" : "カリフォルニア州",
+                  "pt-BR" : "Califórnia",
+                  "ru" : "Калифорния",
+                  "zh-CN" : "加州"
+               }
+            }
+         ]
+      }
+   },
+   {
+      "2001:480::/43" : {
+         "city" : {
+            "geoname_id" : 5391811,
+            "names" : {
+               "de" : "San Diego",
+               "en" : "San Diego",
+               "es" : "San Diego",
+               "fr" : "San Diego",
+               "ja" : "サンディエゴ",
+               "pt-BR" : "San Diego",
+               "ru" : "Сан-Диего"
+            }
+         },
+         "continent" : {
+            "code" : "NA",
+            "geoname_id" : 6255149,
+            "names" : {
+               "de" : "Nordamerika",
+               "en" : "North America",
+               "es" : "Norteamérica",
+               "fr" : "Amérique du Nord",
+               "ja" : "北アメリカ",
+               "pt-BR" : "América do Norte",
+               "ru" : "Северная Америка",
+               "zh-CN" : "北美洲"
+            }
+         },
+         "country" : {
+            "geoname_id" : 6252001,
+            "iso_code" : "US",
+            "names" : {
+               "de" : "Vereinigte Staaten",
+               "en" : "United States",
+               "es" : "Estados Unidos",
+               "fr" : "États Unis",
+               "ja" : "アメリカ",
+               "pt-BR" : "EUA",
+               "ru" : "США",
+               "zh-CN" : "美国"
+            }
+         },
+         "location" : {
+            "accuracy_radius" : 50,
+            "latitude" : 32.7203,
+            "longitude" : -117.1552,
+            "metro_code" : 825,
+            "time_zone" : "America/Los_Angeles"
+         },
+         "postal" : {
+            "code" : "92101"
+         },
+         "registered_country" : {
+            "geoname_id" : 6252001,
+            "iso_code" : "US",
+            "names" : {
+               "de" : "Vereinigte Staaten",
+               "en" : "United States",
+               "es" : "Estados Unidos",
+               "fr" : "États Unis",
+               "ja" : "アメリカ",
+               "pt-BR" : "EUA",
+               "ru" : "США",
+               "zh-CN" : "美国"
+            }
+         },
+         "subdivisions" : [
+            {
+               "geoname_id" : 5332921,
+               "iso_code" : "CA",
+               "names" : {
+                  "de" : "Kalifornien",
+                  "en" : "California",
+                  "es" : "California",
+                  "fr" : "Californie",
+                  "ja" : "カリフォルニア州",
+                  "pt-BR" : "Califórnia",
+                  "ru" : "Калифорния",
+                  "zh-CN" : "加州"
+               }
+            }
+         ]
+      }
    }
 ]

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

@@ -136,9 +136,6 @@
                "ru" : "Румыния",
                "zh-CN" : "罗马尼亚"
             }
-         },
-         "traits" : {
-            "is_anonymous_proxy" : true
          }
       }
    },
@@ -11276,5 +11273,97 @@
             }
          }
       }
+   },
+   {
+      "214.78.0.0/19" : {
+         "continent" : {
+            "code" : "NA",
+            "geoname_id" : 6255149,
+            "names" : {
+               "de" : "Nordamerika",
+               "en" : "North America",
+               "es" : "Norteamérica",
+               "fr" : "Amérique du Nord",
+               "ja" : "北アメリカ",
+               "pt-BR" : "América do Norte",
+               "ru" : "Северная Америка",
+               "zh-CN" : "北美洲"
+            }
+         },
+         "country" : {
+            "geoname_id" : 6252001,
+            "iso_code" : "US",
+            "names" : {
+               "de" : "Vereinigte Staaten",
+               "en" : "United States",
+               "es" : "Estados Unidos",
+               "fr" : "États Unis",
+               "ja" : "アメリカ",
+               "pt-BR" : "EUA",
+               "ru" : "США",
+               "zh-CN" : "美国"
+            }
+         },
+         "registered_country" : {
+            "geoname_id" : 6252001,
+            "iso_code" : "US",
+            "names" : {
+               "de" : "Vereinigte Staaten",
+               "en" : "United States",
+               "es" : "Estados Unidos",
+               "fr" : "États Unis",
+               "ja" : "アメリカ",
+               "pt-BR" : "EUA",
+               "ru" : "США",
+               "zh-CN" : "美国"
+            }
+         }
+      }
+   },
+   {
+      "2001:480::/43" : {
+         "continent" : {
+            "code" : "NA",
+            "geoname_id" : 6255149,
+            "names" : {
+               "de" : "Nordamerika",
+               "en" : "North America",
+               "es" : "Norteamérica",
+               "fr" : "Amérique du Nord",
+               "ja" : "北アメリカ",
+               "pt-BR" : "América do Norte",
+               "ru" : "Северная Америка",
+               "zh-CN" : "北美洲"
+            }
+         },
+         "country" : {
+            "geoname_id" : 6252001,
+            "iso_code" : "US",
+            "names" : {
+               "de" : "Vereinigte Staaten",
+               "en" : "United States",
+               "es" : "Estados Unidos",
+               "fr" : "États Unis",
+               "ja" : "アメリカ",
+               "pt-BR" : "EUA",
+               "ru" : "США",
+               "zh-CN" : "美国"
+            }
+         },
+         "registered_country" : {
+            "geoname_id" : 6252001,
+            "iso_code" : "US",
+            "names" : {
+               "de" : "Vereinigte Staaten",
+               "en" : "United States",
+               "es" : "Estados Unidos",
+               "fr" : "États Unis",
+               "ja" : "アメリカ",
+               "pt-BR" : "EUA",
+               "ru" : "США",
+               "zh-CN" : "美国"
+            }
+         }
+      }
    }
 ]

data/test/data/test-data/README.md

@@ -1,13 +1,10 @@
-The write-test-dbs script will create a small set of test databases with a
-variety of data and record sizes (24, 28, & 32 bit).
+## How to generate test data
+Use the [write-test-data](https://github.com/maxmind/MaxMind-DB/blob/main/cmd/write-test-data)
+go tool to create a small set of test databases with a variety of data and
+record sizes.
 
 These test databases are useful for testing code that reads MaxMind DB files.
 
-There is also a `maps-with-pointers.raw` file. This contains the raw output of
-the MaxMind::DB::Writer::Serializer module, when given a series of maps which
-share some keys and values. It is used to test that decoder code can handle
-pointers to map keys and values, as well as to the whole map.
-
 There are several ways to figure out what IP addresses are actually in the
 test databases. You can take a look at the
 [source-data directory](https://github.com/maxmind/MaxMind-DB/tree/main/source-data)
@@ -19,8 +16,27 @@ You can also use the
 in the
 [MaxMind-DB-Reader-perl repository](https://github.com/maxmind/MaxMind-DB-Reader-perl).
 
-Some databases are intentionally broken and cannot be dumped. You can look at
-the
-[script which generates these databases](https://github.com/maxmind/MaxMind-DB/blob/main/test-data/write-test-data.pl)
-to see what IP addresses they include, which will be necessary for those
-databases which cannot be dumped because they contain intentional errors.
+## Static test data
+Some of the test files are remnants of the
+[old perl test data writer](https://github.com/maxmind/MaxMind-DB/blob/f0a85c671c5b6e9c5e514bd66162724ee1dedea3/test-data/write-test-data.pl)
+and cannot be generated with the go tool. These databases are intentionally broken,
+and exploited functionality simply not available in the go mmdbwriter:
+
+- MaxMind-DB-test-broken-pointers-24.mmdb
+- MaxMind-DB-test-broken-search-tree-24.mmdb
+- MaxMind-DB-test-pointer-decoder.mmdb
+- GeoIP2-City-Test-Broken-Double-Format.mmdb
+- GeoIP2-City-Test-Invalid-Node-Count.mmdb
+- maps-with-pointers.raw
+
+## Usage
+```
+Usage of ./write-test-data:
+  -source string
+        Source data directory
+  -target string
+        Destination directory for the generated mmdb files
+```
+
+Example:
+`./write-test-data --source ../../source-data --target ../../test-data`

data/test/test_client.rb

@@ -22,6 +22,7 @@ class ClientTest < Minitest::Test
     },
     'traits' => {
       'ip_address' => '1.2.3.4',
+      'is_anycast' => true,
       'network' => '1.2.3.0/24',
     },
   }.freeze
@@ -42,6 +43,7 @@ class ClientTest < Minitest::Test
     },
     'traits' => {
       'ip_address' => '1.2.3.40',
+      'is_anycast' => true,
       'is_residential_proxy' => true,
       'network' => '1.2.3.0/24',
       'static_ip_score' => 1.3,
@@ -73,6 +75,7 @@ class ClientTest < Minitest::Test
 
     assert_equal(false, record.registered_country.in_european_union?)
 
+    assert_equal(true, record.traits.anycast?)
     assert_equal('1.2.3.0/24', record.traits.network)
   end
 
@@ -83,6 +86,7 @@ class ClientTest < Minitest::Test
 
     assert_equal(42, record.continent.geoname_id)
 
+    assert_equal(true, record.traits.anycast?)
     assert_equal(true, record.traits.residential_proxy?)
     assert_equal('1.2.3.0/24', record.traits.network)
     assert_equal(1.3, record.traits.static_ip_score)
@@ -126,7 +130,7 @@ class ClientTest < Minitest::Test
     )
   end
 
-  def test_invalid_ip_error
+  def test_invalid_ip_error_from_web_service
     error = assert_raises(
       MaxMind::GeoIP2::AddressInvalidError,
     ) { request(:country, '1.2.3.6') }
@@ -137,6 +141,17 @@ class ClientTest < Minitest::Test
     )
   end
 
+  def test_invalid_ip_error_from_client
+    error = assert_raises(
+      MaxMind::GeoIP2::AddressInvalidError,
+    ) { request(:country, '1.2.3') }
+
+    assert_equal(
+      'The value "1.2.3" is not a valid IP address',
+      error.message,
+    )
+  end
+
   def test_no_error_body_ip_error
     assert_raises(
       JSON::ParserError,
@@ -290,7 +305,7 @@ class ClientTest < Minitest::Test
       license_key: 'abcdef123456',
     )
 
-    client.send(method, '1.2.3.4')
+    client.send(method, ip_address)
   end
 
   def get_response(ip_address)
@@ -300,6 +315,7 @@ class ClientTest < Minitest::Test
         headers: { 'Content-Type': CONTENT_TYPES[:country] },
         status: 200,
       },
+      '1.2.3' => {},
       '1.2.3.4' => {
         body: JSON.generate(COUNTRY),
         headers: { 'Content-Type': CONTENT_TYPES[:country] },

data/test/test_reader.rb

@@ -37,6 +37,29 @@ class ReaderTest < Minitest::Test
     reader.close
   end
 
+  def test_anonymous_plus
+    reader = MaxMind::GeoIP2::Reader.new(
+      'test/data/test-data/GeoIP-Anonymous-Plus-Test.mmdb',
+    )
+    ip = '1.2.0.1'
+    record = reader.anonymous_plus(ip)
+
+    assert_equal(30, record.anonymizer_confidence)
+    assert_equal(true, record.anonymous?)
+    assert_equal(true, record.anonymous_vpn?)
+    assert_equal(false, record.hosting_provider?)
+    assert_equal(Date.new(2025, 4, 14), record.network_last_seen)
+    assert_equal('foo', record.provider_name)
+    assert_equal(false, record.public_proxy?)
+    assert_equal(false, record.residential_proxy?)
+    assert_equal(false, record.tor_exit_node?)
+
+    assert_equal(ip, record.ip_address)
+    assert_equal('1.2.0.1/32', record.network)
+
+    reader.close
+  end
+
   def test_asn
     reader = MaxMind::GeoIP2::Reader.new(
       'test/data/test-data/GeoLite2-ASN-Test.mmdb',
@@ -97,6 +120,12 @@ class ReaderTest < Minitest::Test
       assert_equal('WA', record.most_specific_subdivision.iso_code)
     )
 
+    # This IP has is_anycast.
+
+    ip_address = '214.1.1.0'
+    record = reader.city(ip_address)
+    assert_equal(true, record.traits.anycast?)
+
     reader.close
   end
 
@@ -119,7 +148,7 @@ class ReaderTest < Minitest::Test
     ip = '1.0.1.1'
     record = reader.connection_type(ip)
 
-    assert_equal('Cable/DSL', record.connection_type)
+    assert_equal('Cellular', record.connection_type)
     assert_equal(ip, record.ip_address)
     assert_equal('1.0.1.0/24', record.network)
 
@@ -209,6 +238,12 @@ class ReaderTest < Minitest::Test
     assert_equal('81.2.69.163', record.traits.ip_address)
     assert_equal('81.2.69.160/27', record.traits.network)
 
+    # This IP has is_anycast.
+
+    ip_address = '214.1.1.0'
+    record = reader.country(ip_address)
+    assert_equal(true, record.traits.anycast?)
+
     assert_raises(NoMethodError) { record.foo }
     reader.close
   end
@@ -274,6 +309,12 @@ class ReaderTest < Minitest::Test
     assert_equal('310', record.traits.mobile_country_code)
     assert_equal('004', record.traits.mobile_network_code)
 
+    # This IP has is_anycast.
+
+    ip_address = '214.1.1.0'
+    record = reader.enterprise(ip_address)
+    assert_equal(true, record.traits.anycast?)
+
     reader.close
   end