feat: add more feature of lua filter and support opt

Author: jjeffcaii

.github/workflows/docker-publish.yml

@@ -7,23 +7,27 @@ name: Docker
 
 on:
   push:
-    branches: [ "master" ]
+    branches:
+      - master
     # Publish semver tags as releases.
-    tags: [ '*' ]
+    tags:
+      - 'v*'
+#      - 'v[0-9]+.[0-9]+.[0-9]+'
   pull_request:
-    branches: [ "master" ]
+    branches:
+      - master
 
 env:
   # Use docker.io for Docker Hub if empty
   REGISTRY: ghcr.io
   # github.repository as <account>/<repo>
   IMAGE_NAME: ${{ github.repository }}
 
-
 jobs:
   build:
 
     runs-on: ubuntu-latest
+
     permissions:
       contents: read
       packages: write
@@ -43,10 +47,14 @@ jobs:
         with:
           cosign-release: 'v2.4.1'
 
+      # Setup QEMU
+      - name: Setup QEMU
+        uses: docker/setup-qemu-action@v3
+
       # Set up BuildKit Docker container builder to be able to build
       # multi-platform images and export cache
       # https://github.com/docker/setup-buildx-action
-      - name: Set up Docker Buildx
+      - name: Setup Docker Buildx
         uses: docker/[email protected]
 
       # Login against a Docker registry except on PR
@@ -73,6 +81,7 @@ jobs:
         id: build-and-push
         uses: docker/[email protected]
         with:
+          platforms: linux/amd64,linux/arm64
           context: .
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}

.github/workflows/lint.yml

@@ -2,9 +2,11 @@ name: Lint
 
 on:
   push:
-    branches: [ "master" ]
+    branches:
+      - master
   pull_request:
-    branches: [ "master" ]
+    branches:
+      - master
 
 env:
   CARGO_TERM_COLOR: always

.github/workflows/rust-publish.yml

@@ -1,12 +1,12 @@
+name: Crates Publish
+
 on:
   push:
     # Pattern matched against refs/tags
     tags:
-      - '*'           # Push events to every tag not containing /
+      - 'v*'           # Push events to every tag not containing /
   workflow_dispatch:
 
-name: Publish
-
 jobs:
   publish:
     name: Publish

.github/workflows/rust.yml

@@ -2,9 +2,11 @@ name: Rust
 
 on:
   push:
-    branches: [ "master" ]
+    branches:
+      - master
   pull_request:
-    branches: [ "master" ]
+    branches:
+      - master
 
 env:
   CARGO_TERM_COLOR: always

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "zerodns"
-version = "0.1.0-alpha.9"
+version = "0.1.0-alpha.10"
 edition = "2021"
 license = "MIT"
 readme = "README.md"
@@ -59,7 +59,7 @@ strum_macros = "0.26"
 deadpool = "0.12"
 socket2 = "0.5"
 mlua = { version = "0.10", features = ["luajit", "vendored", "serialize", "async", "macros", "send", "anyhow"] }
-garde = { version = "0.21", features = ["serde", "derive", "regex"] }
+garde = { version = "0.22", features = ["serde", "derive", "regex"] }
 rustls = "0.23"
 webpki-roots = "0.26"
 tokio-rustls = "0.26"

README.md

@@ -2,7 +2,7 @@
 
 # ZeroDNS
 
-![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/jjeffcaii/zerodns/rust.yml)
+t![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/jjeffcaii/zerodns/rust.yml)
 [![Codecov](https://img.shields.io/codecov/c/github/jjeffcaii/zerodns)](https://app.codecov.io/gh/jjeffcaii/zerodns)
 [![Crates.io Version](https://img.shields.io/crates/v/zerodns)](https://crates.io/crates/zerodns)
 [![Crates.io Total Downloads](https://img.shields.io/crates/d/zerodns)](https://crates.io/crates/zerodns)
@@ -90,14 +90,18 @@ props = { trusted = ["tcp://208.67.222.222:443", "tcp://208.67.220.220:443"], mi
 kind = "lua"
 props.script = """
 -- The filter entrance:
+
+local resolver = Resolver('223.5.5.5','223.6.6.6')
+
+
 function handle(ctx)
   -- log something...
   for i,v in ipairs(ctx.request:questions()) do
     logger:info('---- question#'..i..': '..v.name)
   end
 
   -- resolve addr from 223.5.5.5
-  local resp = resolve(ctx.request,'223.5.5.5')
+  local resp = resolver:resolve(ctx.request)
 
   -- log something...
   for i,v in ipairs(resp:answers()) do

src/bootstrap.rs

@@ -28,17 +28,11 @@ pub async fn run(c: Config, closer: Arc<Notify>) -> anyhow::Result<()> {
         rb.build()
     };
 
-    let cs = match &c.server.cache_size {
-        None => None,
-        Some(size) => {
-            if *size == 0 {
-                None
-            } else {
-                Some(Arc::new(
-                    MemoryLoadingCache::builder().capacity(*size).build(),
-                ))
-            }
-        }
+    let cs = match &c.global.cache_size {
+        Some(size) if *size > 0 => Some(Arc::new(
+            MemoryLoadingCache::builder().capacity(*size).build(),
+        )),
+        _ => None,
     };
 
     let udp_server = {

src/cmds/resolve.rs

@@ -4,7 +4,7 @@ use clap::ArgMatches;
 use std::net::{IpAddr, SocketAddr};
 use std::time::Duration;
 use zerodns::client::request;
-use zerodns::protocol::{Class, Flags, Kind, Message, DNS};
+use zerodns::protocol::{AdditionalRR, Class, Flags, Kind, Message, DNS};
 
 pub(crate) async fn execute(sm: &ArgMatches) -> Result<()> {
     // --timeout 5
@@ -62,7 +62,13 @@ pub(crate) async fn execute(sm: &ArgMatches) -> Result<()> {
         timeout = Duration::from_secs(n.parse::<u64>()?);
     }
 
-    let flags = Flags::builder().request().recursive_query(true).build();
+    let noedns = sm.get_one::<bool>("noedns").cloned().unwrap_or(false);
+
+    let flags = Flags::builder()
+        .request()
+        .edns(!noedns)
+        .recursive_query(true)
+        .build();
     let req = {
         let mut bu = Message::builder()
             .id({
@@ -76,6 +82,10 @@ pub(crate) async fn execute(sm: &ArgMatches) -> Result<()> {
             bu = bu.question(&domain, next, class);
         }
 
+        if !noedns {
+            bu = bu.additional_pseudo(4096, 0, 0, 0, None::<&[u8]>);
+        }
+
         bu.build()?
     };
 
@@ -124,7 +134,22 @@ fn print_resolve_result(
 
     println!();
     println!(";; OPT PSEUDOSECTION:");
-    println!("; EDNS: version: 0, flags:; udp: 512");
+    for next in res
+        .additionals()
+        .filter(|it| matches!(it, AdditionalRR::PseudoRR(_)))
+    {
+        if let AdditionalRR::PseudoRR(pseude) = next {
+            println!(
+                "; EDNS: version: {}, flags: {:#x}; udp: {}",
+                pseude.version(),
+                pseude.extended_rcode(),
+                pseude.udp_payload_size()
+            );
+            // TODO: print pseude data pairs
+        }
+    }
+
+    println!();
     println!(";; QUESTION SECTION:");
     for question in req.questions() {
         println!(
@@ -149,6 +174,24 @@ fn print_resolve_result(
         );
     }
 
+    println!();
+    println!(";; ADDITIONAL SECTION:");
+    for next in res
+        .additionals()
+        .filter(|it| matches!(it, AdditionalRR::RR(_)))
+    {
+        if let AdditionalRR::RR(rr) = next {
+            println!(
+                "{}.\t{}\t{}\t{}\t{}",
+                rr.name(),
+                rr.time_to_live(),
+                rr.class(),
+                rr.kind(),
+                rr.rdata()?
+            );
+        }
+    }
+
     println!();
     println!(";; Query time: {} msec", cost.num_milliseconds());
     println!(";; SERVER: {}", &dns);

src/cmds/run.rs

@@ -3,6 +3,7 @@ use clap::ArgMatches;
 use std::net::{IpAddr, SocketAddr};
 use std::path::PathBuf;
 use std::sync::Arc;
+use std::time::Duration;
 use tokio::sync::Notify;
 use zerodns::client::SystemClient;
 
@@ -73,7 +74,15 @@ pub(crate) async fn execute(sm: &ArgMatches) -> Result<()> {
 
     closer.notify_waiters();
 
-    stopped.notified().await;
+    const SHUTDOWN_TIMEOUT: u64 = 15;
+    if let Err(_e) =
+        tokio::time::timeout(Duration::from_secs(SHUTDOWN_TIMEOUT), stopped.notified()).await
+    {
+        warn!(
+            "force stop process because graceful shutdown is timeout after {}s",
+            SHUTDOWN_TIMEOUT
+        );
+    }
 
     Ok(())
 }

src/config.rs

@@ -27,12 +27,12 @@ pub struct GlobalConfig {
     pub nameservers: Vec<String>,
     pub resolv_file: Option<String>,
     pub hosts_file: Option<String>,
+    pub cache_size: Option<usize>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct ServerConfig {
     pub listen: String,
-    pub cache_size: Option<usize>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]