Update maxminddb to latest version without security issue

Author: rnijveld

Cargo.lock

@@ -36,7 +36,7 @@ eyre = "0.6.11"
 headers = "0.4.1"
 jsonwebtoken = "9.3.1"
 lettre = { version = "0.11.18", default-features = false }
-maxminddb = "0.26.0"
+maxminddb = "0.27.0"
 notify = "8.2.0"
 opentelemetry = "0.31.0"
 opentelemetry-otlp = { version = "0.31.0", features = ["reqwest-rustls"] }

Cargo.toml

@@ -371,28 +371,31 @@ impl ServerManager for GeographicServerManager {
         } else {
             &inner.regions_ipv6
         };
-        let region =
-            if let Ok(Some(location)) = inner.geodb.lookup::<geoip2::Country>(address.ip()) {
-                debug!("Geolocation lookup for {:?}", location);
-                location
-                    .country
-                    .and_then(|v| v.iso_code)
-                    .and_then(|v| regions.get(v))
-                    .or_else(|| {
-                        debug!("Falling back to continent, country zone does not exist");
-                        location
-                            .continent
-                            .and_then(|v| v.code)
-                            .and_then(|v| CONTINENTS.get(v))
-                            .and_then(|v| regions.get(*v))
-                    })
-            } else {
-                None
-            }
-            .unwrap_or_else(|| {
-                debug!("Falling back to global, continent and country zone does not exist");
-                regions.get(GLOBAL).unwrap()
-            });
+        let region = if let Ok(Some(location)) = inner
+            .geodb
+            .lookup(address.ip())
+            .and_then(|r| r.decode::<geoip2::Country>())
+        {
+            debug!("Geolocation lookup for {:?}", location);
+            location
+                .country
+                .iso_code
+                .and_then(|v| regions.get(v))
+                .or_else(|| {
+                    debug!("Falling back to continent, country zone does not exist");
+                    location
+                        .continent
+                        .code
+                        .and_then(|v| CONTINENTS.get(v))
+                        .and_then(|v| regions.get(*v))
+                })
+        } else {
+            None
+        }
+        .unwrap_or_else(|| {
+            debug!("Falling back to global, continent and country zone does not exist");
+            regions.get(GLOBAL).unwrap()
+        });
 
         if region.is_empty() {
             debug!("Selected region is empty");

nts-pool-ke/src/servers/geo.rs

@@ -111,7 +111,10 @@ pub async fn infer_regions(
 
     let mut result = HashSet::new();
     for addr in addresses {
-        let Some(lookup) = (match geodb.lookup::<maxminddb::geoip2::Country>(addr.ip()) {
+        let Some(lookup) = (match geodb
+            .lookup(addr.ip())
+            .and_then(|r| r.decode::<maxminddb::geoip2::Country>())
+        {
             Ok(lookup) => lookup,
             Err(e) => {
                 tracing::error!("Failure during geoip lookup: {e}");
@@ -121,14 +124,10 @@ pub async fn infer_regions(
             continue;
         };
 
-        if let Some(continent) = lookup
-            .continent
-            .and_then(|v| v.code)
-            .and_then(|c| CONTINENTS.get(c))
-        {
+        if let Some(continent) = lookup.continent.code.and_then(|c| CONTINENTS.get(c)) {
             result.insert((*continent).to_owned());
         }
-        if let Some(country) = lookup.country.and_then(|v| v.iso_code) {
+        if let Some(country) = lookup.country.iso_code {
             result.insert(country.to_owned());
         }
     }