trying to implement rust

.github/workflows/workflow.yml

@@ -4,23 +4,23 @@ on:
   workflow_dispatch:
     inputs:
       tag:
-        description: 'Tag for the release (x.x.x)'
+        description: "Tag for the release (x.x.x)"
         required: true
         type: string
       version:
-        description: 'Module version (x.x)'
+        description: "Module version (x.x)"
         required: true
         type: string
       version_code:
-        description: 'Module version code (xx)'
+        description: "Module version code (xx)"
         required: true
         type: string
       release_name:
-        description: 'Release Name'
+        description: "Release Name"
         required: true
         type: string
       release_changes:
-        description: 'Release Changes'
+        description: "Release Changes"
         required: true
         type: string
 
@@ -31,7 +31,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Make build dirs
-        run: mkdir -p zaprett/system/bin zaprett-hosts/system/bin zaprett-tv/system/bin zaprett/system/etc/zaprett/lists zapret-latest out lists zapret-hosts/system/etc/zaprett/lists zapret-tv/system/etc/zaprett/lists 
+        run: mkdir -p zaprett/system/bin zaprett-hosts/system/bin zaprett-tv/system/bin zaprett/system/etc/zaprett/lists zapret-latest out lists zapret-hosts/system/etc/zaprett/lists zapret-tv/system/etc/zaprett/lists
 
       - name: Download latest zapret binaries
         run: |
@@ -61,7 +61,7 @@ jobs:
           cp zapret-latest/binaries/linux-mips/nfqws zaprett/system/bin/nfqws_mips
           cp zapret-latest/binaries/linux-mipsel/nfqws zaprett/system/bin/nfqws_mipsel
 
-          cp -a src/* zaprett/
+          cp -a src-module/* zaprett/
 
           #copy all files to another distributions
           cp -r zaprett/* zaprett-hosts/
@@ -79,7 +79,7 @@ jobs:
           cp lists/list-discord.txt zaprett-hosts/system/etc/zaprett/lists/
 
           cp hosts/hosts zaprett-hosts/system/etc
-      
+
       - name: Create module.prop
         run: |
           cat > zaprett/module.prop <<EOF
@@ -91,7 +91,7 @@ jobs:
           description=Ускорение CDN серверов Google. ТГК: https://t.me/zaprett_module
           updateJson=https://raw.githubusercontent.com/egor-white/zaprett/refs/heads/main/update.json
           EOF
-          
+
           cat > zaprett-hosts/module.prop <<EOF
           id=zaprett
           name=zaprett-hosts
@@ -101,7 +101,7 @@ jobs:
           description=Ускорение CDN серверов Google. ТГК: https://t.me/zaprett_module
           updateJson=https://raw.githubusercontent.com/egor-white/zaprett/refs/heads/main/update-hosts.json
           EOF
-          
+
           cat > zaprett-tv/module.prop <<EOF
           id=zaprett
           name=zaprett-tv
@@ -111,7 +111,7 @@ jobs:
           description=Ускорение CDN серверов Google. ТГК: https://t.me/zaprett_module
           updateJson=https://raw.githubusercontent.com/egor-white/zaprett/refs/heads/main/update-tv.json
           EOF
-          
+
       - name: Tree files
         run: |
           tree zaprett/ zaprett-hosts/ zaprett-tv/
@@ -124,7 +124,7 @@ jobs:
           mv zaprett.zip out/
           mv zaprett-hosts.zip out/
           mv zaprett-tv.zip out/
-      
+
       - name: Create release
         uses: softprops/action-gh-release@v2
         with:
@@ -136,7 +136,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Update changelog
         run: echo "${{ inputs.release_changes}}" > changelog.md
-          
+
       - name: Update update.json
         run: |
           cat > update.json <<EOF
@@ -167,8 +167,8 @@ jobs:
         uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: "Update update's.json and changelog"
-          file_pattern: 'update.json update_hosts.json update_tv.json changelog.md'
-   
+          file_pattern: "update.json update_hosts.json update_tv.json changelog.md"
+
       - name: Send bot post
         env:
           MESSAGE_TEXT: |
@@ -185,4 +185,3 @@ jobs:
             -d parse_mode=HTML \
             -d disable_web_page_preview=true \
             --data-urlencode "text=$MESSAGE_TEXT"
-            

.github/workflows/workflow_without_post.yml

@@ -4,23 +4,23 @@ on:
   workflow_dispatch:
     inputs:
       tag:
-        description: 'Tag for the release (x.x.x)'
+        description: "Tag for the release (x.x.x)"
         required: true
         type: string
       version:
-        description: 'Module version (x.x)'
+        description: "Module version (x.x)"
         required: true
         type: string
       version_code:
-        description: 'Module version code (xx)'
+        description: "Module version code (xx)"
         required: true
         type: string
       release_name:
-        description: 'Release Name'
+        description: "Release Name"
         required: true
         type: string
       release_changes:
-        description: 'Release Changes'
+        description: "Release Changes"
         required: true
         type: string
 
@@ -31,7 +31,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Make build dirs
-        run: mkdir -p zaprett/system/bin zaprett-hosts/system/bin zaprett-tv/system/bin zaprett/system/etc/zaprett/lists zapret-latest out lists zapret-hosts/system/etc/zaprett/lists zapret-tv/system/etc/zaprett/lists 
+        run: mkdir -p zaprett/system/bin zaprett-hosts/system/bin zaprett-tv/system/bin zaprett/system/etc/zaprett/lists zapret-latest out lists zapret-hosts/system/etc/zaprett/lists zapret-tv/system/etc/zaprett/lists
 
       - name: Download latest zapret binaries
         run: |
@@ -61,15 +61,15 @@ jobs:
           cp zapret-latest/binaries/linux-mips/nfqws zaprett/system/bin/nfqws_mips
           cp zapret-latest/binaries/linux-mipsel/nfqws zaprett/system/bin/nfqws_mipsel
 
-          cp -a src/* zaprett/
+          cp -a src-module/* zaprett/
 
           #copy all files to another distributions
           cp -r zaprett/* zaprett-hosts/
           cp -r zaprett/* zaprett-tv/
       - name: Download and copy actual lists
         run: |
-          wget https://raw.githubusercontent.com/CherretGit/zaprett-hosts-repo/refs/heads/main/lists/list-youtube.txt -O lists/list-youtube.txt
-          wget https://raw.githubusercontent.com/CherretGit/zaprett-hosts-repo/refs/heads/main/lists/list-discord.txt -O lists/list-discord.txt
+          wget https://raw.githubusercontent.com/CherretGit/zaprett-repo/refs/heads/main/lists/include/list-youtube.txt -O lists/list-youtube.txt
+          wget https://raw.githubusercontent.com/CherretGit/zaprett-repo/refs/heads/main/lists/include/list-discord.txt -O lists/list-discord.txt
 
           cp lists/list-youtube.txt zaprett/system/etc/zaprett/lists/
           cp lists/list-youtube.txt zaprett-hosts/system/etc/zaprett/lists/
@@ -79,7 +79,7 @@ jobs:
           cp lists/list-discord.txt zaprett-hosts/system/etc/zaprett/lists/
 
           cp hosts/hosts zaprett-hosts/system/etc
-      
+
       - name: Create module.prop
         run: |
           cat > zaprett/module.prop <<EOF
@@ -87,31 +87,31 @@ jobs:
           name=zaprett
           version=${{ inputs.version }}
           versionCode=${{ inputs.version_code }}
-          author=egor-white, Huananzhi X99, Cherret
+          author=egor-white, Cherret
           description=Ускорение CDN серверов Google. ТГК: https://t.me/zaprett_module
           updateJson=https://raw.githubusercontent.com/egor-white/zaprett/refs/heads/main/update.json
           EOF
-          
+
           cat > zaprett-hosts/module.prop <<EOF
           id=zaprett
           name=zaprett-hosts
           version=${{ inputs.version }}
           versionCode=${{ inputs.version_code }}
-          author=egor-white, Huananzhi X99, Cherret
+          author=egor-white, Cherret
           description=Ускорение CDN серверов Google. ТГК: https://t.me/zaprett_module
           updateJson=https://raw.githubusercontent.com/egor-white/zaprett/refs/heads/main/update-hosts.json
           EOF
-          
+
           cat > zaprett-tv/module.prop <<EOF
           id=zaprett
           name=zaprett-tv
           version=${{ inputs.version }}
           versionCode=${{ inputs.version_code }}
-          author=egor-white, Huananzhi X99, Cherret
+          author=egor-white, Cherret
           description=Ускорение CDN серверов Google. ТГК: https://t.me/zaprett_module
           updateJson=https://raw.githubusercontent.com/egor-white/zaprett/refs/heads/main/update-tv.json
           EOF
-          
+
       - name: Tree files
         run: |
           tree zaprett/ zaprett-hosts/ zaprett-tv/
@@ -124,7 +124,7 @@ jobs:
           mv zaprett.zip out/
           mv zaprett-hosts.zip out/
           mv zaprett-tv.zip out/
-      
+
       - name: Create release
         uses: softprops/action-gh-release@v2
         with:
@@ -136,7 +136,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Update changelog
         run: echo "${{ inputs.release_changes}}" > changelog.md
-          
+
       - name: Update update.json
         run: |
           cat > update.json <<EOF
@@ -167,4 +167,4 @@ jobs:
         uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: "Update update's.json and changelog"
-          file_pattern: 'update.json update_hosts.json update_tv.json changelog.md'
+          file_pattern: "update.json update_hosts.json update_tv.json changelog.md"

.gitignore

@@ -0,0 +1 @@
+target

rust/CMakeLists.txt

@@ -0,0 +1,19 @@
+cmake_minimum_required(VERSION 3.10)
+project(nfqws C)
+
+set(CMAKE_C_STANDARD 99)
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Os -std=gnu99")
+
+file(GLOB SRC_FILES
+    "${CMAKE_CURRENT_SOURCE_DIR}/zapret/nfq/*.c"
+    "${CMAKE_CURRENT_SOURCE_DIR}/zapret/nfq/crypto/*.c"
+)
+
+add_library(nfqws STATIC ${SRC_FILES})
+
+target_link_libraries(nfqws
+    z
+    netfilter_queue
+    nfnetlink
+    mnl
+)

rust/Cargo.toml

@@ -0,0 +1,20 @@
+[package]
+name = "zaprett"
+version = "0.0.1"
+edition = "2024"
+
+[dependencies]
+anyhow = "1.0.100"
+clap = { version = "4.5.50", features = ["derive"] }
+iptables = "0.6.0"
+libc = "0.2.177"
+procfs = "0.18.0"
+regex = "1.12.2"
+rust-ini = "0.21.3"
+serde = { version = "1.0.228", features = ["derive"] }
+serde_json = "1.0.145"
+sysctl = "0.7.1"
+tokio = { version = "1.48.0", features = ["full"] }
+
+[build-dependencies]
+cmake = "0.1.49"

rust/build.rs

@@ -0,0 +1,12 @@
+use cmake::Config;
+
+fn main() {
+    let dst = Config::new(".").build_target("nfqws").build();
+    let lib_path = dst.join("build");
+    println!("cargo:rustc-link-search=native={}", lib_path.display());
+    println!("cargo:rustc-link-lib=static=nfqws");
+    println!("cargo:rustc-link-lib=z");
+    println!("cargo:rustc-link-lib=netfilter_queue");
+    println!("cargo:rustc-link-lib=nfnetlink");
+    println!("cargo:rustc-link-lib=mnl");
+}

rust/src/main.rs

@@ -0,0 +1,326 @@
+use clap::builder::StringValueParser;
+use clap::{ArgAction, Parser, Subcommand, builder::BoolishValueParser};
+use ini::Ini;
+use procfs::process::all_processes;
+use regex::Regex;
+use serde::{Deserialize, Serialize};
+use std::cmp::Ordering;
+use std::ffi::CString;
+use std::fs::File;
+use std::io::BufReader;
+use std::io::{Read, Write};
+use std::os::raw::c_char;
+use std::sync::atomic::AtomicBool;
+use std::{fs, path::Path};
+use sysctl::{CtlValue, Sysctl};
+
+#[derive(Parser)]
+#[command(version)]
+struct Cli {
+    #[command(subcommand)]
+    cmd: Option<Commands>,
+}
+
+#[derive(Subcommand)]
+enum Commands {
+    #[clap(about = "Start service")]
+    Start,
+
+    #[clap(about = "Stop service")]
+    Stop,
+
+    #[clap(about = "Restart service")]
+    Restart,
+
+    #[clap(about = "Show service status")]
+    Status,
+
+    #[clap(about = "Enable/disable autorestart")]
+    SetAutostart {
+        #[arg(
+                    value_name = "boolean",
+                    action = ArgAction::Set,
+                    value_parser = BoolishValueParser::new()
+                )]
+        autostart: bool,
+    },
+
+    #[clap(about = "Get autorestart state")]
+    GetAutostart,
+
+    #[clap(about = "Get module version")]
+    ModuleVer,
+
+    #[clap(about = "Get nfqws binary version")]
+    BinVer,
+}
+
+#[derive(Serialize, Deserialize)]
+struct Config {
+    active_lists: Vec<String>,
+    active_ipsets: Vec<String>,
+    active_exclude_lists: Vec<String>,
+    active_exclude_ipsets: Vec<String>,
+    list_type: String,
+    strategy: String,
+    app_list: String,
+    whitelist: Vec<String>,
+    blacklist: Vec<String>,
+}
+#[link(name = "nfqws", kind = "static")]
+unsafe extern "C" {
+    fn nfqws_main(argc: libc::c_int, argv: *const *const c_char) -> libc::c_int;
+}
+
+#[tokio::main]
+async fn main() {
+    let cli = Cli::parse();
+    match &cli.cmd {
+        Some(Commands::Start) => start_service(),
+        Some(Commands::Stop) => stop_service(),
+        Some(Commands::Restart) => restart_service(),
+        Some(Commands::Status) => service_status(),
+        Some(Commands::SetAutostart { autostart }) => set_autostart(autostart),
+        Some(Commands::GetAutostart) => get_autostart(),
+        Some(Commands::ModuleVer) => module_version(),
+        Some(Commands::BinVer) => todo!(), //bin_version(),
+        //None => println!("zaprett installed. Join us: t.me/zaprett_module"),
+        None => run_nfqws("-v").await,
+    }
+    tokio::signal::ctrl_c().await.unwrap();
+}
+
+fn start_service() {
+    println!("Starting zaprett service...");
+
+    let tmp_dir = Path::new("/data/adb/modules/zaprett/tmp");
+    if tmp_dir.exists() {
+        fs::remove_dir_all(&tmp_dir).unwrap()
+    }
+
+    let reader =
+        BufReader::new(File::open("/sdcard/zaprett/config.json").expect("cannot open config.json"));
+    let config: Config = serde_json::from_reader(reader).expect("invalid json");
+
+    let list_type: &String = &config.list_type;
+
+    let def_strat: String = String::from("
+        --filter-tcp=80 --dpi-desync=fake,split2 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig,badsum $hostlist --new
+        --filter-tcp=443 $hostlist --dpi-desync=fake,split2 --dpi-desync-repeats=6 --dpi-desync-fooling=md5sig,badsum --dpi-desync-fake-tls=${zaprettdir}/bin/tls_clienthello_www_google_com.bin --new
+        --filter-tcp=80,443 --dpi-desync=fake,disorder2 --dpi-desync-repeats=6 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig,badsum $hostlist --new
+        --filter-udp=50000-50100 --dpi-desync=fake --dpi-desync-any-protocol --dpi-desync-fake-quic=0xC30000000108 --new
+        --filter-udp=443 $hostlist --dpi-desync=fake --dpi-desync-repeats=6 --dpi-desync-fake-quic=${zaprettdir}/bin/quic_initial_www_google_com.bin --new
+        --filter-udp=443 --dpi-desync=fake --dpi-desync-repeats=6 $hostlist
+        ");
+    let strat = if Path::new(&config.strategy).exists() {
+        fs::read_to_string(&config.strategy).unwrap_or_else(|_| def_strat)
+    } else {
+        def_strat
+    };
+
+    let regex_hostlist = Regex::new(r"\$hostlist").unwrap();
+    let regex_ipsets = Regex::new(r"\$ipset").unwrap();
+    let regex_zaprettdir = Regex::new(r"\$\{?zaprettdir\}?").unwrap();
+
+    let zaprett_dir = String::from("/sdcard/zaprett");
+    let mut strat_modified = String::new();
+
+    if list_type.eq("whitelist") {
+        merge_files(
+            config.active_lists,
+            "/data/adb/modules/zaprett/tmp/hostlist",
+        )
+        .unwrap();
+        merge_files(config.active_ipsets, "/data/adb/modules/zaprett/tmp/ipset").unwrap();
+
+        let hosts = String::from("--hostlist=/data/adb/modules/zaprett/tmp/hostlist");
+        let ipsets = String::from("--ipset=/data/adb/modules/zaprett/tmp/ipset");
+
+        strat_modified = regex_hostlist.replace_all(&strat, &hosts).into_owned();
+        strat_modified = regex_ipsets
+            .replace_all(&strat_modified, &ipsets)
+            .into_owned();
+        strat_modified = regex_zaprettdir
+            .replace_all(&strat_modified, &zaprett_dir)
+            .into_owned();
+    } else if list_type.eq("blacklist") {
+        merge_files(
+            config.active_exclude_lists,
+            "/data/adb/modules/zaprett/tmp/hostlist-exclude",
+        )
+        .unwrap();
+        merge_files(
+            config.active_exclude_ipsets,
+            "/data/adb/modules/zaprett/tmp/ipset-exclude",
+        )
+        .unwrap();
+
+        let hosts =
+            String::from("--hostlist-exclude=/data/adb/modules/zaprett/tmp/hostlist-exclude");
+        let ipsets = String::from("--ipset-exclude=/data/adb/modules/zaprett/tmp/ipset-exclude");
+
+        strat_modified = regex_hostlist.replace_all(&strat, &hosts).into_owned();
+        strat_modified = regex_ipsets
+            .replace_all(&strat_modified, &ipsets)
+            .into_owned();
+        strat_modified = regex_zaprettdir
+            .replace_all(&strat_modified, &zaprett_dir)
+            .into_owned();
+    } else {
+        panic!("no list-type called {}", &list_type)
+    }
+
+    let ctl = sysctl::Ctl::new("net.netfilter.nf_conntrack_tcp_be_liberal").unwrap();
+    ctl.set_value(CtlValue::Int(1)).unwrap();
+
+    setup_iptables_rules();
+    //run_nfqws(&strat_modified);
+    todo!();
+    println!("zaprett service started!");
+}
+fn stop_service() {
+    clear_iptables_rules();
+    todo!()
+}
+fn restart_service() {
+    stop_service();
+    start_service();
+    println!("zaprett service restarted!")
+}
+fn set_autostart(autostart: &bool) {
+    if *autostart {
+        if let Err(e) = std::fs::File::create("/data/adb/modules/zaprett/autostart") {
+            eprintln!("autostart: cannot create flag file: {e}");
+        }
+    } else {
+        fs::remove_file("/data/adb/modules/zaprett/autostart").unwrap()
+    }
+}
+fn get_autostart() {
+    let file = Path::new("/data/adb/modules/zaprett/autostart");
+    println!("{}", file.exists());
+}
+fn service_status() {
+    let running = match all_processes() {
+        Ok(iter) => iter
+            .filter_map(|rp| rp.ok())
+            .filter_map(|p| p.stat().ok())
+            .any(|st| st.comm == "nfqws"),
+        Err(_) => false,
+    };
+
+    println!("zaprett is {}", if running { "working" } else { "stopped" });
+}
+
+fn module_version() {
+    if let Ok(prop) = Ini::load_from_file("/data/adb/modules/zaprett/module.prop") {
+        if let Some(props) = prop.section::<String>(None) {
+            if let Some(v) = props.get("version") {
+                println!("{}", v);
+            }
+        }
+    }
+}
+fn bin_version() {
+    todo!()
+    /*if let Ok(output) = Command::new("nfqws").arg("--version").output() {
+        if output.status.success() {
+            let stdout = String::from_utf8_lossy(&output.stdout);
+            if let Ok(re) = Regex::new(r"version v[0-9.]+") {
+                if let Some(m) = re.find(&stdout) {
+                    if let Some(v) = m.as_str().split_whitespace().nth(1) {
+                        println!("{}", v);
+                        return;
+                    }
+                }
+            }
+        }
+    }*/
+}
+fn merge_files(
+    input_paths: Vec<String>,
+    output_path: &str,
+) -> Result<(), Box<dyn std::error::Error>> {
+    let mut combined_content = String::new();
+
+    for path_str in input_paths {
+        let path = Path::new(&path_str);
+        let mut file = File::open(path)?;
+        let mut content = String::new();
+        file.read_to_string(&mut content)?;
+        combined_content.push_str(&content);
+    }
+
+    let mut output_file = File::create(output_path)?;
+    output_file.write_all(combined_content.as_bytes())?;
+
+    Ok(())
+}
+fn setup_iptables_rules() {
+    let ipt = iptables::new(false).unwrap();
+
+    ipt.insert(
+        "mangle",
+        "POSTROUTING",
+        "-j NFQUEUE --queue-num 200 --queue-bypass",
+        1,
+    )
+    .unwrap();
+    ipt.insert(
+        "mangle",
+        "PREROUTING",
+        "-j NFQUEUE --queue-num 200 --queue-bypass",
+        1,
+    )
+    .unwrap();
+    ipt.append(
+        "filter",
+        "FORWARD",
+        "-j NFQUEUE --queue-num 200 --queue-bypass",
+    )
+    .unwrap();
+}
+fn clear_iptables_rules() {
+    let ipt = iptables::new(false).unwrap();
+
+    ipt.delete(
+        "mangle",
+        "POSTROUTING",
+        "-j NFQUEUE --queue-num 200 --queue-bypass",
+    )
+    .unwrap();
+    ipt.delete(
+        "mangle",
+        "PREROUTING",
+        "-j NFQUEUE --queue-num 200 --queue-bypass",
+    )
+    .unwrap();
+    ipt.delete(
+        "filter",
+        "FORWARD",
+        "-j NFQUEUE --queue-num 200 --queue-bypass",
+    )
+    .unwrap();
+}
+async fn run_nfqws(args_str: &str) {
+    static RUNNING: AtomicBool = AtomicBool::new(false);
+
+    if RUNNING.load(Ordering::SeqCst) {
+        panic!("Thread with nfqws already started!");
+    }
+
+    let mut args: Vec<&str> = vec!["nfqws"];
+
+    if args_str.trim().is_empty() {
+        args.push("-v");
+    } else {
+        for token in args_str.trim().split_whitespace() {
+            args.push(token);
+        }
+    }
+    let c_args: Vec<CString> = args.iter().map(|&arg| CString::new(arg).unwrap()).collect();
+    let argv: Vec<*const c_char> = c_args.iter().map(|arg| arg.as_ptr()).collect();
+
+    RUNNING.store(true, Ordering::SeqCst);
+    tokio::task::spawn_blocking(|| nfqws_main(argv.len() as libc::c_int, argv.as_ptr()));
+}