refactor for less dependencies in cli

Cargo.lock

@@ -1643,15 +1643,10 @@ checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
 name = "zns"
 version = "0.1.0"
 dependencies = [
- "asn1",
  "base64",
- "diesel",
- "dotenvy",
  "int-enum",
- "reqwest",
- "ring",
  "thiserror",
- "tokio",
+ "zns",
 ]
 
 [[package]]
@@ -1669,6 +1664,13 @@ dependencies = [
 name = "zns-daemon"
 version = "0.1.0"
 dependencies = [
+ "asn1",
+ "base64",
+ "diesel",
+ "dotenvy",
+ "int-enum",
+ "reqwest",
+ "ring",
  "tokio",
  "zns",
 ]

zns-daemon/Cargo.toml

@@ -2,10 +2,22 @@
 name = "zns-daemon"
 version = "0.1.0"
 edition = "2021"
+resolver = "2"
 
 [dependencies]
-tokio = {version = "1.36.0"}
+tokio = {version = "1.36.0", features = ["macros","rt-multi-thread","net"]}
+diesel = { version = "2.1.4", features = ["postgres"] }
+dotenvy = "0.15"
+ring = "0.17.8"
+reqwest = {version = "0.12.4", features = ["json","default"]}
+asn1 = "0.16.2"
+base64 = "0.22.0"
+int-enum = "1.1"
+
 
 [dependencies.zns]
-version = "0.1.0"
+version = "*"
 path = "../zns"
+
+[dev-dependencies]
+zns = { path = "../zns", features = ["test-utils"] }

zns-daemon/src/db/models.rs

@@ -1,9 +1,9 @@
-use crate::{
+use diesel::prelude::*;
+use diesel::sql_types::Text;
+use zns::{
     errors::ZNSError,
     structs::{Class, Type, RR},
 };
-use diesel::prelude::*;
-use diesel::sql_types::Text;
 
 use self::schema::records::{self};
 
@@ -100,7 +100,7 @@ pub fn insert_into_database(rr: &RR, connection: &mut PgConnection) -> Result<()
         rdata: rr.rdata.clone(),
     };
 
-    Record::create(connection, record).map_err(|e| ZNSError::Database {
+    Record::create(connection, record).map_err(|e| ZNSError::Servfail {
         message: e.to_string(),
     })?;
 
@@ -119,7 +119,7 @@ pub fn get_from_database(
         _type.map(|t| t.into()),
         class.into(),
     )
-    .map_err(|e| ZNSError::Database {
+    .map_err(|e| ZNSError::Servfail {
         message: e.to_string(),
     })?;
 
@@ -157,9 +157,12 @@ pub fn delete_from_database(
 
 #[cfg(test)]
 mod tests {
+
+    use zns::test_utils::get_rr;
+
     use super::*;
 
-    use crate::{db::lib::tests::get_test_connection, parser::tests::get_rr};
+    use crate::db::lib::tests::get_test_connection;
 
     #[test]
     fn test() {

zns-daemon/src/handlers/mod.rs

@@ -1,6 +1,6 @@
 use diesel::PgConnection;
 
-use crate::{
+use zns::{
     errors::ZNSError,
     structs::{Message, Opcode},
 };

zns-daemon/src/handlers/query.rs

@@ -1,11 +1,12 @@
 use diesel::PgConnection;
 
-use crate::{
+use zns::{
-    db::models::get_from_database,
     errors::ZNSError,
     structs::{Message, Question, RR},
 };
 
+use crate::db::models::get_from_database;
+
 use super::ResponseHandler;
 
 pub struct QueryHandler {}
@@ -42,7 +43,7 @@ impl ResponseHandler for QueryHandler {
                     response.answer.extend(rrs)
                 }
                 Err(e) => {
-                    return Err(ZNSError::Database {
+                    return Err(ZNSError::Servfail {
                         message: e.to_string(),
                     })
                 }
@@ -79,12 +80,11 @@ fn try_wildcard(question: &Question, connection: &mut PgConnection) -> Result<Ve
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::parser::tests::get_message;
-    use crate::structs::*;
 
-    use crate::{
+    use crate::db::{lib::tests::get_test_connection, models::insert_into_database};
-        db::{lib::tests::get_test_connection, models::insert_into_database},
+    use zns::{
-        parser::{tests::get_rr, ToBytes},
+        parser::ToBytes,
+        test_utils::{get_message, get_rr},
     };
 
     #[tokio::test]

zns-daemon/src/handlers/update/authenticate.rs

@@ -1,9 +1,9 @@
 use diesel::PgConnection;
 use reqwest::header::ACCEPT;
 
-use crate::{
+use crate::{config::Config, db::models::get_from_database};
-    config::Config,
+
-    db::models::get_from_database,
+use zns::{
     errors::ZNSError,
     parser::FromBytes,
     reader::Reader,

zns-daemon/src/handlers/update/dnskey.rs

@@ -1,9 +1,10 @@
-use crate::{errors::ZNSError, parser::FromBytes, reader::Reader};
+use zns::{errors::ZNSError, parser::FromBytes, reader::Reader};
 
 use super::sig::Algorithm;
 
 /// https://datatracker.ietf.org/doc/html/rfc4034#section-2
 #[derive(Debug)]
+#[allow(dead_code)]
 pub struct DNSKeyRData {
     pub flags: u16,
     pub protocol: u8,

zns-daemon/src/handlers/update/mod.rs

@@ -3,11 +3,12 @@ use diesel::PgConnection;
 use crate::{
     config::Config,
     db::models::{delete_from_database, insert_into_database},
-    errors::ZNSError,
-    structs::{Class, Message, RRClass, RRType, Type},
     utils::vec_equal,
 };
 
+use zns::errors::ZNSError;
+use zns::structs::{Class, Message, RRClass, RRType, Type};
+
 use self::sig::Sig;
 
 use super::ResponseHandler;

zns-daemon/src/handlers/update/pubkeys/ed25519.rs

@@ -1,8 +1,7 @@
-use ring::signature;
-
-use crate::{errors::ZNSError, handlers::update::sig::Algorithm, reader::Reader};
-
 use super::{PublicKey, SSH_ED25519};
+use crate::handlers::update::sig::Algorithm;
+use ring::signature;
+use zns::{errors::ZNSError, reader::Reader};
 
 pub struct Ed25519PublicKey {
     data: Vec<u8>,

zns-daemon/src/handlers/update/pubkeys/mod.rs

@@ -2,8 +2,7 @@ mod ed25519;
 mod rsa;
 use std::str::from_utf8;
 
-use crate::errors::ZNSError;
+use zns::{errors::ZNSError, reader::Reader};
-use crate::reader::Reader;
 
 pub use self::ed25519::Ed25519PublicKey;
 pub use self::rsa::RsaPublicKey;

zns-daemon/src/handlers/update/pubkeys/rsa.rs

@@ -1,6 +1,6 @@
+use crate::handlers::update::sig::Algorithm;
 use ring::signature;
-
+use zns::{errors::ZNSError, reader::Reader};
-use crate::{errors::ZNSError, handlers::update::sig::Algorithm, reader::Reader};
 
 use super::{PublicKey, SSH_RSA};
 

zns-daemon/src/handlers/update/sig.rs

@@ -1,7 +1,7 @@
 use base64::prelude::*;
 use int_enum::IntEnum;
 
-use crate::{
+use zns::{
     errors::ZNSError,
     parser::FromBytes,
     reader::Reader,

zns-daemon/src/main.rs

@@ -1,9 +1,14 @@
 use std::{error::Error, net::SocketAddr};
 
-use config::Config;
+mod config;
-use zns::config;
+mod resolver;
+mod db;
+mod handlers;
+mod utils;
 
-use zns::resolver::{tcp_listener_loop, udp_listener_loop};
+use config::Config;
+
+use crate::resolver::{tcp_listener_loop, udp_listener_loop};
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error>> {

zns-daemon/src/resolver.rs

@@ -4,13 +4,13 @@ use std::sync::Arc;
 
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use tokio::net::{TcpSocket, UdpSocket};
+use zns::errors::ZNSError;
+use zns::parser::{FromBytes, ToBytes};
+use zns::reader::Reader;
+use zns::structs::{Header, Message, RCODE};
 
 use crate::db::lib::get_connection;
-use crate::errors::ZNSError;
 use crate::handlers::{Handler, ResponseHandler};
-use crate::parser::{FromBytes, ToBytes};
-use crate::reader::Reader;
-use crate::structs::{Header, Message, RCODE};
 
 const MAX_DATAGRAM_SIZE: usize = 512;
 
@@ -102,7 +102,7 @@ pub async fn tcp_listener_loop(addr: SocketAddr) -> Result<(), Box<dyn Error>> {
 
 #[cfg(test)]
 mod tests {
-    use crate::structs::{Class, Question, RRClass, RRType, Type};
+    use zns::structs::{Class, Question, RRClass, RRType, Type};
 
     use super::*;
 

zns/Cargo.toml

@@ -1,15 +1,17 @@
 [package]
 name = "zns"
+resolver = "2"
 version = "0.1.0"
 edition = "2021"
 
+[features]
+test-utils = []
+
 [dependencies]
-diesel = { version = "2.1.4", features = ["postgres"] }
-dotenvy = "0.15"
-tokio = {version = "1.36.0", features = ["macros","rt-multi-thread","net"], default-features = false}
-ring = "0.17.8"
 base64 = "0.22.0"
-reqwest = {version = "0.12.4", features = ["json","default"]}
-asn1 = "0.16.2"
 int-enum = "1.1"
 thiserror = "1.0"
+
+[dev-dependencies]
+zns = { path = ".", features = ["test-utils"] }
+

zns/src/errors.rs

@@ -6,15 +6,12 @@ use crate::structs::{Type, RCODE};
 pub enum ZNSError {
     #[error("Parse Error for {object:?}: {message:?}")]
     Parse { object: String, message: String },
-    #[error("Database Error: {message:?}")]
-    Database { message: String },
     #[error("Reader Error: {message:?}")]
     Reader { message: String },
     #[error("Key Error: {message:?}")]
     Key { message: String },
-    #[error("Reqwest error")]
+    #[error("Server error")]
-    Reqwest(#[from] reqwest::Error),
+    Servfail { message: String },
-
     #[error("DNS Query Format Error: {message:?}")]
     Formerr { message: String },
     #[error("Domain name does not exist: {qtype:?} {domain:?}")]
@@ -33,8 +30,7 @@ impl ZNSError {
             ZNSError::Formerr { .. } | ZNSError::Parse { .. } | ZNSError::Reader { .. } => {
                 RCODE::FORMERR
             }
-            ZNSError::Database { .. } | ZNSError::Reqwest(_) => RCODE::SERVFAIL,
+            ZNSError::Servfail { .. } => RCODE::SERVFAIL,
-
             ZNSError::NotAuth { .. } => RCODE::NOTAUTH,
             ZNSError::NXDomain { .. } => RCODE::NXDOMAIN,
             ZNSError::NotImp { .. } => RCODE::NOTIMP,

zns/src/lib.rs

@@ -1,11 +1,7 @@
-mod db;
-mod handlers;
-mod message;
-mod structs;
-mod utils;
-
-pub mod config;
 pub mod errors;
+pub mod message;
 pub mod parser;
-pub mod resolver;
 pub mod reader;
+pub mod structs;
+
+pub mod test_utils;

zns/src/parser.rs

@@ -284,47 +284,10 @@ impl ToBytes for Message {
 
 #[cfg(test)]
 pub mod tests {
+    use crate::test_utils::{get_message, get_rr};
+
     use super::*;
 
-    pub fn get_rr() -> RR {
-        RR {
-            name: vec![String::from("example"), String::from("org")],
-            _type: Type::Type(RRType::A),
-            class: Class::Class(RRClass::IN),
-            ttl: 10,
-            rdlength: 4,
-            rdata: vec![1, 2, 3, 4],
-        }
-    }
-
-    pub fn get_message() -> Message {
-        Message {
-            header: Header {
-                id: 1,
-                flags: 288,
-                qdcount: 2,
-                ancount: 1,
-                nscount: 1,
-                arcount: 1,
-            },
-            question: vec![
-                Question {
-                    qname: vec![String::from("example"), String::from("org")],
-                    qtype: Type::Type(RRType::A),
-                    qclass: Class::Class(RRClass::IN),
-                },
-                Question {
-                    qname: vec![String::from("example"), String::from("org")],
-                    qtype: Type::Type(RRType::A),
-                    qclass: Class::Class(RRClass::IN),
-                },
-            ],
-            answer: vec![get_rr()],
-            authority: vec![get_rr()],
-            additional: vec![get_rr()],
-        }
-    }
-
     #[test]
     fn test_parse_header() {
         let header = Header {

zns/src/test_utils.rs

@@ -0,0 +1,42 @@
+#![cfg(feature = "test-utils")]
+use crate::structs::*;
+
+#[cfg(feature = "test-utils")]
+pub fn get_rr() -> RR {
+    RR {
+        name: vec![String::from("example"), String::from("org")],
+        _type: Type::Type(RRType::A),
+        class: Class::Class(RRClass::IN),
+        ttl: 10,
+        rdlength: 4,
+        rdata: vec![1, 2, 3, 4],
+    }
+}
+
+pub fn get_message() -> Message {
+    Message {
+        header: Header {
+            id: 1,
+            flags: 288,
+            qdcount: 2,
+            ancount: 1,
+            nscount: 1,
+            arcount: 1,
+        },
+        question: vec![
+            Question {
+                qname: vec![String::from("example"), String::from("org")],
+                qtype: Type::Type(RRType::A),
+                qclass: Class::Class(RRClass::IN),
+            },
+            Question {
+                qname: vec![String::from("example"), String::from("org")],
+                qtype: Type::Type(RRType::A),
+                qclass: Class::Class(RRClass::IN),
+            },
+        ],
+        answer: vec![get_rr()],
+        authority: vec![get_rr()],
+        additional: vec![get_rr()],
+    }
+}