chore: resolve con

feat: add config
2020-09-19 11:59:11 +08:00 · 2020-09-19 11:56:45 +08:00
4 changed files with 109 additions and 329 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,328 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-[[package]]
-name = "ansi_term"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "arrayref"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
-
-[[package]]
-name = "arrayvec"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
-
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
-
-[[package]]
-name = "base64"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
-
-[[package]]
-name = "bitflags"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-
-[[package]]
-name = "blake2b_simd"
-version = "0.5.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a"
-dependencies = [
- "arrayref",
- "arrayvec",
- "constant_time_eq",
-]
-
-[[package]]
-name = "byteorder"
-version = "1.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
-[[package]]
-name = "clap"
-version = "2.33.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
-dependencies = [
- "ansi_term",
- "atty",
- "bitflags",
- "strsim",
- "textwrap",
- "unicode-width",
- "vec_map",
-]
-
-[[package]]
-name = "constant_time_eq"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
-dependencies = [
- "autocfg",
- "cfg-if",
- "lazy_static",
-]
-
-[[package]]
-name = "dirs"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
-dependencies = [
- "libc",
- "redox_users",
- "winapi",
-]
-
-[[package]]
-name = "fuchsia-cprng"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
-
-[[package]]
-name = "getrandom"
-version = "0.1.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "libc"
-version = "0.2.77"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2f96b10ec2560088a8e76961b00d47107b3a625fecb76dedb29ee7ccbf98235"
-
-[[package]]
-name = "rand"
-version = "0.3.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c"
-dependencies = [
- "libc",
- "rand 0.4.6",
-]
-
-[[package]]
-name = "rand"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
-dependencies = [
- "fuchsia-cprng",
- "libc",
- "rand_core 0.3.1",
- "rdrand",
- "winapi",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
-dependencies = [
- "rand_core 0.4.2",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
-
-[[package]]
-name = "rdrand"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.1.57"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
-
-[[package]]
-name = "redox_users"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d"
-dependencies = [
- "getrandom",
- "redox_syscall",
- "rust-argon2",
-]
-
-[[package]]
-name = "rust-argon2"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dab61250775933275e84053ac235621dfb739556d5c54a2f2e9313b7cf43a19"
-dependencies = [
- "base64",
- "blake2b_simd",
- "constant_time_eq",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "rust_util"
-version = "0.6.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7222f977acb4264fb55f1aa7cf11e09c735fe961b369aef92eea670949628498"
-dependencies = [
- "lazy_static",
- "libc",
- "term",
- "term_size",
-]
-
-[[package]]
-name = "simple-rust-udp-proxy"
-version = "0.1.0"
-dependencies = [
- "clap",
- "rand 0.3.23",
- "rust_util",
-]
-
-[[package]]
-name = "strsim"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-
-[[package]]
-name = "term"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42"
-dependencies = [
- "byteorder",
- "dirs",
- "winapi",
-]
-
-[[package]]
-name = "term_size"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "textwrap"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-dependencies = [
- "unicode-width",
-]
-
-[[package]]
-name = "unicode-width"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
-
-[[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,5 +9,7 @@ description = "Very simple rust UDP proxy"

 [dependencies]
 rand = "0.3"
-rust_util = "0.6"
+rust_util = { version = "0.6", features = ["use_serde"] }
 clap = "2.33"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
--- a/src/config.rs
+++ b/src/config.rs
@@ -0,0 +1,104 @@
+use std::fs::read_to_string;
+use std::path::Path;
+use serde::{ Deserialize, Serialize };
+use rust_util::XResult;
+use rust_util::util_file::read_config;
+use rust_util::util_file::get_absolute_path;
+
+// read config order:
+// param assigned
+// ./udp_listen_config.json
+// ~/udp_listen_config.json
+// /etc/udp_listen_config.json
+const UDP_LISTEN_CONFIG_JSON:      &str = "udp_listen_config.json";
+const HOME_UDP_LISTEN_CONFIG_JSON: &str = "~/udp_listen_config.json";
+const ETC_UDP_LISTEN_CONFIG_JSON:  &str = "/etc/udp_listen_config.json";
+
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct UdpListenConfig {
+    pub listen: String,
+    pub backend: String,
+    pub allow_ips: Option<Vec<String>>,
+}
+
+pub fn read_udp_listen_config(config_file: Option<String>) -> XResult<Option<UdpListenConfig>> {
+    match read_config(config_file, &[ UDP_LISTEN_CONFIG_JSON.into(),
+                                      HOME_UDP_LISTEN_CONFIG_JSON.into(),
+                                      ETC_UDP_LISTEN_CONFIG_JSON.into()
+                                    ]) {
+        None => {
+            failure!("Cannot find udp listen config file!");
+            Ok(None)
+        },
+        Some(config_path) => {
+            information!("Found config file: {:?}", config_path);
+            let config_content = read_to_string(config_path)?;
+            Ok(serde_json::from_str(&config_content)?)
+        },
+    }
+}
+
+// pub fn parse_udp_listen_config(p_config_file: &str) -> Option<UdpListenConfig> {
+//     let (udp_listen_config_file, udp_listen_config_json) = match read_config_file_content(p_config_file) {
+//         Some(udp_listen_config_json) => udp_listen_config_json, None => return None,
+//     };
+//     let udp_listen_config: UdpListenConfig = match serde_json::from_str(&udp_listen_config_json) {
+//         Ok(udp_listen_config) => udp_listen_config, Err(e) => {
+//             failure!("Parse config file: {:?}, failed: {}", &udp_listen_config_file, e);
+//             return None;
+//         },
+//     };
+//     // if udp_listen_config.udp_listens.is_empty() {
+//     //     failure!("Cannot find any udp listen config in file: {:?}", &udp_listen_config_file);
+//     //     return None;
+//     // }
+//     Some(udp_listen_config)
+// }
+
+// fn read_config_file_content(p_config_file: &str) -> Option<(String, String)> {
+//     let config_file = match get_config_file(p_config_file) {
+//         Some(config_file) => config_file, None => {
+//             failure!("Udp listen config file not found!");
+//             return None;
+//         },
+//     };
+//     let udp_listen_config_file = Path::new(&config_file);
+//     if udp_listen_config_file.exists() {
+//         information!("Read udp listen config from file: {:?}", &udp_listen_config_file);
+//     } else {
+//         failure!("Udp listen config file not exists: {:?}", &udp_listen_config_file);
+//         return None;
+//     }
+//     let udp_listen_config_json = match read_to_string(udp_listen_config_file) {
+//         Ok(udp_listen_config_json) => udp_listen_config_json, Err(e) => {
+//             failure!("Read file: {:?}, failed: {}", &udp_listen_config_file, e);
+//             return None;
+//         },
+//     };
+//     Some((config_file, udp_listen_config_json))
+// }
+
+// fn get_config_file(p_config_file: &str) -> Option<String> {
+//     if p_config_file.is_empty() {
+//         get_default_config_file()
+//     } else {
+//         Some(p_config_file.to_owned())
+//     }
+// }
+
+// fn get_default_config_file() -> Option<String> {
+//     if Path::new(UDP_LISTEN_CONFIG_JSON).exists() {
+//         return Some(UDP_LISTEN_CONFIG_JSON.to_owned());
+//     }
+//     if let Some(path) = get_absolute_path(HOME_UDP_LISTEN_CONFIG_JSON) {
+//         if let (true, Some(file_path)) = (path.exists(), path.to_str()) {
+//             return Some(file_path.to_owned());
+//         }
+//     }
+//     if Path::new(ETC_UDP_LISTEN_CONFIG_JSON).exists() {
+//         return Some(ETC_UDP_LISTEN_CONFIG_JSON.to_owned());
+//     }
+//     None
+// }
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,6 +2,8 @@ extern crate rand;
 #[macro_use]
 extern crate rust_util;

+mod config;
+
 use std::collections::HashMap;
 use std::env;
 use std::net::UdpSocket;
Author	SHA1	Message	Date
Hatter Jiang	4b41c0eea0	chore: resolve con	2020-09-19 11:59:11 +08:00
Hatter Jiang	ff22020a79	feat: add config	2020-09-19 11:56:45 +08:00