fixes debian packages

nuno · nuno · commit 19f27849190e · 2025-08-27T18:36:07.000+01:00
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -26,10 +26,12 @@ jobs:
     needs:
       - build
     steps:
-      - run: cargo install cargo-deb
+      - run: apt-get update -qq
+      - run: apt-get install -y -qq devscripts build-essential debhelper lintian dh-make
       - uses: actions/checkout@v2
       - name: DEB packaging
-        run: cargo deb -p doh
+      - run: mk-build-deps --install --remove --tool "apt-get -y -qq"
+      - run: dpkg-buildpackage -us -uc -b
       - uses: "marvinpinto/action-automatic-releases@latest"
         with:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/config.ini b/config.ini
diff --git a/debian/config.ini b/debian/config.ini
diff --git a/debian/dbrotate b/debian/dbrotate
@@ -8,7 +8,7 @@
     copytruncate
     create 640 root root
     postrotate
-        /usr/bin/systemctl restart frost-doh.service > /dev/null 2>&1 || true
+        /usr/bin/pkill doh-daemon > /dev/null 2>&1 || true
     endscript
     dateext
     dateformat -%Y%m%d-%H%M%S
diff --git a/debian/install b/debian/install
@@ -3,4 +3,4 @@ target/release/doh-daemon /usr/bin
 debian/com.glaciaos.NameResolver.conf /etc/dbus-1/system.d
 debian/com.glaciaos.NameResolver.service /usr/share/dbus-1/system-services
 debian/dbrotate /etc/logrotate.d
-doh-daemon/config.prod.ini /etc/frost-doh
+debian/config.ini /etc/frost-doh
diff --git a/debian/postinst b/debian/postinst
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+
+mkdir -p /var/log/frost-doh
+
+
+exit 0
diff --git a/debian/rules b/debian/rules
@@ -4,6 +4,7 @@ export CARGO_HOME := $(CURDIR)/debian/cargo
 export DEB_CARGO_PACKAGE := $(shell dpkg-parsechangelog -S Source)
 export DEB_VERSION := $(shell dpkg-parsechangelog -S Version)
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+export RUSTFLAGS := --cfg tokio_unstable
 
 %:
 	dh $@
diff --git a/doh-daemon/Cargo.toml b/doh-daemon/Cargo.toml
@@ -4,10 +4,12 @@ version = "0.1.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[build]
+rustflags = ["--cfg", "tracing_unstable"]
+
 
 [dependencies]
 log = "0.4.17"
-env_logger = "0.11.8"
 zbus = { version = "5.9.0", features = ["tokio"] }
 zvariant = "5.6.0"
 zvariant_derive = "5.6.0"
@@ -21,4 +23,4 @@ async-sqlite="0.5.3"
 reqwest = { version =  "0.12.23", features = ["gzip","json", "brotli"] }
 configparser = "3.1.0"
 tracing = "0.1"
-console-subscriber = "0.4.1"
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/doh-daemon/src/database/mod.rs b/doh-daemon/src/database/mod.rs
@@ -5,7 +5,7 @@ use std::fmt::{Debug, Formatter};
 use std::ops::{Add};
 use std::sync::Arc;
 use std::time::UNIX_EPOCH;
-
+use tracing::instrument;
 use doh_common::error::Error;
 
 use crate::provider::DnsReply;
@@ -138,6 +138,7 @@ impl DatabaseService {
         }).await.map_err(|e| e.into())
     }
 
+    #[instrument(skip(self))]
     pub async fn create_host_blocked(&self, host: &str) -> Result<bool, Error> {
 
         let host_clone = host.to_lowercase();
@@ -152,6 +153,7 @@ impl DatabaseService {
         }).await.map_err(|e| e.into())
     }
 
+    #[instrument(skip(self))]
     pub async fn delete_host_blocked(&self, host: &str) -> Result<bool, Error> {
 
         let host_clone = host.to_lowercase();
@@ -193,7 +195,7 @@ impl DatabaseService {
 
             let offset = page * 10;
             let mut statement = connection.prepare(
-                "SELECT process_name, dns_name, created FROM audit_dns_query ORDER BY id DESC LIMIT 10 OFFSET ?"
+                "SELECT process_name, dns_name, strftime('%s', 'created') FROM audit_dns_query ORDER BY id DESC LIMIT 10 OFFSET ?"
             )?;
 
             let mut rows = statement.query(params![offset])?;
diff --git a/doh-daemon/src/dbus/mod.rs b/doh-daemon/src/dbus/mod.rs
@@ -1,5 +1,5 @@
-use std::time::Instant;
-use tracing::{instrument, trace};
+
+use tracing::{info, instrument};
 use zbus::interface;
 
 use doh_common::AuditDnsQueryPage;
@@ -19,14 +19,14 @@ impl DoHBusService {
 
 #[interface(name = "com.glaciaos.NameResolver")]
 impl DoHBusService {
-    #[instrument(level = "debug", skip(self), fields(process_id, name, family))]
-    async fn name_request(
+    #[instrument(skip(self))]
+    async fn resolve_name(
         &mut self,
         process_id: u32,
         name: &str,
         family: u32,
     ) -> zbus::fdo::Result<libnss::host::Host> {
-        trace!("received query: {} - {} {}", process_id, name, family);
+        info!("received query: {} - {} {}", process_id, name, family);
 
         let result = self
             .resolver
@@ -44,6 +44,13 @@ impl DoHBusService {
             .map_err(|e: doh_common::error::Error | e.into())
     }
 
+    async fn unblock_host(&mut self, name: &str) -> zbus::fdo::Result<bool> {
+        self.resolver
+            .remove_from_blacklist(name)
+            .await
+            .map_err(|e: doh_common::error::Error | e.into())
+    }
+
     async fn get_last_queries(&mut self, page: u64) -> zbus::fdo::Result<AuditDnsQueryPage> {
         self.resolver.get_queries(page)
             .await
diff --git a/doh-daemon/src/main.rs b/doh-daemon/src/main.rs
@@ -18,11 +18,7 @@ mod settings;
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error>> {
 
-    unsafe { std::env::set_var("RUST_LOG", "debug"); }
-
-    //env_logger::init();
-
-    console_subscriber::init();
+    tracing_subscriber::fmt::init();
 
     info!("Starting daemon");
 
@@ -45,7 +41,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
 
     let service = dbus::DoHBusService::new(resolver);
 
-    let _conn = connection::Builder::system()?
+    let _conn = connection::Builder::session()?
         .name("com.glaciaos.NameResolver")?
         .serve_at("/com/glaciaos/NameResolver", service)?
         .build()
diff --git a/doh-daemon/src/provider/mod.rs b/doh-daemon/src/provider/mod.rs
@@ -43,9 +43,7 @@ impl Resolver {
 
         tokio::spawn(async move {
 
-            let _ = tokio::task::Builder::new()
-                .name("SaveDNSAudit")
-                .spawn(async move {
+            let _ = tokio::spawn(async move {
 
                     let process_name = get_process_name(process_id).ok().unwrap_or(String::from("unknown"));
 
@@ -63,9 +61,7 @@ impl Resolver {
             let domain1 = domain.to_string().clone();
             let family1 = family.clone();
 
-            let _ = tokio::task::Builder::new()
-                .name("SaveDNSReply")
-                .spawn(async move {
+            let _ = tokio::spawn(async move {
                     if let Err(e) = db.create_dns_answer(domain1.as_ref(), family1, &response).await {
                         error!("Error saving DNS answer: {:?}", e);
                     }
@@ -126,6 +122,10 @@ impl Resolver {
         self.database.create_host_blocked(host).await
     }
 
+    pub async fn remove_from_blacklist(&self, host: &str) -> Result<bool, doh_common::error::Error> {
+        self.database.delete_host_blocked(host).await
+    }
+
     pub async fn get_queries(&self, page: u64) -> Result<doh_common::AuditDnsQueryPage, doh_common::error::Error> {
         self.database.get_dns_audit(page).await
     }
diff --git a/doh-daemon/src/settings/mod.rs b/doh-daemon/src/settings/mod.rs
@@ -12,7 +12,6 @@ pub enum TTlConfig {
     Custom(u64),
 }
 
-
 #[derive(Clone, Debug)]
 pub struct SQLiteSettings {
     connection_str: String,
@@ -24,15 +23,13 @@ impl SQLiteSettings {
     }
 }
 
-#[derive(Debug)]
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 pub struct ApplicationSettings {
     provider: Provider,
     ttl: TTlConfig,
     sqlite: SQLiteSettings,
 }
 
-
 impl ApplicationSettings {
     pub fn provider(&self) -> &Provider {
         &self.provider
@@ -46,12 +43,12 @@ impl ApplicationSettings {
     }
 
     pub fn configs() -> Self {
-        let config_file = std::env::var("CONFIG_FILE").unwrap_or("/etc/frost-doh/config.prod.ini".to_string());
-        //let config_file = std::env::var("CONFIG_FILE").unwrap_or("doh-daemon/config.ini".to_string());
+        let config_file = std::env::var("CONFIG_FILE").unwrap_or("config.ini".to_string());
 
         let mut config = Ini::new();
 
-        let _ = config.load(config_file)
+        let _ = config
+            .load(config_file)
             .expect("configuration file must be present");
 
         let provider = match config.get("resolver", "provider") {
@@ -62,33 +59,32 @@ impl ApplicationSettings {
                     Provider::Google
                 }
             }
-            None => Provider::Google
+            None => Provider::Google,
         };
 
         let ttl = match config.get("resolver", "ttl") {
             Some(str) => {
                 if str.eq("default") {
                     TTlConfig::Default
                 } else {
-                    let time = str
-                        .parse::<u64>()
-                        .unwrap_or(60);
+                    let time = str.parse::<u64>().unwrap_or(60);
 
                     TTlConfig::Custom(time)
                 }
             }
-            None => TTlConfig::Default
+            None => TTlConfig::Default,
         };
 
-        let dn_connection = config.get("sqlite", "connection").unwrap_or("doh.db".to_string());
-
+        let dn_connection = config
+            .get("sqlite", "connection")
+            .unwrap_or("doh.db".to_string());
 
         Self {
             provider,
             ttl,
             sqlite: SQLiteSettings {
-                connection_str: dn_connection
+                connection_str: dn_connection,
             },
         }
     }
-}
+}
diff --git a/doh/Cargo.toml b/doh/Cargo.toml
@@ -14,7 +14,6 @@ libc = "0.2.71"
 lazy_static = "1.4.0"
 paste = "0.1.18"
 libnss = { path = "../libnss" }
-log = "0.4.17"
 blocking = "1.6.2"
 
 zbus = "5.9.0"
diff --git a/doh/src/lib.rs b/doh/src/lib.rs
@@ -35,7 +35,7 @@ impl HostHooks for DoHHost {
                     Some("com.glaciaos.NameResolver"),
                     "/com/glaciaos/NameResolver",
                     Some("com.glaciaos.NameResolver"),
-                    "NameRequest",
+                    "ResolveName",
                     &(std::process::id(), name, record_type),
                 )
             })

-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +#!/bin/sh
 +set -e
++
 +mkdir -p /var/log/frost-doh
++
++
 +exit 0