From 340b2e4f4ce5459bb143618fe471fc7af003c0be Mon Sep 17 00:00:00 2001 From: nabil salah Date: Mon, 23 Dec 2024 17:52:55 +0200 Subject: [PATCH] feat: add use of command line args Signed-off-by: nabil salah --- Cargo.lock | 230 ++++++++++++++++++++++++++++++++++++++++++++++++++++ Cargo.toml | 3 +- README.md | 13 +++ src/lib.rs | 15 ++-- src/main.rs | 21 ++++- 5 files changed, 272 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1179058..1563e94 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,6 +2,236 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "anstream" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" + +[[package]] +name = "anstyle-parse" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" +dependencies = [ + "anstyle", + "windows-sys", +] + +[[package]] +name = "clap" +version = "4.5.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.5.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" + +[[package]] +name = "colorchoice" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" + [[package]] name = "dnsserver-nabil" version = "0.1.0" +dependencies = [ + "clap", +] + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[package]] +name = "proc-macro2" +version = "1.0.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "syn" +version = "2.0.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "unicode-ident" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" diff --git a/Cargo.toml b/Cargo.toml index 62000e0..ad56c4e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,6 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] +clap = { version = "4.5.23", features = ["derive"] } [profile.release] -target = "x86_64-unknown-linux-musl" \ No newline at end of file +target = "x86_64-unknown-linux-musl" diff --git a/README.md b/README.md index 8174853..c22b262 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,19 @@ A simple and efficient DNS server implemented in Rust, designed to handle DNS qu cargo build ``` +### Command Line Options +This is the result of running hermes -h +```bash +A simple DNS server application + +Usage: dnsserver-nabil [OPTIONS] + +Options: + -p, --port Port to bind the UDP socket [default: 2053] + -f, --forward-ip forward replies to specified dns server + -h, --help Print help + -V, --version Print version +``` ### Running the Server To run the DNS server, use the following command: diff --git a/src/lib.rs b/src/lib.rs index b93bb21..dfd59b6 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -13,9 +13,12 @@ use { dns_question::DnsQuestion, query_types::QueryType, }; -fn recursive_lookup(qname: &str, qtype: QueryType) -> Result { - // For now we're always starting with *a.root-servers.net*. - let mut ns = "198.41.0.4".parse::().unwrap(); +fn recursive_lookup(qname: &str, qtype: QueryType, root_ip: &Option) -> Result { + // For now we're always starting with *a.root-servers.net* if no forwarding ip specified. + let mut ns = match root_ip{ + Some(ip) => ip, + None => "198.41.0.4" + }.parse::().unwrap(); loop { println!("attempting lookup of {:?} {} with ns {}", qtype, qname, ns); @@ -44,7 +47,7 @@ fn recursive_lookup(qname: &str, qtype: QueryType) -> Result return Ok(response), }; - let recursive_response = recursive_lookup(&new_ns_name, QueryType::A)?; + let recursive_response = recursive_lookup(&new_ns_name, QueryType::A, root_ip)?; if let Some(new_ns) = recursive_response.get_random_a() { ns = new_ns; @@ -80,7 +83,7 @@ fn lookup(qname: &str, qtype: QueryType, server: (Ipv4Addr, u16)) -> Result Result<(), io::Error> { +pub fn handle_query(socket: &UdpSocket, root_ip: &Option) -> Result<(), io::Error> { let mut req_buffer = BytePacketBuffer::new(); let (_, src) = socket.recv_from(&mut req_buffer.buf)?; @@ -95,7 +98,7 @@ pub fn handle_query(socket: &UdpSocket) -> Result<(), io::Error> { if let Some(question) = request.questions.pop() { println!("Received query: {:?}", question); - if let Ok(result) = recursive_lookup(&question.name, question.qtype) { + if let Ok(result) = recursive_lookup(&question.name, question.qtype, root_ip) { packet.questions.push(question.clone()); packet.header.rescode = result.header.rescode; diff --git a/src/main.rs b/src/main.rs index 4cc9ce4..a483a43 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,13 +1,28 @@ use std::{io, net::UdpSocket}; +use clap::Parser; + +#[derive(Parser)] +#[command(name = "DnsServerApp")] +#[command(version = "1.0")] +#[command(about = "A simple DNS server application", long_about = None)] +struct Args { + /// Port to bind the UDP socket + #[arg(short, long, default_value_t = 2053)] + port: u16, + /// forward replies to specified dns server + #[arg(short, long, default_value = None)] + forward_ip: Option, +} fn main() -> Result<(), io::Error> { - // Bind an UDP socket on port 2053 - let socket = UdpSocket::bind(("0.0.0.0", 2053))?; + let args = Args::parse(); + // Bind an UDP socket on port + let socket = UdpSocket::bind(("0.0.0.0", args.port))?; // For now, queries are handled sequentially, so an infinite loop for servicing // requests is initiated. loop { - match dnsserver_nabil::handle_query(&socket) { + match dnsserver_nabil::handle_query(&socket, &args.forward_ip) { Ok(_) => {} Err(e) => eprintln!("An error occurred: {}", e), }