Bump dependencies

Cargo.toml

@@ -18,7 +18,7 @@ members = ["sn0int-registry/sn0int-common",
 
 [dependencies]
 sn0int-common = { version="0.3.0", path="sn0int-registry/sn0int-common" }
-rustyline = "2"
+rustyline = "3"
 log = "0.4"
 env_logger = "0.6"
 hlua-badtouch = "0.4"
@@ -48,7 +48,7 @@ maplit = "1.0.1"
 sloppy-rfc4880 = "0.1.2"
 regex = "1.0"
 toml = "0.4"
-maxminddb = "0.10.0"
+maxminddb = "0.12"
 tar = "0.4.17"
 libflate = "0.1.14"
 threadpool = "1.7"

src/engine/isolation.rs

@@ -1,7 +1,7 @@
 use crate::errors::*;
 use chrootable_https::dns::Resolver;
 use crate::engine::{Environment, Module, Reporter};
-use crate::geoip::{GeoIP, AsnDB};
+use crate::geoip::{GeoIP, AsnDB, Maxmind};
 use crate::psl::Psl;
 use serde_json;
 use crate::worker::{Event, Event2, LogEvent, ExitEvent, EventSender, EventWithCallback};
@@ -188,10 +188,12 @@ pub fn spawn_module(module: Module, tx: &EventSender, arg: serde_json::Value, ve
     Ok(())
 }
 
-pub fn run_worker(geoip: GeoIP, asn: AsnDB, psl: String) -> Result<()> {
+pub fn run_worker(geoip: Vec<u8>, asn: Vec<u8>, psl: String) -> Result<()> {
     let mut reporter = StdioReporter::setup();
     let start = reporter.recv_start()?;
 
+    let geoip = GeoIP::from_buf(geoip)?;
+    let asn = AsnDB::from_buf(asn)?;
     let psl = Psl::from_str(&psl)
         .context("Failed to load public suffix list")?;
 

src/geoip/mod.rs

@@ -1,13 +1,13 @@
-use crate::errors::*;
-use crate::archive;
 use chrootable_https::Client;
+use crate::archive;
+use crate::errors::*;
+use crate::paths;
+use crate::worker;
 use maxminddb::{self, geoip2};
 use std::fmt;
-use std::fs::File;
+use std::fs::{self, File};
 use std::net::IpAddr;
 use std::path::Path;
-use crate::paths;
-use crate::worker;
 
 pub static GEOIP_CITY_URL: &str = "https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz";
 pub static GEOIP_ASN_URL: &str = "https://geolite.maxmind.com/download/geoip/database/GeoLite2-ASN.tar.gz";
@@ -22,7 +22,7 @@ pub trait Maxmind: Sized {
 
     fn archive_url() -> &'static str;
 
-    fn new(reader: maxminddb::Reader) -> Self;
+    fn new(reader: maxminddb::Reader<Vec<u8>>) -> Self;
 
     // TODO: refactor this to return Path
     fn cache_path() -> Result<String> {
@@ -44,12 +44,23 @@ pub trait Maxmind: Sized {
         Ok(path.to_string())
     }
 
-    fn open(path: &str) -> Result<Self> {
-        let reader = maxminddb::Reader::open(path)
-            .context("Failed to open geoip database")?;
+    fn from_buf(buf: Vec<u8>) -> Result<Self> {
+        let reader = maxminddb::Reader::from_source(buf)
+            .context("Failed to read geoip database")?;
         Ok(Self::new(reader))
     }
 
+    fn open(path: &str) -> Result<Self> {
+        let buf = fs::read(path)?;
+        Self::from_buf(buf)
+    }
+
+    fn open_into_buf() -> Result<Vec<u8>> {
+        let path = Self::cache_path()?;
+        let buf = fs::read(path)?;
+        Ok(buf)
+    }
+
     fn open_or_download() -> Result<Self> {
         let path = Self::cache_path()?;
 
@@ -73,7 +84,7 @@ pub trait Maxmind: Sized {
 }
 
 pub struct GeoIP {
-    reader: maxminddb::Reader,
+    reader: maxminddb::Reader<Vec<u8>>,
 }
 
 impl fmt::Debug for GeoIP {
@@ -94,7 +105,7 @@ impl Maxmind for GeoIP {
     }
 
     #[inline]
-    fn new(reader: maxminddb::Reader) -> Self {
+    fn new(reader: maxminddb::Reader<Vec<u8>>) -> Self {
         GeoIP {
             reader
         }
@@ -110,7 +121,7 @@ impl GeoIP {
 }
 
 pub struct AsnDB {
-    reader: maxminddb::Reader,
+    reader: maxminddb::Reader<Vec<u8>>,
 }
 
 impl fmt::Debug for AsnDB {
@@ -131,7 +142,7 @@ impl Maxmind for AsnDB {
     }
 
     #[inline]
-    fn new(reader: maxminddb::Reader) -> Self {
+    fn new(reader: maxminddb::Reader<Vec<u8>>) -> Self {
         AsnDB {
             reader
         }

src/main.rs

@@ -44,12 +44,8 @@ fn run_run(gargs: &Args, args: &args::Run, config: Config) -> Result<()> {
 }
 
 fn run_sandbox() -> Result<()> {
-    // TODO: this file should be processed after the sandbox is up
-    let path = GeoIP::cache_path()?;
-    let geoip = GeoIP::open(&path)?;
-
-    let path = AsnDB::cache_path()?;
-    let asn = AsnDB::open(&path)?;
+    let geoip = GeoIP::open_into_buf()?;
+    let asn = AsnDB::open_into_buf()?;
     let psl = Psl::open_into_string()?;
 
     sandbox::init()