feat: remove support for geolocation since it's no longer needed

Author: onyxmaster

.cspell.json

@@ -5,15 +5,9 @@
     "chrono",
     "consts",
     "ddgsyslog",
-    "geodb",
-    "geoip",
-    "geolocation",
-    "geolocator",
-    "geoname",
     "getopts",
     "Hasher",
     "libc",
-    "maxminddb",
     "optflag",
     "optopt",
     "premaster",
@@ -23,4 +17,4 @@
     "sslkeylog",
     "Zagorodnikov"
   ]
-}
+}

Cargo.lock

@@ -14,7 +14,6 @@ hex = "0.4.3"
 lazy_static = "1.5.0"
 getopts = "0.2.21"
 url = "2.5.4"
-maxminddb = "0.26.0"
 
 [target.'cfg(unix)'.dependencies]
 signal-hook = "0.3.17"

Cargo.toml

@@ -22,7 +22,6 @@ Then just use:
 ## Usage
 Run the built binary to determine the command-line options.
 On Windows, file names support [wildcard expansion](https://docs.rs/glob/), on other OSes shell expansion is expected to take care of that.
-The tool optionally supports [MaxMind geolocation database](https://www.maxmind.com/en/geoip2-databases) to store [GeoNames](https://www.geonames.org/) identifier.
 
 ## Schema
 All keys are placed in the collections named `<sni>@<server_ip>:<server_port>_<year><month><day>` with the following schemas:
@@ -36,7 +35,6 @@ All keys are placed in the collections named `<sni>@<server_ip>:<server_port>_<y
   "p": <client_port>:int,
   "c": <cipher_id>:int,
   "k": <premaster>:BinData,
-  ["g": <geoname_id>:int],
 }
 
 // TLS 1.3:
@@ -51,7 +49,6 @@ All keys are placed in the collections named `<sni>@<server_ip>:<server_port>_<y
   "f": <client_handshake>:BinData,
   "z": <server_0>:BinData,
   "s": <client_0>:BinData,
-  ["g": <geoname_id>:int],
 }
 ```
 

README.md

@@ -13,7 +13,6 @@ pub(crate) struct Configuration {
     pub options: mongodb::options::ClientOptions,
     pub db_name: String,
     pub filter: Option<Regex>,
-    pub geodb_path: Option<String>,
     pub input_format: InputFormat,
 }
 
@@ -37,7 +36,6 @@ where
         "set filter regex, strict (/^...$/)",
         "www\\.domain\\.(com|net):443",
     );
-    opts.optopt("g", "geo-db", "set geolocation database path", "/path/to/GeoLite2-City.mmdb");
     opts.optopt(
         "i",
         "input-format",
@@ -80,8 +78,6 @@ where
         .transpose()
         .context("Invalid filter")?;
 
-    let geodb_path = matches.opt_str("g");
-
     let input_format = matches
         .opt_str("i")
         .map(|f| InputFormat::try_from(f.as_str()))
@@ -123,7 +119,6 @@ where
         options,
         db_name,
         filter,
-        geodb_path,
         input_format,
     }))
 }

src/configuration.rs

@@ -242,16 +242,6 @@ fn tls13_from_ddg_syslog(value: &str) -> Result<Tls13Record, anyhow::Error> {
     })
 }
 
-pub(crate) struct GeoMetadata {
-    pub geoname_id: u32,
-}
-
-impl BsonSerializable for GeoMetadata {
-    fn serialize(&self, document: &mut bson::Document) {
-        document.insert("g", self.geoname_id);
-    }
-}
-
 pub(crate) fn get_index_model() -> Vec<bson::Document> {
     vec![
         doc! {

src/data_model.rs

@@ -1,7 +1,6 @@
 mod configuration;
 mod data_model;
 mod errors;
-mod geolocator;
 mod logging;
 mod process;
 mod processor;

src/geolocator.rs

@@ -1,25 +1,12 @@
 use std::sync::{atomic::AtomicBool, Arc};
 
-use anyhow::{Context, Result};
+use anyhow::Result;
 
-use crate::{configuration, geolocator, processor, storage};
+use crate::{configuration, processor, storage};
 
 pub(crate) fn process(args: &configuration::Configuration, term_token: &Arc<AtomicBool>) -> Result<()> {
     let db = mongodb::sync::Client::with_options(args.options.clone())?.database(&args.db_name);
     let mut store = storage::Store::new(&db);
-    let geolocator = args
-        .geodb_path
-        .as_ref()
-        .map(|path| {
-            geolocator::Geolocator::new(path).with_context(|| format!("Failed to create geolocator with database path {:?}", path))
-        })
-        .transpose()?;
-    let mut context = processor::Processor::new(
-        args.filter.as_ref(),
-        term_token,
-        &mut store,
-        geolocator.as_ref(),
-        args.input_format,
-    );
+    let mut context = processor::Processor::new(args.filter.as_ref(), term_token, &mut store, args.input_format);
     context.process(&args.files)
 }

src/main.rs

@@ -15,13 +15,12 @@ use mongodb::bson;
 use regex::Regex;
 use time::{format_description::FormatItem, macros::format_description, Duration};
 
-use crate::{data_model::*, errors, geolocator::Geolocator, logging, storage::Store};
+use crate::{data_model::*, errors, logging, storage::Store};
 
 pub(crate) struct Processor<'a> {
     filter: Option<&'a Regex>,
     term_token: &'a Arc<AtomicBool>,
     store: &'a mut Store<'a>,
-    geolocator: Option<&'a Geolocator>,
     input_format: InputFormat,
 }
 
@@ -30,14 +29,12 @@ impl<'a> Processor<'a> {
         filter: Option<&'a Regex>,
         term_token: &'a Arc<AtomicBool>,
         store: &'a mut Store<'a>,
-        geolocator: Option<&'a Geolocator>,
         input_format: InputFormat,
     ) -> Self {
         Self {
             filter,
             term_token,
             store,
-            geolocator,
             input_format,
         }
     }
@@ -169,20 +166,8 @@ impl<'a> Processor<'a> {
             return Ok(None);
         }
 
-        let geolocation = self
-            .geolocator
-            .map(|g| {
-                g.locate(metadata.client_ip)
-                    .with_context(|| format!("Failed to locate client {} at {}", metadata.client_ip, location))
-            })
-            .transpose()?
-            .flatten();
-
         let mut document = bson::Document::new();
         record.serialize(&mut document);
-        if let Some(geoname_id) = geolocation {
-            GeoMetadata { geoname_id }.serialize(&mut document);
-        };
 
         const SUFFIX_FORMAT: &[FormatItem] = format_description!("[year][month][day]");
         let collection_name = format!(