diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index dca0157..f9be6a7 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -11,7 +11,7 @@ jobs: - name: Run builder uses: ./.github/actions/build-deb with: - rust: '1.48.0' + rust: '1.49.0' - name: Archive artifacts uses: actions/upload-artifact@v1 with: @@ -31,7 +31,7 @@ jobs: - name: Run builder uses: ./.github/actions/build-rpm with: - rust: '1.48.0' + rust: '1.49.0' - name: Archive artifacts uses: actions/upload-artifact@v1 with: diff --git a/CHANGELOG.md b/CHANGELOG.md index 20c2313..1929536 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,11 @@ This project follows [semantic versioning](http://semver.org). ### UNRELEASED +- [added] Support for creating shell completions +- [added] Support for hook scripts to handle certain situations - [removed] Removed dummy device type -- [changed] Updated depdendencies -- [changed] Changed Rust version to 1.48.0 +- [changed] Updated dependencies +- [changed] Changed Rust version to 1.49.0 - [fixed] Added missing peer address propagation ### v2.0.1 (2020-11-07) diff --git a/Cargo.lock b/Cargo.lock index 77adff4..c165ee8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11,9 +11,9 @@ dependencies = [ [[package]] name = "attohttpc" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1082810677916862c7704351dfe4696a837aaf34da0dd6431abc60783e71ee8f" +checksum = "ba5b30bf3a0aead269fd5dd69b385a3e90c2b55f4f215d1bdf52c3883f5fa7fa" dependencies = [ "http", "log", @@ -52,21 +52,21 @@ checksum = "5988cb1d626264ac94100be357308f29ff7cbdd3b36bda27f450a4ee3f713426" [[package]] name = "bumpalo" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820" +checksum = "f07aa6688c702439a1be0307b6a94dffe1168569e45b9500c1372bc580740d59" [[package]] name = "byteorder" -version = "1.3.4" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" +checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b" [[package]] name = "bytes" -version = "0.5.6" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" +checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" [[package]] name = "cc" @@ -103,9 +103,9 @@ dependencies = [ [[package]] name = "const_fn" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd51eab21ab4fd6a3bf889e2d0958c0a6e3a61ad04260325e919e652a2a62826" +checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6" [[package]] name = "daemonize" @@ -125,9 +125,9 @@ checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" [[package]] name = "dtoa" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b" +checksum = "88d7ed2934d741c6b37e33e3832298e8850b53fd2d2bea03873375596c7cea4e" [[package]] name = "fnv" @@ -147,49 +147,38 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.1.15" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6" +checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" dependencies = [ - "cfg-if 0.1.10", - "libc", - "wasi", -] - -[[package]] -name = "getrandom" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee8025cf36f917e6a52cce185b7c7177689b838b7ec138364e50cc2277a56cf4" -dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "libc", "wasi", ] [[package]] name = "heck" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" +checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac" dependencies = [ "unicode-segmentation", ] [[package]] name = "hermit-abi" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8" +checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" dependencies = [ "libc", ] [[package]] name = "http" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84129d298a6d57d246960ff8eb831ca4af3f96d29e2e28848dae275408658e26" +checksum = "7245cd7449cc792608c3c8a9eaf69bd4eabbabf802713748fd739c98b82f0747" dependencies = [ "bytes", "fnv", @@ -215,7 +204,7 @@ checksum = "4c4e7ee8b51e541486d7040883fe1f00e2a9954bcc24fd155b7e4f03ed4b93dd" dependencies = [ "attohttpc", "log", - "rand 0.8.1", + "rand", "url", "xmltree", ] @@ -231,15 +220,15 @@ dependencies = [ [[package]] name = "itoa" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" +checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" [[package]] name = "js-sys" -version = "0.3.46" +version = "0.3.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d7383929f7c9c7c2d0fa596f325832df98c3704f2c60553080f7127a58175" +checksum = "5cfb73131c35423a367daf8cbd24100af0d077668c8c2943f0e7dd775fef0f65" dependencies = [ "wasm-bindgen", ] @@ -252,15 +241,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.81" +version = "0.2.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb" +checksum = "89203f3fba0a3795506acaad8ebce3c80c0af93f994d5a1d7a0b1eeb23271929" [[package]] name = "linked-hash-map" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a" +checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" [[package]] name = "lock_api" @@ -273,9 +262,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" +checksum = "fcf3805d4480bb5b86070dcfeb9e2cb2ebc148adb753c5cca5f884d1d65a42b2" dependencies = [ "cfg-if 0.1.10", ] @@ -405,46 +394,23 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" +checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df" dependencies = [ "proc-macro2", ] [[package]] name = "rand" -version = "0.7.3" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.15", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc 0.2.0", -] - -[[package]] -name = "rand" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c24fcd450d3fa2b592732565aa4f17a27a61c65ece4726353e000939b0edee34" +checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" dependencies = [ "libc", - "rand_chacha 0.3.0", - "rand_core 0.6.0", - "rand_hc 0.3.0", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", + "rand_hc", ] [[package]] @@ -454,34 +420,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" dependencies = [ "ppv-lite86", - "rand_core 0.6.0", + "rand_core", ] [[package]] name = "rand_core" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +checksum = "c026d7df8b298d90ccbbc5190bd04d85e159eaf5576caeacf8741da93ccbd2e5" dependencies = [ - "getrandom 0.1.15", -] - -[[package]] -name = "rand_core" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8b34ba8cfb21243bd8df91854c830ff0d785fff2e82ebd4434c2644cb9ada18" -dependencies = [ - "getrandom 0.2.0", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", + "getrandom", ] [[package]] @@ -490,14 +438,17 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" dependencies = [ - "rand_core 0.6.0", + "rand_core", ] [[package]] name = "redox_syscall" -version = "0.1.57" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" +checksum = "05ec8ca9416c5ea37062b502703cd7fcb207736bc294f6e0cf367ac6fc234570" +dependencies = [ + "bitflags", +] [[package]] name = "remove_dir_all" @@ -561,15 +512,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.118" +version = "1.0.123" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800" +checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae" +dependencies = [ + "serde_derive", +] [[package]] name = "serde_derive" -version = "1.0.118" +version = "1.0.123" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df" +checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31" dependencies = [ "proc-macro2", "quote", @@ -578,9 +532,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.60" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1500e84d27fe482ed1dc791a56eddc2f230046a040fa908c08bda1d9fb615779" +checksum = "4fceb2595057b6891a4ee808f70054bd2d12f0e97f1cbb78689b59f676df325a" dependencies = [ "itoa", "ryu", @@ -589,9 +543,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7baae0a99f1a324984bcdc5f0718384c1f69775f1c7eec8b859b71b443e3fd7" +checksum = "971be8f6e4d4a47163b405a3df70d14359186f9ab0f3a3ec37df144ca1ce089f" dependencies = [ "dtoa", "linked-hash-map", @@ -617,9 +571,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a55ca5f3b68e41c979bf8c46a6f1da892ca4db8f94023ce0bd32407573b1ac0" +checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" [[package]] name = "spin" @@ -629,9 +583,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "standback" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf906c8b8fc3f6ecd1046e01da1d8ddec83e48c8b08b84dcc02b585a6bedf5a8" +checksum = "c66a8cff4fa24853fdf6b51f75c6d7f8206d7c75cab4e467bcd7f25c2b1febe0" dependencies = [ "version_check", ] @@ -717,9 +671,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.54" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2af957a63d6bd42255c359c93d9bfdb97076bd3b820897ce55ffbfbf107f44" +checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081" dependencies = [ "proc-macro2", "quote", @@ -728,13 +682,13 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" +checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "libc", - "rand 0.7.3", + "rand", "redox_syscall", "remove_dir_all", "winapi", @@ -809,9 +763,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf8dbc19eb42fba10e8feaaec282fb50e2c14b2726d6301dbfeed0f73306a6f" +checksum = "317cca572a0e89c3ce0ca1f1bdc9369547fe318a683418e42ac8f59d14701023" dependencies = [ "tinyvec_macros", ] @@ -906,10 +860,9 @@ dependencies = [ "log", "parking_lot", "privdrop", - "rand 0.8.1", + "rand", "ring", "serde", - "serde_derive", "serde_yaml", "signal", "smallvec", @@ -922,15 +875,15 @@ dependencies = [ [[package]] name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" +version = "0.10.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" +checksum = "93c6c3420963c5c64bca373b25e77acb562081b9bb4dd5bb864187742186cea9" [[package]] name = "wasm-bindgen" -version = "0.2.69" +version = "0.2.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd364751395ca0f68cafb17666eee36b63077fb5ecd972bbcd74c90c4bf736e" +checksum = "55c0f7123de74f0dab9b7d00fd614e7b19349cd1e2f5252bbe9b1754b59433be" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -938,9 +891,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.69" +version = "0.2.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1114f89ab1f4106e5b55e688b828c0ab0ea593a1ea7c094b141b14cbaaec2d62" +checksum = "7bc45447f0d4573f3d65720f636bbcc3dd6ce920ed704670118650bcd47764c7" dependencies = [ "bumpalo", "lazy_static", @@ -953,9 +906,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.69" +version = "0.2.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6ac8995ead1f084a8dea1e65f194d0973800c7f571f6edd70adf06ecf77084" +checksum = "3b8853882eef39593ad4174dd26fc9865a64e84026d223f63bb2c42affcbba2c" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -963,9 +916,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.69" +version = "0.2.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5a48c72f299d80557c7c62e37e7225369ecc0c963964059509fbafe917c7549" +checksum = "4133b5e7f2a531fa413b3a1695e925038a05a71cf67e87dafa295cb645a01385" dependencies = [ "proc-macro2", "quote", @@ -976,15 +929,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.69" +version = "0.2.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158" +checksum = "dd4945e4943ae02d15c13962b38a5b1e81eadd4b71214eee75af64a4d6a4fd64" [[package]] name = "web-sys" -version = "0.3.46" +version = "0.3.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222b1ef9334f92a21d3fb53dc3fd80f30836959a90f9274a626d7e06315ba3c3" +checksum = "c40dc691fc48003eba817c38da7113c15698142da971298003cac3ef175680b3" dependencies = [ "js-sys", "wasm-bindgen", @@ -992,9 +945,9 @@ dependencies = [ [[package]] name = "wildmatch" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79346daa5ca66c72db46ee4dac6e605811478ae0807b385d18328be3f5c0eb74" +checksum = "d2399814fda0d6999a6bfe9b5c7660d836334deb162a09db8b73d5b38fd8c40a" [[package]] name = "winapi" diff --git a/Cargo.toml b/Cargo.toml index b69a548..93f664a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,8 +14,7 @@ edition = "2018" [dependencies] time = "=0.2.22" structopt = "0.3" -serde = "1.0" -serde_derive = "1.0" +serde = { version = "1.0", features = ["derive"] } serde_yaml = "0.8" log = { version = "0.4", features = ["std"] } signal = "0.7" @@ -27,7 +26,7 @@ igd = { version = "0.12", optional = true } daemonize = "0.4" ring = "0.16" privdrop = "0.5" -byteorder = "1.3" +byteorder = "1.4" thiserror = "1.0" parking_lot = "*" smallvec = "1.6" diff --git a/builder/Dockerfile-deb b/builder/Dockerfile-deb index 27a9189..38b22ef 100644 --- a/builder/Dockerfile-deb +++ b/builder/Dockerfile-deb @@ -19,7 +19,7 @@ RUN useradd -ms /bin/bash user USER user WORKDIR /home/user -ENV RUST=1.48.0 +ENV RUST=1.49.0 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain ${RUST} diff --git a/builder/Dockerfile-rpm b/builder/Dockerfile-rpm index 8210aee..9a90a28 100644 --- a/builder/Dockerfile-rpm +++ b/builder/Dockerfile-rpm @@ -7,7 +7,7 @@ RUN useradd -ms /bin/bash user USER user WORKDIR /home/user -ENV RUST=1.48.0 +ENV RUST=1.49.0 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain ${RUST} diff --git a/src/config.rs b/src/config.rs index cec0309..03025e1 100644 --- a/src/config.rs +++ b/src/config.rs @@ -4,18 +4,20 @@ use super::{device::Type, types::Mode, util::Duration}; pub use crate::crypto::Config as CryptoConfig; - +use crate::util::run_cmd; use std::{ cmp::max, - net::{IpAddr, Ipv6Addr, SocketAddr} + collections::HashMap, + ffi::OsStr, + net::{IpAddr, Ipv6Addr, SocketAddr}, + process::Command, + thread }; -use structopt::StructOpt; - +use structopt::{clap::Shell, StructOpt}; pub const DEFAULT_PEER_TIMEOUT: u16 = 300; pub const DEFAULT_PORT: u16 = 3210; - fn parse_listen(addr: &str) -> SocketAddr { if let Some(addr) = addr.strip_prefix("*:") { let port = try_fail!(addr.parse::(), "Invalid port: {}"); @@ -60,7 +62,9 @@ pub struct Config { pub statsd_server: Option, pub statsd_prefix: Option, pub user: Option, - pub group: Option + pub group: Option, + pub hook: Option, + pub hooks: HashMap } impl Default for Config { @@ -93,7 +97,9 @@ impl Default for Config { statsd_server: None, statsd_prefix: None, user: None, - group: None + group: None, + hook: None, + hooks: HashMap::new() } } } @@ -198,6 +204,12 @@ impl Config { if !file.crypto.algorithms.is_empty() { self.crypto.algorithms = file.crypto.algorithms.clone(); } + if let Some(val) = file.hook { + self.hook = Some(val) + } + for (k, v) in file.hooks { + self.hooks.insert(k, v); + } } pub fn merge_args(&mut self, mut args: Args) { @@ -291,6 +303,16 @@ impl Config { if !args.algorithms.is_empty() { self.crypto.algorithms = args.algorithms.clone(); } + for s in args.hook { + if s.contains(':') { + let pos = s.find(':').unwrap(); + let name = &s[..pos]; + let hook = &s[pos+1..]; + self.hooks.insert(name.to_string(), hook.to_string()); + } else { + self.hook = Some(s); + } + } } pub fn get_keepalive(&self) -> Duration { @@ -299,8 +321,31 @@ impl Config { None => max(self.peer_timeout / 2 - 60, 1) } } -} + pub fn call_hook( + &self, event: &'static str, envs: impl IntoIterator)>, detach: bool + ) { + let mut script = None; + if let Some(ref s) = self.hook { + script = Some(s); + } + if let Some(ref s) = self.hooks.get(event) { + script = Some(s); + } + if script.is_none() { + return + } + let script = script.unwrap(); + let mut cmd = Command::new("sh"); + cmd.arg("-c").arg(script).envs(envs).env("EVENT", event); + debug!("Running event script: {:?}", cmd); + if detach { + thread::spawn(move || run_cmd(cmd)); + } else { + run_cmd(cmd) + } + } +} #[derive(StructOpt, Debug, Default)] pub struct Args { @@ -325,7 +370,7 @@ pub struct Args { pub mode: Option, /// The shared password to encrypt all traffic - #[structopt(short, long, required_unless_one = &["private-key", "config", "genkey", "version"], env)] + #[structopt(short, long, required_unless_one = &["private-key", "config", "genkey", "version", "completion"], env)] pub password: Option, /// The private key to use @@ -458,7 +503,15 @@ pub struct Args { /// Migrate an old config file #[structopt(long, alias = "migrate", requires = "config")] - pub migrate_config: bool + pub migrate_config: bool, + + /// Generate shell completions + #[structopt(long)] + pub completion: Option, + + /// Call script on event + #[structopt(long)] + pub hook: Vec } #[derive(Serialize, Deserialize, Debug, PartialEq, Default)] @@ -512,10 +565,11 @@ pub struct ConfigFile { pub stats_file: Option, pub statsd: Option, pub user: Option, - pub group: Option + pub group: Option, + pub hook: Option, + pub hooks: HashMap } - #[test] fn config_file() { let config_file = " @@ -582,7 +636,9 @@ statsd: statsd: Some(ConfigFileStatsd { server: Some("example.com:1234".to_string()), prefix: Some("prefix".to_string()) - }) + }), + hook: None, + hooks: HashMap::new() }) } @@ -616,9 +672,12 @@ fn default_config_as_default() { statsd_server: None, statsd_prefix: None, user: None, - group: None + group: None, + hook: None, + hooks: HashMap::new() }; - let default_config_file = serde_yaml::from_str::(include_str!("../assets/example.net.disabled")).unwrap(); + let default_config_file = + serde_yaml::from_str::(include_str!("../assets/example.net.disabled")).unwrap(); default_config.merge_file(default_config_file); assert_eq!(default_config, Config::default()); } @@ -659,7 +718,9 @@ fn config_merge() { statsd: Some(ConfigFileStatsd { server: Some("example.com:1234".to_string()), prefix: Some("prefix".to_string()) - }) + }), + hook: None, + hooks: HashMap::new() }); assert_eq!(config, Config { device_type: Type::Tun, @@ -748,6 +809,8 @@ fn config_merge() { stats_file: Some("/var/log/vpncloud-mynet.stats".to_string()), statsd_server: Some("example.com:2345".to_string()), statsd_prefix: Some("prefix2".to_string()), - daemonize: true + daemonize: true, + hook: None, + hooks: HashMap::new() }); } diff --git a/src/device.rs b/src/device.rs index 34c7b18..290539b 100644 --- a/src/device.rs +++ b/src/device.rs @@ -5,12 +5,12 @@ use std::{ cmp, collections::VecDeque, + convert::TryInto, fmt, fs::{self, File}, io::{self, BufRead, BufReader, Cursor, Error as IoError, Read, Write}, net::{Ipv4Addr, UdpSocket}, os::unix::io::{AsRawFd, RawFd}, - convert::TryInto, str, str::FromStr }; @@ -36,7 +36,7 @@ struct IfReq { impl IfReq { fn new(name: &str) -> Self { assert!(name.len() < libc::IF_NAMESIZE); - let mut ifr_name = [0 as u8; libc::IF_NAMESIZE]; + let mut ifr_name = [0; libc::IF_NAMESIZE]; ifr_name[..name.len()].clone_from_slice(name.as_bytes()); Self { ifr_name, data: IfReqData { _dummy: [0; 24] } } } @@ -329,7 +329,7 @@ impl Device for MockDevice { } fn ifname(&self) -> &str { - unimplemented!() + "mock0" } fn read(&mut self, buffer: &mut MsgBuffer) -> Result<(), Error> { diff --git a/src/engine/mod.rs b/src/engine/mod.rs index 2af44a8..bdac097 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -30,7 +30,8 @@ use crate::{ device::{Device, Type}, error::Error, messages::{ - AddrList, NodeInfo, PeerInfo, MESSAGE_TYPE_CLOSE, MESSAGE_TYPE_DATA, MESSAGE_TYPE_KEEPALIVE, MESSAGE_TYPE_NODE_INFO + AddrList, NodeInfo, PeerInfo, MESSAGE_TYPE_CLOSE, MESSAGE_TYPE_DATA, MESSAGE_TYPE_KEEPALIVE, + MESSAGE_TYPE_NODE_INFO }, net::{mapped_addr, Socket}, payload::Protocol, @@ -39,7 +40,7 @@ use crate::{ table::ClaimTable, traffic::TrafficStats, types::{Address, Mode, NodeId, Range, RangeList}, - util::{addr_nice, resolve, CtrlC, Duration, MsgBuffer, StatsdMsg, Time, TimeSource} + util::{addr_nice, bytes_to_hex, resolve, CtrlC, Duration, MsgBuffer, StatsdMsg, Time, TimeSource} }; pub type Hash = BuildHasherDefault; @@ -129,6 +130,9 @@ impl GenericCloud { + info!("No address set on interface.") + } Err(e) => error!("{}", e) } } @@ -229,6 +233,7 @@ impl GenericCloud GenericCloud GenericCloud GenericCloud Result<(), Error> { info!("Added peer {}", addr_nice(addr)); + self.config.call_hook( + "peer_connected", + vec![ + ("PEER", format!("{:?}", addr_nice(addr))), + ("IFNAME", self.device.ifname().to_owned()), + ("CLAIMS", info.claims.iter().map(|r| format!("{:?}", r)).collect::>().join(" ")), + ("NODE_ID", bytes_to_hex(&info.node_id)), + ], + true + ); if let Some(init) = self.pending_inits.remove(&addr) { self.peers.insert(addr, PeerData { addrs: info.addrs.clone(), @@ -649,9 +672,18 @@ impl GenericCloud GenericCloud { + self.config.call_hook( + "peer_connecting", + vec![ + ("PEER", format!("{:?}", addr_nice(src))), + ("IFNAME", self.device.ifname().to_owned()), + ], + true + ); self.pending_inits.insert(src, init); Ok(res) } @@ -804,6 +844,11 @@ impl GenericCloud { debug!("Recoverable init error from {}: {}", src, e); @@ -835,6 +880,7 @@ impl GenericCloud { @@ -860,6 +906,7 @@ impl GenericCloud TunTapDevice { config.device_name ); info!("Opened device {}", device.ifname()); + config.call_hook("device_setup", vec![("IFNAME", device.ifname())], true); if let Err(err) = device.set_mtu(None) { error!("Error setting optimal MTU on {}: {}", device.ifname(), err); } @@ -159,6 +160,7 @@ fn setup_device(config: &Config) -> TunTapDevice { warn!("Your networking configuration might be affected by a vulnerability (https://vpncloud.ddswd.de/docs/security/cve-2019-14899/), please change your rp_filter setting to 1 (currently {}).", val); } } + config.call_hook("device_configured", vec![("IFNAME", device.ifname())], true); device } @@ -234,6 +236,10 @@ fn main() { ); return } + if let Some(shell) = args.completion { + Args::clap().gen_completions_to(env!("CARGO_PKG_NAME"), shell, &mut io::stdout()); + return + } let logger = try_fail!(DualLogger::new(args.log_file.as_ref()), "Failed to open logfile: {}"); log::set_boxed_logger(Box::new(logger)).unwrap(); assert!(!args.verbose || !args.quiet); diff --git a/src/oldconfig.rs b/src/oldconfig.rs index 0a717a0..330336f 100644 --- a/src/oldconfig.rs +++ b/src/oldconfig.rs @@ -1,5 +1,6 @@ use super::{device::Type, types::Mode, util::Duration}; use crate::config::{ConfigFile, ConfigFileBeacon, ConfigFileDevice, ConfigFileStatsd, CryptoConfig}; +use std::collections::HashMap; #[derive(Serialize, Deserialize, Debug, PartialEq, Clone, Copy)] pub enum OldCryptoMethod { @@ -112,12 +113,11 @@ impl OldConfigFile { pid_file: self.pid_file, port_forwarding: self.port_forwarding, stats_file: self.stats_file, - statsd: Some(ConfigFileStatsd { - prefix: self.statsd_prefix, - server: self.statsd_server - }), + statsd: Some(ConfigFileStatsd { prefix: self.statsd_prefix, server: self.statsd_server }), switch_timeout: self.dst_timeout, - user: self.user + user: self.user, + hook: None, + hooks: HashMap::new() } } -} \ No newline at end of file +} diff --git a/src/util.rs b/src/util.rs index 42a53b1..e1c4ae5 100644 --- a/src/util.rs +++ b/src/util.rs @@ -2,31 +2,31 @@ // Copyright (C) 2015-2020 Dennis Schwerdel // This software is licensed under GPL-3 or newer (see LICENSE.md) +use std::process::Command; use std::{ fmt, net::{Ipv4Addr, SocketAddr, ToSocketAddrs, UdpSocket}, - sync::atomic::{AtomicIsize, Ordering} + sync::atomic::{AtomicIsize, Ordering}, }; use crate::error::Error; -#[cfg(not(target_os = "linux"))] use time; +#[cfg(not(target_os = "linux"))] +use time; use signal::{trap::Trap, Signal}; use smallvec::SmallVec; use std::time::Instant; - pub type Duration = u32; pub type Time = i64; - #[derive(Clone)] pub struct MsgBuffer { space_before: usize, buffer: [u8; 65535], start: usize, - end: usize + end: usize, } impl MsgBuffer { @@ -98,7 +98,6 @@ impl MsgBuffer { } } - const HEX_CHARS: &[u8] = b"0123456789abcdef"; pub fn bytes_to_hex(bytes: &[u8]) -> String { @@ -113,13 +112,12 @@ pub fn bytes_to_hex(bytes: &[u8]) -> String { pub fn addr_nice(addr: SocketAddr) -> SocketAddr { if let SocketAddr::V6(v6addr) = addr { if let Some(ip) = v6addr.ip().to_ipv4() { - return (ip, addr.port()).into() + return (ip, addr.port()).into(); } } addr } - pub struct Encoder; impl Encoder { @@ -172,7 +170,6 @@ impl Encoder { } } - macro_rules! fail { ($format:expr) => ( { use std::process; @@ -215,17 +212,14 @@ pub fn get_internal_ip() -> Ipv4Addr { } } - #[allow(unknown_lints, clippy::needless_pass_by_value)] pub fn resolve(addr: Addr) -> Result, Error> { let mut addrs = addr.to_socket_addrs().map_err(|_| Error::NameUnresolvable(format!("{:?}", addr)))?.collect::>(); // Try IPv4 first as it usually is faster - addrs.sort_by_key(|addr| { - match *addr { - SocketAddr::V4(_) => 4, - SocketAddr::V6(_) => 6 - } + addrs.sort_by_key(|addr| match *addr { + SocketAddr::V4(_) => 4, + SocketAddr::V6(_) => 6, }); // Remove duplicates in addrs (why are there duplicates???) addrs.dedup(); @@ -239,7 +233,6 @@ macro_rules! addr { }}; } - pub struct Bytes(pub u64); impl fmt::Display for Bytes { @@ -248,31 +241,30 @@ impl fmt::Display for Bytes { if size >= 512.0 { size /= 1024.0; } else { - return write!(formatter, "{:.0} B", size) + return write!(formatter, "{:.0} B", size); } if size >= 512.0 { size /= 1024.0; } else { - return write!(formatter, "{:.1} KiB", size) + return write!(formatter, "{:.1} KiB", size); } if size >= 512.0 { size /= 1024.0; } else { - return write!(formatter, "{:.1} MiB", size) + return write!(formatter, "{:.1} MiB", size); } if size >= 512.0 { size /= 1024.0; } else { - return write!(formatter, "{:.1} GiB", size) + return write!(formatter, "{:.1} GiB", size); } write!(formatter, "{:.1} TiB", size) } } - pub struct CtrlC { dummy_time: Instant, - trap: Trap + trap: Trap, } impl CtrlC { @@ -293,7 +285,6 @@ impl Default for CtrlC { } } - pub trait TimeSource: Sync + Copy + Send + 'static { fn now() -> Time; } @@ -336,7 +327,6 @@ impl TimeSource for MockTimeSource { } } - /// Helper function that multiplies the base62 data in buf[0..buflen] by 16 and adds m to it fn base62_add_mult_16(buf: &mut [u8], mut buflen: usize, m: u8) -> usize { let mut d: usize = m as usize; @@ -356,7 +346,7 @@ fn base62_add_mult_16(buf: &mut [u8], mut buflen: usize, m: u8) -> usize { const BASE62: [char; 62] = [ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', - 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z' + 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', ]; pub fn to_base62(data: &[u8]) -> String { @@ -382,7 +372,7 @@ pub fn from_base62(data: &str) -> Result, char> { '0'..='9' => ((c as usize) % ('0' as usize)), 'A'..='Z' => ((c as usize) % ('A' as usize)) + 10, 'a'..='z' => ((c as usize) % ('a' as usize)) + 36, - _ => return Err(c) + _ => return Err(c), }; for item in &mut buf { val += *item as usize * 62; @@ -397,11 +387,10 @@ pub fn from_base62(data: &str) -> Result, char> { Ok(buf) } - #[derive(Default)] pub struct StatsdMsg { entries: Vec, - key: Vec + key: Vec, } impl StatsdMsg { @@ -426,6 +415,16 @@ impl StatsdMsg { } } +pub fn run_cmd(mut cmd: Command) { + match cmd.status() { + Ok(status) => { + if !status.success() { + error!("Command returned error: {:?}", status.code()) + } + } + Err(e) => error!("Failed to execute command {:?}: {}", cmd, e), + } +} #[test] fn base62() {