diff --git a/Cargo.lock b/Cargo.lock index 1b2c9a0..5ffc61d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 4 [[package]] name = "aho-corasick" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" +checksum = "c982642fa9e8606056828ee9a8505737230110bb1099153c79efe865c59d12ba" dependencies = [ "memchr", ] @@ -19,9 +19,9 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "android_system_properties" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +checksum = "ae221649c9976a6f6c56ae1facf410f3ddb33cc661c4b7b61020a912d4237fbc" dependencies = [ "libc", ] @@ -101,14 +101,20 @@ dependencies = [ ] [[package]] -name = "async-trait" -version = "0.1.91" +name = "arcstr" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae36dc4177970ef04fde5178d3e2429882def40e57a451f919c098f72baa6cec" +checksum = "03918c3dbd7701a85c6b9887732e2921175f26c350b4563841d0958c21d57e6d" + +[[package]] +name = "async-lock" +version = "3.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f7f2596bd5b78a9fec8088ccd89180d7f9f55b94b0576823bbbdc72ee8311" dependencies = [ - "proc-macro2", - "quote", - "syn 3.0.0", + "event-listener", + "event-listener-strategy", + "pin-project-lite", ] [[package]] @@ -132,6 +138,29 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" +[[package]] +name = "aws-lc-rs" +version = "1.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faac5829c2b74c28f830747e7818ccfb684261b5f48a1118b1e2a13d36dfab13" +dependencies = [ + "aws-lc-sys", + "zeroize", +] + +[[package]] +name = "aws-lc-sys" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1622d8446a2d4b2ce0c7eefc73dd43a99779028d5ee5c2dd8073a658ba8a2bc" +dependencies = [ + "cc", + "cmake", + "dunce", + "fs_extra", + "pkg-config", +] + [[package]] name = "axum" version = "0.8.9" @@ -199,6 +228,12 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" +[[package]] +name = "base64" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5" + [[package]] name = "bit-set" version = "0.5.3" @@ -222,9 +257,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.13.1" +version = "2.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b588b76d00fde79687d7646a9b5bdf3cc0f655e0bbd080335a95d7e96f3587da" +checksum = "3ded4057c258ba199e2d26386d3af3780957ecaee6c4ef4041c6b4b8b97c0b06" [[package]] name = "block-buffer" @@ -235,6 +270,15 @@ dependencies = [ "generic-array", ] +[[package]] +name = "block-buffer" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2f6c7dbe95a6ed67ad9f18e57daf93a2f034c524b99fd2b76d18fdfeb6660aa" +dependencies = [ + "hybrid-array", +] + [[package]] name = "bumpalo" version = "3.20.3" @@ -270,19 +314,21 @@ dependencies = [ [[package]] name = "cc" -version = "1.3.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89588d05638b5b4594a3348a2d6c20277e43a7f5c5202b05cc56888475a47b8" +checksum = "6651c9ed80effdc7db0ff72512157f901af5e3549e341e24b1dd4887d836d838" dependencies = [ "find-msvc-tools", + "jobserver", + "libc", "shlex", ] [[package]] name = "cfg-if" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" +checksum = "4e7648175b45a9a48536d676f68d918270699102aa8dab5496df06904c914600" [[package]] name = "cfg_aliases" @@ -292,12 +338,12 @@ checksum = "f079e83a288787bcd14a6aea84cee5c87a67c5a3e660c30f557a3d24761b3527" [[package]] name = "chacha20" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d524456ba66e72eb8b115ff89e01e497f8e6d11d78b70b1aa13c0fbd97540a81" +checksum = "65c35e4b699c7e15ccbe7ee35c005e4fc0a278d22238a2857e6ce2dadeda1b06" dependencies = [ "cfg-if", - "cpufeatures 0.3.0", + "cpufeatures 0.3.1", "rand_core 0.10.1", ] @@ -317,9 +363,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.6.2" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd059f9da4f5c36b3787f65d38ccaab1cc315f07b01f89abc8359ee6a8205011" +checksum = "aa8876b300ab35ba921adea3dfd70157a46249b33f95c9084ae5709785478946" dependencies = [ "clap_builder", "clap_derive", @@ -327,9 +373,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.6.2" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f09628afdcc538b57f3c6341e9c8e9970f18e4a481690a64974d7023bd33548b" +checksum = "ec0797fb7aeb1406c84efac526901f7ec3ead2124f946b494e72879d4b54704d" dependencies = [ "anstream", "anstyle", @@ -339,21 +385,30 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.6.1" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ce8604710f6733aa641a2b3731eaa1e8b3d9973d5e3565da11800813f997a9" +checksum = "f9c751b79415d4e559e3d1fcf128e09e720eb673a06d26cf6f392d37d75b66e0" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.9", ] [[package]] name = "clap_lex" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9" +checksum = "1c133bc6a41be0d194c306b5506d15e6feeea7b1d6604bd3f8310dfb2ca96486" + +[[package]] +name = "cmake" +version = "0.1.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0f78a02292a74a88ac736019ab962ece0bc380e3f977bf72e376c5d78ff0678" +dependencies = [ + "cc", +] [[package]] name = "colorchoice" @@ -363,9 +418,9 @@ checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570" [[package]] name = "combine" -version = "4.6.7" +version = "4.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +checksum = "4356eba6976435498d05a311ee9fc486da3bc81c200d3f0d7dd9703b41913f92" dependencies = [ "bytes", "futures-core", @@ -389,6 +444,12 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "const-oid" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c" + [[package]] name = "convert_case" version = "0.10.0" @@ -398,6 +459,16 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "core-foundation" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "core-foundation-sys" version = "0.8.7" @@ -415,9 +486,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201" +checksum = "5ca28b0ae3115b884660db4118d803791fd6756b6e88f39c0f3f7859060d7566" dependencies = [ "libc", ] @@ -430,9 +501,9 @@ checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b" [[package]] name = "crossbeam-utils" -version = "0.8.22" +version = "0.8.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61803da095bee82a81bb1a452ecc25d3b2f1416d1897eb86430c6159ef717c17" +checksum = "a31eee39dddec8330830986fcd7625edb5a24ec90ea038215273bbc3adb08ac6" [[package]] name = "crossterm" @@ -440,13 +511,13 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.2", "crossterm_winapi", "derive_more", "document-features", "mio", "parking_lot", - "rustix 1.1.4", + "rustix 1.1.5", "signal-hook", "signal-hook-mio", "winapi", @@ -471,6 +542,15 @@ dependencies = [ "typenum", ] +[[package]] +name = "crypto-common" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6e4c961d6cd6c9a86db418387425e8bdeaf05b3c8bc1411e6dca4c252f1453" +dependencies = [ + "hybrid-array", +] + [[package]] name = "csscolorparser" version = "0.6.2" @@ -501,7 +581,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 3.0.0", + "syn 3.0.9", ] [[package]] @@ -512,7 +592,7 @@ checksum = "2ac7135c3ef02b2f7833bbeb1be5ba7f966dcde8a87c6b87f65a778d71a02785" dependencies = [ "darling_core", "quote", - "syn 3.0.0", + "syn 3.0.9", ] [[package]] @@ -537,9 +617,9 @@ checksum = "5729f5117e208430e437df2f4843f5e5952997175992d1414f94c57d61e270b4" [[package]] name = "deranged" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c" +checksum = "9e9de72ce2ad1f90dc62fa25f0f430ef85eb4b0d8fa0be4f30373bc40a21d28e" [[package]] name = "derive_more" @@ -569,19 +649,30 @@ version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer", - "crypto-common", + "block-buffer 0.10.4", + "crypto-common 0.1.7", +] + +[[package]] +name = "digest" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2" +dependencies = [ + "block-buffer 0.12.1", + "const-oid", + "crypto-common 0.2.2", ] [[package]] name = "displaydoc" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f" +checksum = "c6232dd377dcc64799954cbd3a9bb882e9cdc1308ccd87b1c098f1fb2eaf82a8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.9", ] [[package]] @@ -594,16 +685,22 @@ dependencies = [ ] [[package]] -name = "either" -version = "1.16.0" +name = "dunce" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" + +[[package]] +name = "either" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e9c71c2167ca323c882b99918929403426e2373ea17242ff5653e0d5e1058be" [[package]] name = "equivalent" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" +checksum = "00d174d5400e5e8fd687ad1049e2f578285fa914201b1af7e8b112a4546bd826" [[package]] name = "errno" @@ -624,6 +721,26 @@ dependencies = [ "num-traits", ] +[[package]] +name = "event-listener" +version = "5.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a23add41df1562121a9393cb065eab5146a1242410f23a644851e90cfd669d2" +dependencies = [ + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93" +dependencies = [ + "event-listener", + "pin-project-lite", +] + [[package]] name = "fancy-regex" version = "0.11.0" @@ -636,9 +753,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6" +checksum = "da7c62ceae207dd37ea5b845da6a0696c799f85e97da1ab5b7910be3c1c80223" [[package]] name = "filedescriptor" @@ -653,15 +770,15 @@ dependencies = [ [[package]] name = "find-msvc-tools" -version = "0.1.9" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" +checksum = "aedcfb3409746eddb02b9e19ebda1c3394f759a152e48ee875a0844d1b955484" [[package]] name = "finl_unicode" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9844ddc3a6e533d62bba727eb6c28b5d360921d5175e9ff0f1e621a5c590a4d5" +checksum = "80bb028c8b4148c9ee0cca68fcd9add6044e81d3619f48577ddf13a263d047a2" [[package]] name = "fixedbitset" @@ -691,10 +808,16 @@ dependencies = [ ] [[package]] -name = "futures" -version = "0.3.33" +name = "fs_extra" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a88cf1f829d945f548cf8fec32c61b1f202b6d93b45848602fc02af4b12ad218" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + +[[package]] +name = "futures" +version = "0.3.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a31d2a3fbaaeb2af2368bbdd904aa8e812d3c04a1ee10d3171f52d556e5d0a3" dependencies = [ "futures-channel", "futures-core", @@ -707,9 +830,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "262590f4fe6afeb0bc83be1daa64e52657fe185690a958af7f3ad0e92085c5ae" +checksum = "b1f9e3d69d39e4862ffed03ed071a76f9a13ba1d9109d355b0f0aa6b15e393c4" dependencies = [ "futures-core", "futures-sink", @@ -717,15 +840,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cd50c473c80f6d7c3670a752354b8e569b1a7cbfdc0419ec88e5edad85e0dc7" +checksum = "92d699e522242e69e3003b94ecc1f960f3a5e015aa7c5d7486e65ad01dd94f5e" [[package]] name = "futures-executor" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6754879cc9f2c66f88c6e5c35344bb0bdb0708b0352b1201815667c7eabc7458" +checksum = "031b47cf1a3c6cc8bc2fc76cd437f521619387907d469316e7c0bc278f1f5432" dependencies = [ "futures-core", "futures-task", @@ -734,38 +857,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4577ecaa3c4f96589d473f679a71b596316f6641bc350038b962a5daf0085d7a" +checksum = "53c0fa8157de1303bfffdaa1cc2a673bfffb60102f76b0ef4441659124373fed" [[package]] name = "futures-macro" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d6d3cde68c518367be28956066ddfef33813991b77a55005a69dae04bf3b10b" +checksum = "9fb9654ba8355388abeb8dcb4fc62f511300867002afc858860463bdd9fe0c44" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.9", ] [[package]] name = "futures-sink" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e34418ac499d6305c2fb5ad0ed2f6ac998c5f8ca209b4510f7f94242c647e307" +checksum = "1944426bf7d03f1d14f708785e4b33efd750b36d48a157b836b3efc15ede8e1d" [[package]] name = "futures-task" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b231ed28831efb4a61a08580c4bc233ec56bc009f4cd8f52da2c3cb97df0c109" +checksum = "cd417de3d1d015fc3bfd2b1ea46dfc7bab72ef86f1cc7cc9c78e728b34a6d1fd" [[package]] name = "futures-util" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a77a90a256fce34da66415271e30f94ee91c57b04b8a2c042d9cf3220179deaa" +checksum = "0d50a92467f8ba5dd6e3ee5d4bd04d73ab2e4e1c44474a0674821dfce14b79bc" dependencies = [ "futures-channel", "futures-core", @@ -833,17 +956,6 @@ version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -[[package]] -name = "hashbrown" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" -dependencies = [ - "allocator-api2", - "equivalent", - "foldhash", -] - [[package]] name = "hashbrown" version = "0.17.1" @@ -869,9 +981,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "http" -version = "1.4.2" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6970f50e31d6fc17d3fa27329444bfa74e196cf62e95052a3f6fee181dba6425" +checksum = "918d3568bebf352712bc2ef3d46a8bcf1a75b373be6539de198e9105cbbf9ce0" dependencies = [ "bytes", "itoa", @@ -889,9 +1001,9 @@ dependencies = [ [[package]] name = "http-body-util" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9f41fd6a08e4d4ec69df65976da761afd5ad5e58a9d4acb46bd1c953a9e3ff2" +checksum = "23169fe34a5fbcdd3f3862e78fb9b6fccd5f02a6dc6f732547005d45631ce71c" dependencies = [ "bytes", "futures-core", @@ -913,14 +1025,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] -name = "hyper" -version = "1.10.1" +name = "hybrid-array" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55281c53a1894c864990125767da440a4e630446785086f52523b20033b74498" +checksum = "27f864f10dfb56725ce5ce5472bc52252c8f93a4ab86327122cebf62c5f59a17" +dependencies = [ + "typenum", +] + +[[package]] +name = "hyper" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c3e324da4c95177d6291d4c8730197c0d1822f8a9766814a4a44fa5ab797c9c" dependencies = [ "atomic-waker", "bytes", - "futures-channel", "futures-core", "http", "http-body", @@ -935,9 +1055,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.9" +version = "0.27.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ca68d021ef39cf6463ab54c1d0f5daf03377b70561305bb89a8f83aab66e0f" +checksum = "dfa8e654703247911e29c23fbeaa261834bd9bb74efba2f9acddc37bfb127f53" dependencies = [ "http", "hyper", @@ -946,27 +1066,27 @@ dependencies = [ "tokio", "tokio-rustls", "tower-service", - "webpki-roots", ] [[package]] name = "hyper-util" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0" +checksum = "ddc03d96684f9226b8a787cdb71488417b53ab5ea8fdb1dac946cb9431cc8bff" dependencies = [ - "base64", + "base64 0.23.1", "bytes", "futures-channel", "futures-util", "http", "http-body", + "httparse", "hyper", "ipnet", "libc", "percent-encoding", "pin-project-lite", - "socket2 0.6.5", + "socket2", "tokio", "tower-service", "tracing", @@ -998,9 +1118,9 @@ dependencies = [ [[package]] name = "icu_collections" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c" +checksum = "fa68d21081c4a05d5a901a1c62add574c77048b6a1c67be3b50ce0b60d4ca513" dependencies = [ "displaydoc", "potential_utf", @@ -1012,9 +1132,9 @@ dependencies = [ [[package]] name = "icu_locale_core" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29" +checksum = "d56e28588da92eee5c3201a6eff33fabdd49b62269c8938d4ff050ce4d900deb" dependencies = [ "displaydoc", "litemap", @@ -1025,9 +1145,9 @@ dependencies = [ [[package]] name = "icu_normalizer" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4" +checksum = "12f9cf5f235641ed274641dd81c3f28d870e276763d0797aeeab72317b1c646f" dependencies = [ "icu_collections", "icu_normalizer_data", @@ -1039,16 +1159,17 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38" +checksum = "1563da1ed3e0b3bf3d74c9b85917ac9c56464d2f57242270c09c9e752f8021a0" [[package]] name = "icu_properties" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de" +checksum = "7e7ca276ad3145661a65914e6daf131ca5120cd3dcee8f8f3214b8875184a148" dependencies = [ + "displaydoc", "icu_collections", "icu_locale_core", "icu_properties_data", @@ -1059,15 +1180,15 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14" +checksum = "e590f038c1464a96894fd6d10127e90a8be4509f56ff7ecef851b15cee0b7caa" [[package]] name = "icu_provider" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421" +checksum = "d27bbb9d3abbefac45d55f647c9de1d44aafcd1186eb91879afef17c396c3e73" dependencies = [ "displaydoc", "icu_locale_core", @@ -1107,9 +1228,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.14.0" +version = "2.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" +checksum = "cc4e190f5d26ca7051642629da2c52fc03bde85a03197c99408dcd291734c855" dependencies = [ "equivalent", "hashbrown 0.17.1", @@ -1117,31 +1238,31 @@ dependencies = [ [[package]] name = "indoc" -version = "2.0.7" +version = "2.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706" +checksum = "a37b2691796cffeb8a8cd305ac66e65841559f147f4e63231d0eafa4db5384d1" dependencies = [ "rustversion", ] [[package]] name = "instability" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf84e73fa6f27f299dec58e13223cf70db80da872eb921d4f6138342a0eabc8" +checksum = "4c3b5acc1e2fd9375041a388da33d1eb8aed5f7a8c0dd3543e3ea2805adfbe20" dependencies = [ "darling", "indoc", "proc-macro2", "quote", - "syn 3.0.0", + "syn 3.0.9", ] [[package]] name = "ipnet" -version = "2.12.0" +version = "2.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2" +checksum = "791930b43c0d5973160d90a8f3894509f2b273430f5c5c73b668636d0287c5c0" [[package]] name = "ipnetwork" @@ -1155,15 +1276,6 @@ version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" -[[package]] -name = "itertools" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.14.0" @@ -1180,10 +1292,69 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" [[package]] -name = "js-sys" -version = "0.3.103" +name = "jni" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b44bfcdb3f8d5837a46dae1ca9660a837176eee74a28b229bc626816589102" +checksum = "5efd9a482cf3a427f00d6b35f14332adc7902ce91efb778580e180ff90fa3498" +dependencies = [ + "cfg-if", + "combine", + "jni-macros", + "jni-sys", + "log", + "simd_cesu8", + "thiserror 2.0.21", + "walkdir", + "windows-link", +] + +[[package]] +name = "jni-macros" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00109accc170f0bdb141fed3e393c565b6f5e072365c3bd58f5b062591560a3" +dependencies = [ + "proc-macro2", + "quote", + "rustc_version", + "simd_cesu8", + "syn 2.0.119", +] + +[[package]] +name = "jni-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2" +dependencies = [ + "jni-sys-macros", +] + +[[package]] +name = "jni-sys-macros" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264" +dependencies = [ + "quote", + "syn 2.0.119", +] + +[[package]] +name = "jobserver" +version = "0.1.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c00acbd29eabad4a2392fa0e921c874934dbbf4194312ad20f04a0ed67a3cb3" +dependencies = [ + "getrandom 0.4.3", + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.106" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7883d941dae510fb2d978fc3fe018c71c9e2892fd38854de3e8b92c2e5ad9cc5" dependencies = [ "cfg-if", "futures-util", @@ -1192,28 +1363,30 @@ dependencies = [ [[package]] name = "jsonwebtoken" -version = "9.3.1" +version = "11.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a87cc7a48537badeae96744432de36f4be2b4a34a05a5ef32e9dd8a1c169dde" +checksum = "e75fe14a82d81e5f5af639997db37d8b96045938a7ac6ab18cdbe1c7467e05e1" dependencies = [ - "base64", + "base64 0.22.1", + "getrandom 0.2.17", "js-sys", "pem", - "ring", "serde", "serde_json", + "signature", "simple_asn1", + "zeroize", ] [[package]] name = "kasuari" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bde5057d6143cc94e861d90f591b9303d6716c6b9602309150bd068853c10899" +checksum = "72f14c90e40a6133f4805b83542a7ed7364f56070b447f56e7f4e90297122209" dependencies = [ - "hashbrown 0.16.1", + "hashbrown 0.17.1", "portable-atomic", - "thiserror 2.0.19", + "thiserror 2.0.21", ] [[package]] @@ -1224,17 +1397,17 @@ checksum = "bf36173d4167ed999940f804952e6b08197cae5ad5d572eb4db150ce8ad5d58f" [[package]] name = "lazy_static" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +checksum = "20870f649af7073d53e38067b2a84312175d56ea15217e1b15bc83506ec50afb" [[package]] name = "libbpf-rs" -version = "0.24.8" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93edd9cd673087fa7518fd63ad6c87be2cd9b4e35034b1873f3e3258c018275b" +checksum = "ffef943d6690772a293abe80412ca438c227867cac93448af2518166df1b1a7b" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.2", "libbpf-sys", "libc", "vsprintf", @@ -1253,9 +1426,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.186" +version = "0.2.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" +checksum = "ce5d3ddc6d3fa000eb1536d85e147bfe31aacaba692ed6a876f95cb7c855be78" [[package]] name = "libm" @@ -1269,7 +1442,7 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e752191d037c44ad111a8caa762921926658402f01cc1253f7bef2020ece4f5e" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.2", ] [[package]] @@ -1286,15 +1459,15 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "litemap" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0" +checksum = "47d9d19d1d6efa0109d2f65ff4c85cddd50bd572e5a00127ab10987290bcefae" [[package]] name = "litrs" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092" +checksum = "4744e383959f0db86ede514b809b1c53251889093803c05267acc7d4e7030d70" [[package]] name = "lock_api" @@ -1307,33 +1480,33 @@ dependencies = [ [[package]] name = "log" -version = "0.4.33" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad" +checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6" [[package]] name = "lru" -version = "0.18.2" +version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d2f2f9b4ba7e6b24d95e7e899329d35be83bcded72c8540cdd5368932d1d90a" +checksum = "ef9ac18847474e638e3702b76c65d4eb93428471a74778ef0f1be711717f89b5" dependencies = [ "hashbrown 0.17.1", ] [[package]] name = "lru-slab" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" +checksum = "4050469837a6ff301cd14c1f8f24f88549e6d548f24f64e2148eb0f72cebc51f" [[package]] name = "mac_address" -version = "1.1.8" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0aeb26bf5e836cc1c341c8106051b573f1766dfa05aa87f0b98be5e51b02303" +checksum = "f3d0581a75c45969c63afd2bb87b1d8b25cfcc556c7a918cf9bb13b0fe8d2381" dependencies = [ - "nix 0.29.0", - "winapi", + "nix 0.31.3", + "windows-sys 0.61.2", ] [[package]] @@ -1353,14 +1526,14 @@ checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" [[package]] name = "maxminddb" -version = "0.30.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7bd67e2f5d65937ff283e418fcad53c8e2eeda0719e455508b62dad8ffe6180" +checksum = "9b43d2458d977b610b04a3858e6504f06133663d303a1a0606601b530bfc9bc6" dependencies = [ "ipnetwork", "memchr", "serde", - "thiserror 2.0.19", + "thiserror 2.0.21", ] [[package]] @@ -1398,9 +1571,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "mio" -version = "1.2.2" +version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d65c71f1ce40ab09135ce117d742b9f8a19ff91a41a8b57ed50bc2de59c427" +checksum = "1788edb87fdc09c7e26304471e2f5be8cdefb1b6930d6e3985fc02ff53bf86ee" dependencies = [ "libc", "log", @@ -1414,11 +1587,10 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.2", "cfg-if", "cfg_aliases", "libc", - "memoffset", ] [[package]] @@ -1427,10 +1599,11 @@ version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.2", "cfg-if", "cfg_aliases", "libc", + "memoffset", ] [[package]] @@ -1462,6 +1635,16 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-bigint" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93e7820bc0a80a0238e650327316f929ba18d5be054b647490a3a6a339f3e7c0" +dependencies = [ + "num-integer", + "num-traits", +] + [[package]] name = "num-conv" version = "0.2.2" @@ -1481,9 +1664,9 @@ dependencies = [ [[package]] name = "num-integer" -version = "0.1.46" +version = "0.1.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +checksum = "7ce2d95d4b3734dc35aa2f45e1aa22cd416814592a4f9d9205e11affd5b8e10b" dependencies = [ "num-traits", ] @@ -1518,6 +1701,12 @@ version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" +[[package]] +name = "openssl-probe" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" + [[package]] name = "ordered-float" version = "4.6.0" @@ -1560,6 +1749,12 @@ dependencies = [ "libm", ] +[[package]] +name = "parking" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" + [[package]] name = "parking_lot" version = "0.12.5" @@ -1589,7 +1784,7 @@ version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d30c53c26bc5b31a98cd02d20f25a7c8567146caf63ed593a9d87b2775291be" dependencies = [ - "base64", + "base64 0.22.1", "serde_core", ] @@ -1601,19 +1796,21 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "pest" -version = "2.9.0" +version = "2.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a07a60cc7a4d00c91f95c685609d1d2f79050e6804b70ebedd7650f0b839bcf" +checksum = "fd47a460a9cbc3b3429c7e22bf0d76653e779319bae45a499ca010c9a990bb23" dependencies = [ "memchr", + "psm", + "stacker", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.9.0" +version = "2.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a83744a5c8455b8b3e0dc5031362780a347c878bdd11584d1a8984228cc88d" +checksum = "203e46697708f7519ab1608393cf89239cafb46b8e6d08a8ffe359359b11ef44" dependencies = [ "pest", "pest_generator", @@ -1621,22 +1818,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.9.0" +version = "2.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd3451aa3de60d4b9a1e736885e4dea6b31617598026f12256ad566d63304a" +checksum = "e84ae6340a458d3d6cfc73cf328cf3cfe90b2484cd0de25eb66aa954615ed4d5" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.9", ] [[package]] name = "pest_meta" -version = "2.9.0" +version = "2.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e04d3a0849e241d7dfce834c83b1c5edc8622009e8dd51a12ba1927c32f05496" +checksum = "b57f92f32b3dbce6598fd8f5cdf1f06a6072570b8103fa21728fa9036923e710" dependencies = [ "pest", ] @@ -1668,7 +1865,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" dependencies = [ "phf_shared", - "rand 0.8.7", + "rand 0.8.8", ] [[package]] @@ -1701,9 +1898,9 @@ checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" [[package]] name = "pkg-config" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e" +checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548" [[package]] name = "portable-atomic" @@ -1713,27 +1910,18 @@ checksum = "05c8b63e8d9609db387f0324918f81d68fe27748f084ef092fb35954d0539a85" [[package]] name = "potential_utf" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564" +checksum = "d83eb9bc6d8e5cf568e7a1101d60ee05e81ed50ea106026f3d18deeb046d7661" dependencies = [ "zerovec", ] [[package]] name = "powerfmt" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "ppv-lite86" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" -dependencies = [ - "zerocopy", -] +checksum = "4a6394b9e965e73d0a289ee54f589087e2c676aedf60885baf52c76b771e4958" [[package]] name = "proc-macro2" @@ -1750,7 +1938,7 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc5b72d8145275d844d4b5f6d4e1eef00c8cd889edb6035c21675d1bb1f45c9f" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.2", "hex", "procfs-core", "rustix 0.38.44", @@ -1762,7 +1950,7 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "239df02d8349b06fc07398a3a1697b06418223b1c7725085e801e7c0fc6a12ec" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.2", "hex", ] @@ -1780,7 +1968,7 @@ dependencies = [ "parking_lot", "procfs", "protobuf", - "thiserror 2.0.19", + "thiserror 2.0.21", ] [[package]] @@ -1804,10 +1992,19 @@ dependencies = [ ] [[package]] -name = "quinn" -version = "0.11.11" +name = "psm" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c1a41e437b6bbd489372cd4971de128e85c855f56c57f283d20ff016cf7c0a8" +checksum = "200b9ff220857e53e184257720a14553b2f4aa02577d2ed9842d45d4b9654810" +dependencies = [ + "cc", +] + +[[package]] +name = "quinn" +version = "0.11.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4051e23e9185c255a7e33ef59cdbca87a22d359052eecd22fc6b901fb37d9d11" dependencies = [ "bytes", "cfg_aliases", @@ -1816,8 +2013,8 @@ dependencies = [ "quinn-udp", "rustc-hash", "rustls", - "socket2 0.6.5", - "thiserror 2.0.19", + "socket2", + "thiserror 2.0.21", "tokio", "tracing", "web-time", @@ -1825,21 +2022,22 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.16" +version = "0.11.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f4bfc015262b9df63c8845072ce59068853ff5872180c2ce2f13038b970e560" +checksum = "0e750cca55fe4f0439a15d0bb529da9651e79993e8e72c61a899a36d462befbe" dependencies = [ + "aws-lc-rs", "bytes", "getrandom 0.4.3", "lru-slab", - "rand 0.10.2", + "rand 0.10.3", "rand_pcg", "ring", "rustc-hash", "rustls", "rustls-pki-types", "slab", - "thiserror 2.0.19", + "thiserror 2.0.21", "tinyvec", "tracing", "web-time", @@ -1847,14 +2045,14 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.15" +version = "0.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35a133f956daabe89a61a685c2649f13d82d5aa4bd5d12d1277e1072a21c0694" +checksum = "af66907df18639dcf4db56ca65490cabc4b27a97dbadd96f2926cca73298f016" dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2 0.6.5", + "socket2", "tracing", "windows-sys 0.61.2", ] @@ -1897,56 +2095,44 @@ dependencies = [ "libc", "maxminddb", "prometheus", - "rand 0.8.7", + "rand 0.10.3", "ratatui", "redis", "reqwest", "serde", "serde_json", - "sha2", - "socket2 0.5.10", + "sha2 0.11.1", + "socket2", "subtle", - "thiserror 2.0.19", + "thiserror 2.0.21", "tokio", "tokio-splice", "toml", - "tower-http", + "tower-http 0.7.1", "tracing", "tracing-subscriber", ] [[package]] name = "rand" -version = "0.8.7" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22f6172bdec972074665ed81ed53b71da00bfc44b65a753cfde883ec4c702a1a" +checksum = "e058c7de0b26af77780c769414d6257830bb240f3c38477dbc2c16e5f54d6d4c" dependencies = [ - "libc", - "rand_chacha", "rand_core 0.6.4", ] [[package]] name = "rand" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f5fa3a058cd35567ef9bfa5e75732bee0f9e4c55fa90477bef2dfcdbc4be80" +checksum = "65c9fb96cbc91e3478eaae79a69fcd3f1ae4ad052e471fe6732fff548984b4af" dependencies = [ "chacha20", "getrandom 0.4.3", "rand_core 0.10.1", ] -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.4", -] - [[package]] name = "rand_core" version = "0.6.4" @@ -1993,17 +2179,17 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbb175c433c8e28a809d1f5773a2ae96e68c0ce40db865cbab1020bf33ae479c" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.2", "compact_str", "critical-section", "hashbrown 0.17.1", - "itertools 0.14.0", + "itertools", "kasuari", "lru", "palette", "serde", "strum", - "thiserror 2.0.19", + "thiserror 2.0.21", "unicode-segmentation", "unicode-truncate", "unicode-width", @@ -2058,11 +2244,11 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66e3d19bcc9130ca376277d93b60767ff121ace3be06f5f95f81dd68956407d1" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.2", "hashbrown 0.17.1", "indoc", "instability", - "itertools 0.14.0", + "itertools", "line-clipping", "ratatui-core", "serde", @@ -2074,28 +2260,30 @@ dependencies = [ [[package]] name = "redis" -version = "0.27.6" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d8f99a4090c89cc489a94833c901ead69bfbf3877b4867d5482e321ee875bc" +checksum = "ed5b98ae99461e02895c3a96a25dbe4d852a3d5e5b815d31d5d9e4b5344d99e9" dependencies = [ "arc-swap", - "async-trait", + "arcstr", + "async-lock", "backon", "bytes", + "cfg-if", "combine", - "futures", + "futures-channel", "futures-util", - "itertools 0.13.0", "itoa", - "num-bigint", + "num-bigint 0.5.1", "percent-encoding", "pin-project-lite", "ryu", "sha1_smol", - "socket2 0.5.10", + "socket2", "tokio", "tokio-util", "url", + "xxhash-rust", ] [[package]] @@ -2104,7 +2292,7 @@ version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.2", ] [[package]] @@ -2121,9 +2309,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.16" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fcfdb36bda0c880c5931cdc7a2bcdc8ba4556847b9d912bca70bc94708711ad" +checksum = "ad8553b9b26413251cbf30e620595c7a41b3887f03da04579c0e6b0d6a06b4b2" dependencies = [ "aho-corasick", "memchr", @@ -2138,11 +2326,11 @@ checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4" [[package]] name = "reqwest" -version = "0.12.28" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" +checksum = "16a1cfa75cc186dd73d5818e510e042e40927bccc9c236b061cea97e1eb08029" dependencies = [ - "base64", + "base64 0.23.1", "bytes", "futures-core", "http", @@ -2158,6 +2346,7 @@ dependencies = [ "quinn", "rustls", "rustls-pki-types", + "rustls-platform-verifier", "serde", "serde_json", "serde_urlencoded", @@ -2165,13 +2354,12 @@ dependencies = [ "tokio", "tokio-rustls", "tower", - "tower-http", + "tower-http 0.6.11", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots", ] [[package]] @@ -2209,7 +2397,7 @@ version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.2", "errno", "libc", "linux-raw-sys 0.4.15", @@ -2218,11 +2406,11 @@ dependencies = [ [[package]] name = "rustix" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" +checksum = "891efababe418670775f199f0d233d84843c227a0949a883ce15b37c78d6629d" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.2", "errno", "libc", "linux-raw-sys 0.12.1", @@ -2231,12 +2419,12 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.42" +version = "0.23.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c54fcab019b409d04215d3a17cb438fd7fbf192ee61461f20f4fe18704bc138" +checksum = "48e13bd8c0e9365c43cfa5c9e8f9ad49d3c8444926c9aac819e0e4dc503c8fdf" dependencies = [ + "aws-lc-rs", "once_cell", - "ring", "rustls-pki-types", "rustls-webpki", "subtle", @@ -2244,21 +2432,61 @@ dependencies = [ ] [[package]] -name = "rustls-pki-types" -version = "1.15.0" +name = "rustls-native-certs" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "764899a24af3980067ee14bc143654f297b22eaebfe3c7b6b211920a5a59b046" +checksum = "4a073f5dc7469f984c52ad2752b63b0807745133b6de880b7b64c1ac4c48aec4" +dependencies = [ + "openssl-probe", + "rustls-pki-types", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pki-types" +version = "1.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f4925028c7eb5d1fcdaf196971378ed9d2c1c4efc7dc5d011256f76c99c0a96" dependencies = [ "web-time", "zeroize", ] [[package]] -name = "rustls-webpki" -version = "0.103.13" +name = "rustls-platform-verifier" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e" +checksum = "1167586491e2b18b8bfbb293e8180ec17c201c4f076d7cb3070ca964e7598f98" dependencies = [ + "core-foundation", + "core-foundation-sys", + "jni", + "log", + "once_cell", + "rustls", + "rustls-native-certs", + "rustls-platform-verifier-android", + "rustls-webpki", + "security-framework", + "security-framework-sys", + "webpki-root-certs", + "windows-sys 0.61.2", +] + +[[package]] +name = "rustls-platform-verifier-android" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eec689c0bc40ff2458a5977b6619cb718087084a18e02a131c599b62d05e1a5f" + +[[package]] +name = "rustls-webpki" +version = "0.103.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3c3cf1d8b1e7d4927e2d154c3fcb02979afb9939629c62cd9048d4f07b60ac2" +dependencies = [ + "aws-lc-rs", "ring", "rustls-pki-types", "untrusted", @@ -2276,12 +2504,53 @@ version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cb23c424d8ee841bb4d813677ca237e2a610067d594fec130f87d6093495ab5" +dependencies = [ + "windows-sys 0.61.2", +] + [[package]] name = "scopeguard" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +[[package]] +name = "security-framework" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d" +dependencies = [ + "bitflags 2.13.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "semver" version = "1.0.28" @@ -2315,14 +2584,14 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348" dependencies = [ "proc-macro2", "quote", - "syn 3.0.0", + "syn 3.0.9", ] [[package]] name = "serde_json" -version = "1.0.150" +version = "1.0.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9" +checksum = "e7e9cc8b1b85264074fbcc02a88680c4096b1e47df8f739dceb03bf482f04bd6" dependencies = [ "itoa", "memchr", @@ -2344,11 +2613,11 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.9" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3" +checksum = "4e7523beb55eece201a2356bee0bbca0d1ab466c14c07703b2e0ee6d42cb0c2c" dependencies = [ - "serde", + "serde_core", ] [[package]] @@ -2377,7 +2646,18 @@ checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", "cpufeatures 0.2.17", - "digest", + "digest 0.10.7", +] + +[[package]] +name = "sha2" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47d7069beb7d6ac7b9acd1039986e73443f24234f41074da099d6f994ac9ad19" +dependencies = [ + "cfg-if", + "cpufeatures 0.3.1", + "digest 0.11.3", ] [[package]] @@ -2426,23 +2706,48 @@ dependencies = [ "libc", ] +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "rand_core 0.6.4", +] + +[[package]] +name = "simd_cesu8" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11031e251abf8611c80f460e19dbdeb54a66db918e49c65a7065b46ac7aec520" +dependencies = [ + "rustc_version", + "simdutf8", +] + +[[package]] +name = "simdutf8" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" + [[package]] name = "simple_asn1" version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d585997b0ac10be3c5ee635f1bab02d512760d14b7c468801ac8a01d9ae5f1d" dependencies = [ - "num-bigint", + "num-bigint 0.4.8", "num-traits", - "thiserror 2.0.19", + "thiserror 2.0.21", "time", ] [[package]] name = "siphasher" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649" +checksum = "33f4fe9184a62d842c9ef383018f3306d8ba224fd9d836f56d7288308847c256" [[package]] name = "slab" @@ -2452,19 +2757,9 @@ checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" [[package]] name = "smallvec" -version = "1.15.2" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90" - -[[package]] -name = "socket2" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] +checksum = "5b3dc8af474f516a851ff4bd12db780f948b9250ad37211e4eec0bccea54e01b" [[package]] name = "socket2" @@ -2482,6 +2777,19 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" +[[package]] +name = "stacker" +version = "0.1.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "707f49d46706bacf8a2b00d51dace3f9de527c13eec3778f570c411f89e69967" +dependencies = [ + "cc", + "cfg-if", + "libc", + "psm", + "windows-sys 0.61.2", +] + [[package]] name = "static_assertions" version = "1.1.0" @@ -2545,9 +2853,9 @@ dependencies = [ [[package]] name = "syn" -version = "3.0.0" +version = "3.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2fac314a64dc9a36e61a9eb4261a5e9bbfbc922b27e518af97bc32b926cf967" +checksum = "d78c8dee4c7bf0e14673097256fed6142ce9d3b85a408189d07482442145823b" dependencies = [ "proc-macro2", "quote", @@ -2565,13 +2873,13 @@ dependencies = [ [[package]] name = "synstructure" -version = "0.13.2" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" +checksum = "901704edd0dfe137f1987838ee4f259e4e063c31371bdb423f7ae38ec6f77f02" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.9", ] [[package]] @@ -2580,9 +2888,9 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9048a889effe34a5cddee0af7f53285198b16dca3be510858d38dfdb3e62a04e" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.2", "parking_lot", - "rustix 1.1.4", + "rustix 1.1.5", "signal-hook", "windows-sys 0.61.2", ] @@ -2615,8 +2923,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4676b37242ccbd1aabf56edb093a4827dc49086c0ffd764a5705899e0f35f8f7" dependencies = [ "anyhow", - "base64", - "bitflags 2.13.1", + "base64 0.22.1", + "bitflags 2.13.2", "fancy-regex", "filedescriptor", "finl_unicode", @@ -2633,7 +2941,7 @@ dependencies = [ "pest", "pest_derive", "phf", - "sha2", + "sha2 0.10.9", "signal-hook", "siphasher", "terminfo", @@ -2661,11 +2969,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.19" +version = "2.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a43598840e33d5b0331f38c5e30d13bb11c11210a4b58f0d9b18a5a5eefcd9" +checksum = "09e52cb86a36cede5cb101bf8908837b3e4c6e5e59fe7fd85c23fb56200d189e" dependencies = [ - "thiserror-impl 2.0.19", + "thiserror-impl 2.0.21", ] [[package]] @@ -2681,13 +2989,13 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.19" +version = "2.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43cbfe0cf76104d42a574802844187e84a305e531ed54455f11fbde0f10541cd" +checksum = "fe5197923287db20a58125f0bc85c062f7f2c892de97b18c356f9efb14b28524" dependencies = [ "proc-macro2", "quote", - "syn 3.0.0", + "syn 3.0.9", ] [[package]] @@ -2701,9 +3009,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.53" +version = "0.3.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18dfaaeddcb932337b5e7866ee7d0ce9b76d2fd092997146f187ec09b4558a50" +checksum = "cdb87b95ec50ddfa440816d227a17b2ccbdda963a316a727fda0fc4334f7d134" dependencies = [ "deranged", "libc", @@ -2723,9 +3031,9 @@ checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109" [[package]] name = "time-macros" -version = "0.2.31" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c431b87111666e491a90baa837f914fb45cd5dc3c268591b0220ff5057f2085f" +checksum = "7e689342a48d2ea927c87ea50cabf8594854bf940e9310208848d680d668ed85" dependencies = [ "num-conv", "time-core", @@ -2733,9 +3041,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d" +checksum = "b1e27c91459209c2986af3dcf603a5a74a4368754ce37414f59acc971167f643" dependencies = [ "displaydoc", "zerovec", @@ -2743,24 +3051,15 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.12.0" +version = "1.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb4ebadaa0af04fab11ae01eb5f9fdb5f9c5b875506e210e71c07873528baa7f" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" +checksum = "fd3ca314f692efd6c868f8408f53fe444634a845f96c028b97d35f6a1f79f0ee" [[package]] name = "tokio" -version = "1.53.0" +version = "1.53.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d988bcd52dbe076d3d46903332f58c912b87a2c49b1428419a5845154762ffee" +checksum = "ce3335fa71841cda333a58d7615b03901380ecf09d59b3296d21f8bbac0dde4e" dependencies = [ "bytes", "libc", @@ -2768,27 +3067,27 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.6.5", + "socket2", "tokio-macros", "windows-sys 0.61.2", ] [[package]] name = "tokio-macros" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6328af13490e73a9b4694030fafd93f8c8c6a9dede33e821c3fc63eddf8042ba" +checksum = "78773a2a397f451582ce068015985c33193cf6dea8b74d2a639fe457b2f07b0e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.9", ] [[package]] name = "tokio-rustls" -version = "0.26.4" +version = "0.26.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" +checksum = "c9cc2678c2cdd569ef8215e2afd7954ada2ae20b4fdd2c5fe6139a3b02d105db" dependencies = [ "rustls", "tokio", @@ -2806,57 +3105,56 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.18" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098" +checksum = "e464cf451ba96ebfc6f9b6542f17ee8b8956e33f1e40d9690624e59d7a7f8a4b" dependencies = [ "bytes", "futures-core", "futures-sink", + "libc", "pin-project-lite", "tokio", ] [[package]] name = "toml" -version = "0.8.23" +version = "1.1.8+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.22.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" +checksum = "20489e00e4d8741d6be680764cc12e270655e375a20d1011e844a9c3379e678d" dependencies = [ "indexmap", - "serde", + "serde_core", "serde_spanned", "toml_datetime", - "toml_write", + "toml_parser", + "toml_writer", "winnow", ] [[package]] -name = "toml_write" -version = "0.1.2" +name = "toml_datetime" +version = "1.1.2+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" +checksum = "2b86d767906c6c42421dcba507eb9d203e779497710a47782a224bb871653053" +dependencies = [ + "serde_core", +] + +[[package]] +name = "toml_parser" +version = "1.1.5+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baa693a8032d7e1cada7d0041e96126df243179ff061456783ac7f12bda4744c" +dependencies = [ + "winnow", +] + +[[package]] +name = "toml_writer" +version = "1.1.3+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06bdbd8cfc056b8d2e2e85f29b56a3bdbecb527cef81eb39e3e7b98af4652770" [[package]] name = "tower" @@ -2880,7 +3178,7 @@ version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.2", "bytes", "futures-util", "http", @@ -2892,6 +3190,21 @@ dependencies = [ "url", ] +[[package]] +name = "tower-http" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08a05a66a4fdd61cbbe0a1d755ffe0ca6aba159dd4820936a0ff8a8278245b9c" +dependencies = [ + "bitflags 2.13.2", + "bytes", + "http", + "percent-encoding", + "pin-project-lite", + "tower-layer", + "tower-service", +] + [[package]] name = "tower-layer" version = "0.3.3" @@ -2999,9 +3312,9 @@ checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" [[package]] name = "unicode-ident" -version = "1.0.24" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" +checksum = "a2c754d6c33795a1c324727428e5a7dedb5b06195f9890bdbcba760d3e246563" [[package]] name = "unicode-segmentation" @@ -3015,7 +3328,7 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16b380a1238663e5f8a691f9039c73e1cdae598a30e9855f541d29b08b53e9a5" dependencies = [ - "itertools 0.14.0", + "itertools", "unicode-segmentation", "unicode-width", ] @@ -3058,9 +3371,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.25.0" +version = "1.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f053576934f05a761a402421fbbe3d425d9366f75f978806a037b3ca481abecc" +checksum = "7cc1186384beb7dd8eedea376413fd654937285ea6c9cfbb928dc3043ea4b606" dependencies = [ "atomic", "getrandom 0.4.3", @@ -3100,10 +3413,20 @@ dependencies = [ ] [[package]] -name = "want" -version = "0.3.1" +name = "walkdir" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec4cdd0dd910afe868b7ef477227d8d538b46b3075031afee8a9f2acb0a2ed0b" dependencies = [ "try-lock", ] @@ -3125,9 +3448,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.126" +version = "0.2.129" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b067c0c11094aef6b7a801c1e34a26affafdf3d051dba08456b868789aaf9a4" +checksum = "9bb54f33acc68fd454578d9820b0bde1a1a3d17aa17bb7b6595806d02886d409" dependencies = [ "cfg-if", "once_cell", @@ -3138,19 +3461,20 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.76" +version = "0.4.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62df1340f32221cb9c54d6a27b030e3dba64361d4a95bed55f9aacb44da291d" +checksum = "3cbab34de2d982e9b48e18d216d04c4a6f641066ff19ffb699980f591ee3610e" dependencies = [ "js-sys", + "tokio", "wasm-bindgen", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.126" +version = "0.2.129" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167ce5e579f6bcf889c4f7175a8a5a585de84e8ff93976ce393efa5f2837aab1" +checksum = "2e29d0c35b16e224a7eeb5cd2d25e3e1968fbd65604117b44d3b789d00ee8535" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3158,31 +3482,31 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.126" +version = "0.2.129" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3997c7839262f4ef12cf90b818d6340c18e80f263f1a94bf157d0ec4420380e" +checksum = "6f501a8bc3719dba86ef8ae4728879c08001bea749eb1333ac5b91e040e2a6b7" dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.9", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.126" +version = "0.2.129" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc1b4cb0cc549fcf58d7dfc081778139b3d283a081644e833e84682ad71cea24" +checksum = "23f0c9c52aa7cd7d77769a4cfe2a9adb1b331f489a41d912ce14513d5ab995c6" dependencies = [ "unicode-ident", ] [[package]] name = "web-sys" -version = "0.3.103" +version = "0.3.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8622dcb61c0bcc9fffa6938bed81210af2da9a7e4a1a834b2e37a59b6dfb6141" +checksum = "88261b9deccee56594c11a3460c462c41f58d148598fe70ad77070126a68aba4" dependencies = [ "js-sys", "wasm-bindgen", @@ -3199,10 +3523,10 @@ dependencies = [ ] [[package]] -name = "webpki-roots" +name = "webpki-root-certs" version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dcd9d09a39985f5344844e66b0c530a33843579125f23e21e9f0f220850f22a" +checksum = "b96554aa2acc8ccdb7e1c9a58a7a68dd5d13bccc69cd124cb09406db612a1c9b" dependencies = [ "rustls-pki-types", ] @@ -3225,7 +3549,7 @@ checksum = "692daff6d93d94e29e4114544ef6d5c942a7ed998b37abdc19b17136ea428eb7" dependencies = [ "getrandom 0.3.4", "mac_address", - "sha2", + "sha2 0.10.9", "thiserror 1.0.69", "uuid", ] @@ -3295,6 +3619,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +[[package]] +name = "winapi-util" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" +dependencies = [ + "windows-sys 0.61.2", +] + [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -3453,12 +3786,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.7.15" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945" -dependencies = [ - "memchr", -] +checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81" [[package]] name = "wit-bindgen" @@ -3468,9 +3798,15 @@ checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" [[package]] name = "writeable" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4" +checksum = "3ad82d2a33cdc9674dc7465672f271e096168fcdbe0f799d9e6db8c5892679dc" + +[[package]] +name = "xxhash-rust" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "550a2b930b62486a393c52d5c3b84bff264b28aa437ed64694d31e93b1757af7" [[package]] name = "yoke" @@ -3485,36 +3821,16 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e" +checksum = "ec8ebde2db3681e8c9980cc27822030e68752690ddfa9473e739aeb4dbde6d71" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.9", "synstructure", ] -[[package]] -name = "zerocopy" -version = "0.8.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5a105cd7b140f6eeec8acff2ea38135d3cab283ada58540f629fe51e46696eb" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.8.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fe976fb70c78cd64cccfe3a6fc142244e8a77b70959b30faf9d0ac37ee228eb" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.119", -] - [[package]] name = "zerofrom" version = "0.1.8" @@ -3526,27 +3842,41 @@ dependencies = [ [[package]] name = "zerofrom-derive" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1" +checksum = "f75b4683f6c7f45248d4d64056a24298c6281e0993356d7d1b4a1a962ef10d4a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.9", "synstructure", ] [[package]] name = "zeroize" -version = "1.9.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e" +checksum = "e13084392c5e4bc371903e2935a5eaeed24905a7511356b883835e18a78f6879" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c50655cbb0fe3fc43170059e702f1ce5e19b84cec58dc87b037a09935c2f328" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.119", +] [[package]] name = "zerotrie" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf" +checksum = "4ea269c3bd32f0a32c321907a2ae912ba6f4649bb0fc764a15627e99a7095a3f" dependencies = [ "displaydoc", "yoke", @@ -3555,9 +3885,9 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.11.6" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239" +checksum = "bb0464e17806c1d976d5cba29399c7f08e516e279e2ba493f63123b5fca67dd8" dependencies = [ "yoke", "zerofrom", @@ -3566,13 +3896,13 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.11.3" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555" +checksum = "34df6fc39dbd26ddc9c10e6a2984476e13acce22e64e4487636ef494369225da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.9", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 6c442e7..f40db1d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,6 +40,7 @@ io-uring = ["dep:tokio-splice"] # HTTP/1.1 protocol handler: парсинг request-head, verdict Allow/Reject, # туннелирование на upstream (см. src/protocol/http/ и [protocol.http] в конфиге). protocol-http = [] +protocol-minecraft = [] [dependencies] tokio = { version = "1", features = ["full"] } @@ -51,14 +52,14 @@ thiserror = "2" anyhow = "1" dashmap = "6" hex = "0.4" -sha2 = "0.10" +sha2 = "0.11" subtle = "2" -socket2 = { version = "0.5", features = ["all"] } +socket2 = { version = "0.6", features = ["all"] } futures = "0.3" -reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] } +reqwest = { version = "0.13", default-features = false, features = ["json", "query", "rustls"] } prometheus = { version = "0.14", features = ["process"] } -toml = "0.8" -rand = { version = "0.8", default-features = false, features = ["std", "std_rng"] } +toml = "1.1" +rand = { version = "0.10", default-features = false, features = ["std", "std_rng", "thread_rng"] } clap = { version = "4", features = ["derive"] } chrono = { version = "0.4", features = ["serde"] } @@ -67,11 +68,11 @@ ratatui = "0.30" crossterm = "0.29" axum = "0.8" -tower-http = { version = "0.6", features = ["cors"] } -jsonwebtoken = "9" +tower-http = { version = "0.7", features = ["cors"] } +jsonwebtoken = "11" -redis = { version = "0.27", optional = true, features = ["tokio-comp", "connection-manager"] } -maxminddb = { version = "0.30", optional = true } +redis = { version = "1.7", optional = true, features = ["tokio-comp", "connection-manager"] } +maxminddb = { version = "0.32", optional = true } tokio-splice = { version = "0.2", optional = true } -libbpf-rs = { version = "0.24", optional = true } +libbpf-rs = { version = "0.27", optional = true } libc = { version = "0.2", optional = true } diff --git a/README.md b/README.md index 21666d8..e45d149 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ Protocol-specific logic lives in **modular protocol plugins**, so the same platf │ L7 handshake analysis · rate limit · HMAC · death-code patterns │ ├────────────────────────────────────────────────────────────────────┤ │ Layer 4: Protocol Plugins (feature crates) │ -│ http (feature protocol-http) · grpc (planned) │ +│ http (protocol-http) · Minecraft Java (protocol-minecraft) · grpc (planned) │ └────────────────────────────────────────────────────────────────────┘ Traffic Intel (EWMA thresholds, profiling, reputation) runs across all layers @@ -75,6 +75,7 @@ Attacker → [XDP/eBPF] → [PoW] → [Userspace Core] → [Plugin] → Your Ser | **rampart-tui** | Live metrics terminal dashboard, polls the Prometheus `/metrics` endpoint | Rust (ratatui) | | **protocol plugins** | Protocol-aware filtering as feature crates | Rust | | ↳ `http` | HTTP/1.1 handler, compiled with the `protocol-http` feature | Rust | +| ↳ `minecraft` | Minecraft Java TCP handshake and tunnel, compiled with `protocol-minecraft` | Rust | | ↳ `grpc` | Planned | Rust | | **docs/kb** | Bilingual knowledge base: attack anatomy, defense levels, practice guides | Markdown | @@ -93,17 +94,26 @@ Full benchmark suite in progress. ### Quick Start ```bash -# Build (the HTTP protocol handler is a feature) +# Build the HTTP edge handler cargo build --release --features protocol-http # Install the default config sudo mkdir -p /etc/rampart -sudo cp deploy/config/edge.toml /etc/rampart/config.toml +sudo cp deploy/config/edge-http.toml /etc/rampart/config.toml # Run edge node (config path comes from $RAMPART_CONFIG, default /etc/rampart/config.toml) RAMPART_CONFIG=/etc/rampart/config.toml ./target/release/rampart ``` +### Minecraft Java Edge + +Rampart also has an early Minecraft Java TCP handler. Build it with +`cargo build --release --features protocol-minecraft --bin rampart`, copy +`deploy/config/edge.toml` as its config, and follow +[docs/minecraft-java.md](docs/minecraft-java.md) for Paper PROXY-protocol and +private-backend setup. This handler does not protect an already-saturated home +uplink; use a DDoS-filtering game proxy/provider in front of the edge. + ### Documentation | Path | Description | @@ -113,6 +123,7 @@ RAMPART_CONFIG=/etc/rampart/config.toml ./target/release/rampart | [docs/research/load-test-report.md](docs/research/load-test-report.md) | VDS stress test report (2026-08-04) | | [docs/research/](docs/research/) | Research notes: eBPF, anti-bot, DDoS vectors, networking | | [docs/deployment.md](docs/deployment.md) | Deployment guide | +| [docs/minecraft-java.md](docs/minecraft-java.md) | Minecraft Java edge and Paper setup | | [docs/configuration.md](docs/configuration.md) | Configuration reference | | [docs/runbook.md](docs/runbook.md) | Operations runbook | @@ -153,7 +164,7 @@ Rampart фильтрует трафик на трёх уровнях до тог │ L7 handshake analysis · rate limit · HMAC · death-code паттерны │ ├────────────────────────────────────────────────────────────────────┤ │ Слой 4: Протокол-плагины (feature crates) │ -│ http (feature protocol-http) · grpc (в планах) │ +│ http (protocol-http) · Minecraft Java (protocol-minecraft) · grpc (в планах) │ └────────────────────────────────────────────────────────────────────┘ Traffic Intel (EWMA thresholds, профилирование, репутация) работает поперёк всех слоёв @@ -174,6 +185,7 @@ Rampart фильтрует трафик на трёх уровнях до тог | **rampart-tui** | Терминальный дашборд live-метрик, опрашивает Prometheus `/metrics` | Rust (ratatui) | | **Протокол-плагины** | Протоколозависимая фильтрация в виде feature crates | Rust | | ↳ `http` | HTTP/1.1-обработчик, собирается с фичей `protocol-http` | Rust | +| ↳ `minecraft` | TCP-handshake и туннель Minecraft Java, фича `protocol-minecraft` | Rust | | ↳ `grpc` | В планах | Rust | | **docs/kb** | Двуязычная база знаний: анатомия атак, уровни защиты, практические руководства | Markdown | @@ -192,17 +204,27 @@ Rampart фильтрует трафик на трёх уровнях до тог ### Быстрый старт ```bash -# Сборка (HTTP-обработчик собирается фичей) +# Сборка HTTP-обработчика cargo build --release --features protocol-http # Установка дефолтного конфига sudo mkdir -p /etc/rampart -sudo cp deploy/config/edge.toml /etc/rampart/config.toml +sudo cp deploy/config/edge-http.toml /etc/rampart/config.toml # Запуск edge ноды (путь конфига берётся из $RAMPART_CONFIG, по умолчанию /etc/rampart/config.toml) RAMPART_CONFIG=/etc/rampart/config.toml ./target/release/rampart ``` +### Minecraft Java Edge + +В проекте появился ранний TCP-обработчик Minecraft Java. Соберите его командой +`cargo build --release --features protocol-minecraft --bin rampart`, скопируйте +`deploy/config/edge.toml` как конфиг и настройте +Paper и закрытый backend по инструкции +[docs/minecraft-java.md](docs/minecraft-java.md). Сам Rampart не спасёт домашний +канал, если атака уже забила его: перед edge нужен игровой прокси или провайдер +с фильтрацией DDoS. + ### Документация | Путь | Описание | @@ -212,6 +234,7 @@ RAMPART_CONFIG=/etc/rampart/config.toml ./target/release/rampart | [docs/research/load-test-report.md](docs/research/load-test-report.md) | Отчёт по VDS stress test (2026-08-04) | | [docs/research/](docs/research/) | Research-заметки: eBPF, антибот, векторы DDoS, сети | | [docs/deployment.md](docs/deployment.md) | Руководство по деплою | +| [docs/minecraft-java.md](docs/minecraft-java.md) | Minecraft Java edge и настройка Paper | | [docs/configuration.md](docs/configuration.md) | Справочник конфигурации | | [docs/runbook.md](docs/runbook.md) | Операционный runbook | diff --git a/TODO.md b/TODO.md index 66e2eda..f115755 100644 --- a/TODO.md +++ b/TODO.md @@ -98,6 +98,8 @@ guard/ ### Движок без протоколов — сделать полезным — ✅ готово - [x] **Первый протокол-плагин**: `protocol-http` — HTTP/1.1 request-head анализ (src/protocol/http/, tests/http_protocol.rs). +- [x] **Minecraft Java TCP MVP**: ограниченный handshake status/login, передача исходных + байтов backend и опциональный PROXY protocol v2 (`protocol-minecraft`). - [x] **TCP-proxy режим**: tunnel.rs + ProtocolHandler интегрированы в listener/app wiring. - [x] **Fail-fast сообщение** при пустом registry (`ProtocolRegistry::primary()`). @@ -149,6 +151,10 @@ guard/ bin-файлы тонкие (rampart.rs: 330 → 6 строк). ### Новые найденные проблемы (чинить в v0.4) +- [ ] Redis blacklist: сохранять срок/причину бана и восстанавливать edge-состояние после reconnect; + Pub/Sub сейчас только для подключённых узлов. +- [ ] Minecraft Java: Velocity modern forwarding, игровые netns smoke-тесты и нагрузочная проверка. +- [ ] Принимать client IP от внешнего DDoS-прокси через доверенный inbound PROXY protocol. - [x] `cargo check --no-default-features` починен (2026-09-15, раунд 2): redis-код в manager/sync/api/store/app закрыт `#[cfg(feature = "store-redis")]`, менеджер без фичи fail-fast'ит на старте; CI теперь гоняет `cargo check --no-default-features --all-targets` гейтом. diff --git a/deploy/config/edge-docker.toml b/deploy/config/edge-docker.toml new file mode 100644 index 0000000..c0e06b6 --- /dev/null +++ b/deploy/config/edge-docker.toml @@ -0,0 +1,56 @@ +# Minecraft Java edge configuration for deploy/docker-compose.yml. +whitelist = ["127.0.0.1", "::1"] + +[bind] +address = "0.0.0.0" +port = 25565 + +[backend] +# Docker host address; expose this backend port only to trusted Rampart nodes. +upstreams = ["host.docker.internal:25566"] + +[protocol.minecraft] +enabled = true +max_frame_bytes = 8192 +timeout_secs = 5 +send_proxy_protocol = false + +[workers] +count = 4 + +[limits] +handshake_timeout_secs = 5 +max_connections_per_ip = 10 +rate_limit_pps = 5.0 +rate_limit_burst = 10.0 + +[ban] +ban_duration_secs = 3600 + +[store] +redis_url = "redis://redis:6379/0" +blacklist_cache_ttl_secs = 300 +clickhouse_url = "" + +[xdp] +enabled = false +interface = "eth0" + +[logging] +level = "info" +format = "text" + +[metrics] +enabled = true +port = 9090 + +[pow] +enabled = false +difficulty = 4 + +# Enable only when a trusted upstream TCP proxy sends PROXY protocol v2. +[proxy_protocol] +ingress_enabled = false +trusted_cidrs = [] +ingress_timeout_ms = 750 +max_header_bytes = 512 diff --git a/deploy/config/edge-http.toml b/deploy/config/edge-http.toml new file mode 100644 index 0000000..016a5d8 --- /dev/null +++ b/deploy/config/edge-http.toml @@ -0,0 +1,42 @@ +# Generic HTTP/1.1 edge configuration. +whitelist = ["127.0.0.1", "::1"] + +[bind] +address = "0.0.0.0" +port = 25565 + +[backend] +upstreams = ["127.0.0.1:25566"] + +[workers] +count = 4 + +[limits] +handshake_timeout_secs = 5 +max_connections_per_ip = 10 +rate_limit_pps = 5.0 +rate_limit_burst = 10.0 + +[ban] +ban_duration_secs = 3600 + +[store] +redis_url = "" +blacklist_cache_ttl_secs = 300 +clickhouse_url = "" + +[xdp] +enabled = false +interface = "eth0" + +[logging] +level = "info" +format = "text" + +[metrics] +enabled = true +port = 9090 + +[pow] +enabled = false +difficulty = 4 diff --git a/deploy/config/edge.toml b/deploy/config/edge.toml index bddc754..711c19e 100644 --- a/deploy/config/edge.toml +++ b/deploy/config/edge.toml @@ -1,13 +1,23 @@ -# Rampart edge — единый конфиг (схема: src/config/sections.rs) +# Rampart edge для Minecraft Java (схема: src/config/sections/) +# whitelist — корневое поле, поэтому оно задаётся до любых TOML-секций. +whitelist = ["127.0.0.1", "::1"] [bind] address = "0.0.0.0" port = 25565 [backend] -# Generic TCP-бэкенды за edge-нодой (addr:port) +# Адрес Paper за доверенным прокси; закрой этот порт firewall-ом от интернета. upstreams = ["127.0.0.1:25566"] +[protocol.minecraft] +enabled = true +max_frame_bytes = 8192 +timeout_secs = 5 +# Outbound: включай вместе с proxies.proxy-protocol: true на Paper и firewall, +# разрешающим backend-порт только от этого Rampart. +send_proxy_protocol = false + [workers] count = 4 @@ -41,4 +51,10 @@ port = 9090 enabled = false difficulty = 4 -whitelist = ["127.0.0.1", "::1"] +# Inbound: включай только если входящий TCP-прокси передаёт PROXY v2. +# Укажи точные адреса/CIDR этого прокси; не добавляй сюда адреса игроков. +[proxy_protocol] +ingress_enabled = false +trusted_cidrs = [] +ingress_timeout_ms = 750 +max_header_bytes = 512 diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml index d4c9da4..1ad6867 100644 --- a/deploy/docker-compose.yml +++ b/deploy/docker-compose.yml @@ -44,11 +44,13 @@ services: dockerfile: deploy/docker/Dockerfile.edge ports: - "25565:25565" - - "9090:9090" + - "127.0.0.1:9090:9090" + extra_hosts: + - "host.docker.internal:host-gateway" environment: RAMPART_CONFIG: /etc/rampart/config.toml volumes: - - ./config/edge.toml:/etc/rampart/config.toml:ro + - ./config/edge-docker.toml:/etc/rampart/config.toml:ro depends_on: redis: condition: service_healthy diff --git a/deploy/docker/Dockerfile.edge b/deploy/docker/Dockerfile.edge index f160fdb..5d70541 100644 --- a/deploy/docker/Dockerfile.edge +++ b/deploy/docker/Dockerfile.edge @@ -13,7 +13,7 @@ RUN if command -v clang >/dev/null; then \ clang -O2 -g -target bpf -c xdp/core/universal_filter.c -o /app/target/xdp/universal_filter.o; \ fi -RUN cargo build --release --features xdp --bin rampart && \ +RUN cargo build --release --features xdp,protocol-minecraft --bin rampart && \ cp target/release/rampart /app/rampart && \ strip /app/rampart diff --git a/docs/api.md b/docs/api.md index fe62a37..4d04d80 100644 --- a/docs/api.md +++ b/docs/api.md @@ -56,7 +56,7 @@ Authorization: Bearer } ``` -Redis недоступен → пустой список. +Если Redis недоступен, API возвращает `503 Service Unavailable`. --- @@ -68,13 +68,16 @@ Redis недоступен → пустой список. { "items": [ {"target": "1.2.3.4", "type": "ip", "reason": "manual_ban", - "created_at": "...", "expires_at": null} + "created_at": "2026-10-16T12:00:00+00:00", "expires_at": "2026-10-16T13:00:00+00:00"} ], "total": 42 } ``` -Источник: Redis set `rampart:blacklist`. Пагинации и фильтров нет. +Источник: Redis set `rampart:blacklist` и hash `rampart:blacklist:metadata`. +Метаданные содержат причину, время создания и абсолютный срок истечения; API +скрывает истёкшие записи. Старые set-записи без метаданных получают один +ограниченный срок в пять минут при первом чтении или восстановлении edge. ### `POST /api/v1/blacklist` 🔒 @@ -82,10 +85,24 @@ Redis недоступен → пустой список. // Request {"target": "1.2.3.4", "type": "ip", "reason": "manual_ban", "duration_secs": 3600} -// Response 200/201 — запись добавлена в Redis set +// Response 200 — запись и метаданные атомарно сохранены в Redis, а событие +// с duration_secs и expires_at_unix опубликовано в rampart:blacklist:events. ``` -Edge-ноды подхватывают ban при следующей синхронизации блэклиста. +Edge подписывается на Pub/Sub перед загрузкой снимка из Redis. Поэтому события, +пришедшие во время загрузки, будут применены после снимка. При старте и после +переподключения активные Redis-баны восстанавливаются с оставшимся TTL; новые +события используют абсолютный срок и игнорируются, если он уже прошёл. Старый +формат события только с `duration_secs` продолжает поддерживаться. + +### `DELETE /api/v1/blacklist` 🔒 + +```json +{"target": "1.2.3.4"} +``` + +Удаляет только Redis-бан и его метаданные, затем публикует событие unban. +Локальные баны детекторов хранятся отдельно и этим запросом не снимаются. --- @@ -110,7 +127,6 @@ Edge-ноды подхватывают ban при следующей синхр Честно, на текущий момент в API **нет**: -- удаления записей blacklist (только add/list); - drain нод через API (есть только CLI `rampart-cli drain`); - webhooks, metrics summary, challenge management; - регистрации нод через `POST /api/v1/nodes`; diff --git a/docs/configuration.md b/docs/configuration.md index fda357e..f3a623d 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -6,14 +6,23 @@ ## 1. Edge (`config.toml`, путь задаётся `RAMPART_CONFIG`) ```toml +# Корневые поля должны стоять до первой TOML-секции. +whitelist = ["127.0.0.1", "::1"] + [bind] address = "0.0.0.0" port = 25565 [backend] -# Список TCP-бэкендов (addr:port). Обязателен непустой, адреса валидируются. +# Список TCP-бэкендов (addr:port). Для Minecraft нужен ровно один backend. upstreams = ["127.0.0.1:25566"] +[protocol.minecraft] +enabled = true +max_frame_bytes = 8192 +timeout_secs = 5 +send_proxy_protocol = false + [workers] count = 4 @@ -47,10 +56,24 @@ port = 9090 enabled = false # PoW challenge, OFF по умолчанию difficulty = 4 -whitelist = ["127.0.0.1", "::1"] # только IP-адреса, валидируются при парсинге +# Входящий PROXY v2 от известного TCP DDoS-прокси; включай только если +# прокси действительно отправляет этот заголовок. +[proxy_protocol] +ingress_enabled = false +trusted_cidrs = [] +ingress_timeout_ms = 750 +max_header_bytes = 512 + ``` +Этот пример выбирает Minecraft Java и требует сборки с `protocol-minecraft`. +Для HTTP используй сборку `protocol-http` и удали `[protocol.minecraft]`. + Все секции опциональны — при отсутствии используются дефолты из таблицы выше. +Для ingress PROXY v2 укажи сети именно прокси в `trusted_cidrs`; включение без +доверенной сети отклоняется при чтении конфига. +`send_proxy_protocol` отправляет заголовок на Paper backend; прежнее имя +`proxy_protocol` внутри `[protocol.minecraft]` остаётся допустимым alias. ## 2. Manager (переменные окружения) @@ -73,7 +96,8 @@ Manager всегда слушает `0.0.0.0:8080`. | `geoip` | ❌ | GeoIP lookup (maxminddb) | | `xdp` | ❌ | Загрузка XDP-программы через libbpf-rs | | `io-uring` | ❌ | splice/io_uring I/O | -| `protocol-http` | ❌ | Резерв под HTTP-плагин (пока пустой) | +| `protocol-http` | ❌ | HTTP/1.1 handler; включай только для HTTP upstream | +| `protocol-minecraft` | ❌ | Minecraft Java TCP handshake и проксирование | Пример: `cargo build --release --features xdp --bin rampart`. @@ -87,4 +111,4 @@ clang -O2 -g -target bpf -c xdp/core/universal_filter.c -o /tmp/universal_filter --- -*Версия: 2.0 | Август 2026* +*Версия: 2.1 | Октябрь 2026* diff --git a/docs/deployment.md b/docs/deployment.md index e44d92b..ca23459 100644 --- a/docs/deployment.md +++ b/docs/deployment.md @@ -27,9 +27,9 @@ ## 3. Быстрый старт — Edge ```bash -# Сборка +# Сборка edge для Minecraft Java git clone https://github.com/loki5512344/rampart.git && cd rampart -cargo build --release --bin rampart +cargo build --release --features protocol-minecraft --bin rampart # Установка sudo cp target/release/rampart /usr/local/bin/ @@ -64,10 +64,10 @@ systemctl enable --now rampart journalctl -u rampart -f ``` -> ⚠️ В ядре нет ни одной реализации протокольного обработчика: реестр протоколов -> пуст, и `rampart` при старте требует feature `protocol-http` или внешний -> ProtocolHandler (см. src/bin/rampart.rs). До появления плагинов edge-нода -> запускается только в исследовательских целях. +Minecraft-конфиг рассчитан на один Paper backend. Если включён +`protocol.minecraft.send_proxy_protocol`, включи `proxies.proxy-protocol: true` в +Paper и закрой backend-порт firewall-ом от всех, кроме Rampart. Для подробной +схемы с домашним сервером и защищённым VDS см. [Minecraft Java guide](minecraft-java.md). ## 4. Быстрый старт — Manager @@ -107,4 +107,4 @@ docker compose -f deploy/docker-compose.yml up -d --- -*Версия: 2.0 | Август 2026* +*Версия: 2.1 | Октябрь 2026* diff --git a/docs/minecraft-java.md b/docs/minecraft-java.md new file mode 100644 index 0000000..0cf012c --- /dev/null +++ b/docs/minecraft-java.md @@ -0,0 +1,95 @@ +# Rampart перед Minecraft Java + +Rampart can proxy Minecraft Java Edition over TCP. It checks the bounded Java +handshake, forwards the original bytes unchanged, and then tunnels the +connection to one Paper backend. This is an early integration: it does not +replace an upstream DDoS scrubbing network. + +## Build and configure + +Build the edge binary with the Minecraft handler: + +```sh +cargo build --release --features protocol-minecraft --bin rampart +``` + +Use one backend per edge node. For a Paper server on the same host, the sample +uses port `25566`; change it to the address reachable over your private network +or WireGuard tunnel. + +```toml +whitelist = ["127.0.0.1", "::1"] + +[bind] +address = "0.0.0.0" +port = 25565 + +[backend] +upstreams = ["10.20.0.5:25566"] + +[protocol.minecraft] +enabled = true +max_frame_bytes = 8192 +timeout_secs = 5 +send_proxy_protocol = true + +[pow] +enabled = false +``` + +PoW must stay disabled for Minecraft Java: the current PoW exchange is plain +text and is not part of the Minecraft protocol. Configure the edge firewall to +allow public TCP `25565`, and keep Prometheus `9090` and the Paper backend port +private. + +## Preserve player IPs safely + +When `send_proxy_protocol` is enabled, Rampart prepends a PROXY protocol v2 header +before the Minecraft handshake. On Paper, enable `proxies.proxy-protocol` in +`config/paper-global.yml`. Paper documents this option for HAProxy or similar +proxies: [global configuration](https://docs.papermc.io/paper/reference/global-configuration/). + +The PROXY header is not authenticated. Put the edge-to-Paper connection on a +private network or WireGuard and firewall Paper's backend port to accept only +the trusted edge IPs. Never expose a PROXY-enabled Paper port to arbitrary +clients: they could forge the address in the header. + +If Rampart runs in Docker, the container needs access to the configured backend +address. The included sample image builds `protocol-minecraft`; the sample +config keeps PROXY protocol disabled until Paper and the backend firewall are +configured together. + +## DDoS boundary + +Rampart can reject connections and apply local rate limits after packets reach +the edge host. It cannot keep a home uplink available when an attack saturates +that link. Put a Minecraft-aware DDoS proxy or a provider with game DDoS +filtering in front of the VDS, hide the home's public address, and carry +accepted traffic to the home server through a restricted tunnel. Two ordinary +VDS instances without upstream filtering do not provide that protection. + +For a DDoS provider that sends PROXY protocol v2, enable inbound parsing only +for that provider's TCP source ranges: + +```toml +[proxy_protocol] +ingress_enabled = true +# Replace these documentation ranges with the provider's actual ranges. +trusted_cidrs = ["198.51.100.0/24", "2001:db8:1234::/48"] +ingress_timeout_ms = 750 +max_header_bytes = 512 +``` + +Rampart rejects connections from unlisted peers when ingress mode is enabled, +and it applies per-IP limits and bans using the verified header source address. +Keep the allowlist current with the provider's published ranges. The header is +not cryptographically authenticated, so never trust arbitrary internet peers. +This MVP accepts PROXY v2 TCP4/TCP6 address headers without TLVs; confirm that +format with the provider before enabling ingress mode. +XDP operates on the network peer address and is not used to ban the claimed +player address on this path. + +The Minecraft handler supports status and login handshake states and forwards +the connection as a TCP tunnel. It does not inspect encrypted login/game +packets or implement Velocity forwarding. Bedrock Edition uses UDP and is not +supported by this handler. diff --git a/src/app/services.rs b/src/app/services.rs index 7553922..06b33fd 100644 --- a/src/app/services.rs +++ b/src/app/services.rs @@ -19,6 +19,15 @@ use tokio::sync::watch; /// HTTP/1.1-обработчик с политикой из секции `[protocol.http]`. /// Внешние крейты регистрируют свои обработчики в этом же месте. pub(crate) fn build_registry(config: &Config) -> ProtocolRegistry { + #[cfg(feature = "protocol-minecraft")] + if config.protocol.minecraft.enabled { + let mut registry = ProtocolRegistry::new(); + registry.register(Box::new(crate::protocol::minecraft::MinecraftProtocolHandler::new( + &config.protocol.minecraft, + &config.backend.upstreams, + ))); + return registry; + } #[cfg(feature = "protocol-http")] { let mut registry = ProtocolRegistry::new(); @@ -60,10 +69,17 @@ pub(crate) fn start_xdp( let mut guard = shared.lock().expect("xdp lock poisoned"); let globals = XdpGlobals::from_config(&config.xdp)?; guard.set_globals(globals); - // Порядок load-bearing: `load()` захватывает blacklist и политику - // авто-бана в ringbuf-колбэк (XdpFilter::load -> build_ringbuf), - // поэтому set_autoban обязан отработать ДО load(), а не после. - guard.set_autoban(blacklist.clone(), &config.xdp); + // With ingress PROXY protocol, XDP sees only the provider's transport + // address, so its events must not trigger per-player or provider bans. + if !config.proxy_protocol.ingress_enabled { + // load() captures the blacklist and auto-ban policy in its ringbuf + // callback, so set_autoban must happen first. + guard.set_autoban(blacklist.clone(), &config.xdp); + } else if config.xdp.auto_ban_enabled { + tracing::warn!( + "XDP auto-ban is disabled while inbound PROXY protocol is enabled; XDP only sees transport peers" + ); + } guard.load()?; } let xdp_metrics = XdpMetrics::register()?; diff --git a/src/bin/rampart-manager.rs b/src/bin/rampart-manager.rs index 5937bbc..91efa87 100644 --- a/src/bin/rampart-manager.rs +++ b/src/bin/rampart-manager.rs @@ -69,10 +69,12 @@ async fn main() -> anyhow::Result<()> { .route("/api/v1/servers", get(api::inventory::servers::list_servers)) .route( "/api/v1/blacklist", - get(api::blacklist::list_blacklist).post(api::blacklist::add_blacklist), + get(api::blacklist::list_blacklist) + .post(api::blacklist::add_blacklist) + .delete(api::blacklist::remove_blacklist), ) .route("/api/v1/nodes", get(api::inventory::nodes::list_nodes)); - let protected = protected.route_layer(middleware::from_fn(auth::auth_middleware)); + let protected = protected.route_layer(middleware::from_fn_with_state(state.clone(), auth::auth_middleware)); let cors = match std::env::var("CORS_ORIGIN") { Ok(origin) if origin.is_empty() || origin == "*" => CorsLayer::new().allow_origin(tower_http::cors::Any), diff --git a/src/cli/commands/blacklist.rs b/src/cli/commands/blacklist.rs index 65d1c15..70caefc 100644 --- a/src/cli/commands/blacklist.rs +++ b/src/cli/commands/blacklist.rs @@ -1,4 +1,5 @@ use serde::Deserialize; +use serde::Serialize; #[derive(Deserialize)] struct AddResponse { @@ -18,8 +19,33 @@ struct BlacklistResponse { total: usize, } -pub async fn add(target: String, reason: Option) -> anyhow::Result<()> { +#[derive(Deserialize)] +struct LoginResponse { + token: String, +} + +#[derive(Serialize)] +struct RemoveRequest<'a> { + target: &'a str, +} + +async fn authenticated_client() -> anyhow::Result<(reqwest::Client, String, String)> { let manager_url = std::env::var("RAMPART_MANAGER").unwrap_or_else(|_| "http://localhost:8080".to_string()); + let password = std::env::var("RAMPART_API_PASSWORD") + .map_err(|_| anyhow::anyhow!("RAMPART_API_PASSWORD must be set to use the manager blacklist API"))?; + let client = reqwest::Client::new(); + let response = client + .post(format!("{manager_url}/api/v1/auth/login")) + .json(&serde_json::json!({"password": password})) + .send() + .await? + .error_for_status()?; + let token = response.json::().await?.token; + Ok((client, manager_url, token)) +} + +pub async fn add(target: String, reason: Option) -> anyhow::Result<()> { + let (client, manager_url, token) = authenticated_client().await?; let body = serde_json::json!({ "target": target, @@ -27,43 +53,47 @@ pub async fn add(target: String, reason: Option) -> anyhow::Result<()> { "reason": reason.unwrap_or_else(|| "manual".to_string()), }); - let client = reqwest::Client::new(); - match client + let resp = client .post(format!("{manager_url}/api/v1/blacklist")) + .bearer_auth(token) .json(&body) .send() - .await - { - Ok(resp) => { - if let Ok(add_resp) = resp.json::().await { - println!("[OK] {}: {}", add_resp.status, add_resp.target); - } - }, - Err(e) => println!("[FAIL] {e}"), - } + .await? + .error_for_status()? + .json::() + .await?; + println!("[OK] {}: {}", resp.status, resp.target); Ok(()) } pub async fn remove(target: String) -> anyhow::Result<()> { - println!("Removing {target} from blacklist..."); - println!("(not implemented in v0.1)"); + let (client, manager_url, token) = authenticated_client().await?; + let response = client + .delete(format!("{manager_url}/api/v1/blacklist")) + .bearer_auth(token) + .json(&RemoveRequest { target: &target }) + .send() + .await? + .error_for_status()?; + let result: serde_json::Value = response.json().await?; + println!("[OK] {}: {}", result["status"].as_str().unwrap_or("removed"), target); Ok(()) } pub async fn list() -> anyhow::Result<()> { - let manager_url = std::env::var("RAMPART_MANAGER").unwrap_or_else(|_| "http://localhost:8080".to_string()); - - match reqwest::get(format!("{manager_url}/api/v1/blacklist")).await { - Ok(resp) => { - if let Ok(list) = resp.json::().await { - println!("Blacklist ({} entries)", list.total); - println!("----------------------"); - for item in &list.items { - println!(" {} ({})", item.target, item.reason); - } - } - }, - Err(e) => println!("[FAIL] {e}"), + let (client, manager_url, token) = authenticated_client().await?; + let list = client + .get(format!("{manager_url}/api/v1/blacklist")) + .bearer_auth(token) + .send() + .await? + .error_for_status()? + .json::() + .await?; + println!("Blacklist ({} entries)", list.total); + println!("----------------------"); + for item in &list.items { + println!(" {} ({})", item.target, item.reason); } Ok(()) } diff --git a/src/config/mod.rs b/src/config/mod.rs index e63c884..62ba1aa 100644 --- a/src/config/mod.rs +++ b/src/config/mod.rs @@ -1,12 +1,17 @@ //! Единый конфиг платформы Rampart. mod sections; +#[cfg(feature = "protocol-http")] +pub use sections::HttpProtocolConfig; +#[cfg(feature = "protocol-minecraft")] +pub use sections::MinecraftProtocolConfig; +#[cfg(any(feature = "protocol-http", feature = "protocol-minecraft"))] +pub use sections::ProtocolConfig; pub use sections::{ BackendConfig, BanConfig, BindConfig, DetectAlertConfig, DetectAutobanConfig, DetectConfig, DetectPrefixConfig, - LimitsConfig, LoggingConfig, MetricsConfig, PowConfig, StoreConfig, WorkerConfig, XdpConfig, + LimitsConfig, LoggingConfig, MetricsConfig, PowConfig, ProxyProtocolConfig, StoreConfig, TrustedProxyCidr, + WorkerConfig, XdpConfig, }; -#[cfg(feature = "protocol-http")] -pub use sections::{HttpProtocolConfig, ProtocolConfig}; use serde::Deserialize; use std::fs; @@ -22,6 +27,8 @@ pub struct Config { #[serde(default)] pub limits: LimitsConfig, #[serde(default)] + pub proxy_protocol: ProxyProtocolConfig, + #[serde(default)] pub ban: BanConfig, #[serde(default)] pub store: StoreConfig, @@ -35,7 +42,7 @@ pub struct Config { pub pow: PowConfig, #[serde(default)] pub detect: DetectConfig, - #[cfg(feature = "protocol-http")] + #[cfg(any(feature = "protocol-http", feature = "protocol-minecraft"))] #[serde(default)] pub protocol: ProtocolConfig, #[serde(default)] @@ -80,6 +87,26 @@ impl Config { if self.detect.prefix.enabled && self.detect.prefix.syn_threshold == 0 { anyhow::bail!("detect.prefix.syn_threshold must be positive when enabled"); } + if self.limits.max_connections_per_ip == 0 { + anyhow::bail!("limits.max_connections_per_ip must be positive"); + } + if self.proxy_protocol.ingress_enabled { + if self.proxy_protocol.trusted_cidrs.is_empty() { + anyhow::bail!("proxy_protocol.ingress_enabled requires at least one trusted_cidrs entry"); + } + if self.proxy_protocol.ingress_timeout_ms == 0 || self.proxy_protocol.ingress_timeout_ms > 5_000 { + anyhow::bail!("proxy_protocol.ingress_timeout_ms must be between 1 and 5000"); + } + if self.proxy_protocol.max_header_bytes < 52 || self.proxy_protocol.max_header_bytes > 4096 { + anyhow::bail!("proxy_protocol.max_header_bytes must be between 52 and 4096"); + } + #[cfg(feature = "protocol-minecraft")] + if !self.protocol.minecraft.enabled { + anyhow::bail!("proxy_protocol.ingress_enabled requires protocol.minecraft.enabled"); + } + #[cfg(not(feature = "protocol-minecraft"))] + anyhow::bail!("proxy_protocol.ingress_enabled requires the protocol-minecraft feature"); + } #[cfg(feature = "protocol-http")] { if self.protocol.http.max_header_bytes == 0 { @@ -89,6 +116,21 @@ impl Config { anyhow::bail!("protocol.http.timeout_secs must be positive"); } } + #[cfg(feature = "protocol-minecraft")] + if self.protocol.minecraft.enabled { + if self.pow.enabled { + anyhow::bail!("pow.enabled is incompatible with protocol.minecraft"); + } + if self.backend.upstreams.len() != 1 { + anyhow::bail!("protocol.minecraft requires exactly one backend.upstreams entry"); + } + if self.protocol.minecraft.max_frame_bytes == 0 { + anyhow::bail!("protocol.minecraft.max_frame_bytes must be positive"); + } + if self.protocol.minecraft.timeout_secs == 0 { + anyhow::bail!("protocol.minecraft.timeout_secs must be positive"); + } + } Ok(()) } } diff --git a/src/config/sections/detect.rs b/src/config/sections/detect.rs index 271f935..2d90c7b 100644 --- a/src/config/sections/detect.rs +++ b/src/config/sections/detect.rs @@ -78,11 +78,55 @@ fn default_prefix_min_unique_sources() -> u64 { } /// Секция `[protocol]`: протокольные обработчики (plugin-by-feature). -#[cfg(feature = "protocol-http")] +#[cfg(any(feature = "protocol-http", feature = "protocol-minecraft"))] #[derive(Debug, Clone, Default, Deserialize)] pub struct ProtocolConfig { + #[cfg(feature = "protocol-http")] #[serde(default)] pub http: HttpProtocolConfig, + #[cfg(feature = "protocol-minecraft")] + #[serde(default)] + pub minecraft: MinecraftProtocolConfig, +} + +#[cfg(feature = "protocol-minecraft")] +#[derive(Debug, Clone, Deserialize)] +pub struct MinecraftProtocolConfig { + #[serde(default = "default_minecraft_enabled")] + pub enabled: bool, + #[serde(default = "default_minecraft_max_frame_bytes")] + pub max_frame_bytes: usize, + #[serde(default = "default_minecraft_timeout_secs")] + pub timeout_secs: u64, + #[serde(default, alias = "proxy_protocol")] + pub send_proxy_protocol: bool, +} + +#[cfg(feature = "protocol-minecraft")] +impl Default for MinecraftProtocolConfig { + fn default() -> Self { + Self { + enabled: default_minecraft_enabled(), + max_frame_bytes: default_minecraft_max_frame_bytes(), + timeout_secs: default_minecraft_timeout_secs(), + send_proxy_protocol: false, + } + } +} + +#[cfg(feature = "protocol-minecraft")] +fn default_minecraft_enabled() -> bool { + !cfg!(feature = "protocol-http") +} + +#[cfg(feature = "protocol-minecraft")] +fn default_minecraft_max_frame_bytes() -> usize { + 8192 +} + +#[cfg(feature = "protocol-minecraft")] +fn default_minecraft_timeout_secs() -> u64 { + 5 } /// Секция `[protocol.http]`: политика HTTP/1.1-обработчика на edge-ноде. diff --git a/src/config/sections/edge.rs b/src/config/sections/edge.rs index 457ccf8..bb0a5b0 100644 --- a/src/config/sections/edge.rs +++ b/src/config/sections/edge.rs @@ -1,4 +1,6 @@ -use serde::Deserialize; +use serde::{Deserialize, Deserializer}; +use std::net::{IpAddr, Ipv4Addr, Ipv6Addr}; +use std::str::FromStr; #[derive(Debug, Clone, Deserialize)] pub struct BindConfig { @@ -133,3 +135,110 @@ impl Default for PowConfig { fn default_pow_difficulty() -> u8 { 4 } + +/// CIDR network allowed to send inbound PROXY protocol headers. +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub struct TrustedProxyCidr { + network: IpAddr, + prefix_len: u8, +} + +impl TrustedProxyCidr { + #[must_use] + pub fn contains(&self, ip: IpAddr) -> bool { + match (self.network, ip) { + (IpAddr::V4(network), IpAddr::V4(ip)) => { + let mask = if self.prefix_len == 0 { + 0 + } else { + u32::MAX << (32 - self.prefix_len) + }; + u32::from(network) & mask == u32::from(ip) & mask + }, + (IpAddr::V6(network), IpAddr::V6(ip)) => { + let mask = if self.prefix_len == 0 { + 0 + } else { + u128::MAX << (128 - self.prefix_len) + }; + u128::from(network) & mask == u128::from(ip) & mask + }, + _ => false, + } + } +} + +impl FromStr for TrustedProxyCidr { + type Err = String; + + fn from_str(value: &str) -> Result { + let (address, prefix) = match value.split_once('/') { + Some((address, prefix)) => (address, Some(prefix)), + None => (value, None), + }; + let network = IpAddr::from_str(address).map_err(|_| format!("invalid trusted proxy CIDR: {value}"))?; + let max_prefix = if network.is_ipv4() { 32 } else { 128 }; + let prefix_len = match prefix { + Some(prefix) => prefix + .parse::() + .map_err(|_| format!("invalid trusted proxy CIDR prefix: {value}"))?, + None => max_prefix, + }; + if prefix_len > max_prefix { + return Err(format!("trusted proxy CIDR prefix is too large: {value}")); + } + let network = match network { + IpAddr::V4(ip) => IpAddr::V4(Ipv4Addr::from(u32::from(ip) & mask_v4(prefix_len))), + IpAddr::V6(ip) => IpAddr::V6(Ipv6Addr::from(u128::from(ip) & mask_v6(prefix_len))), + }; + Ok(Self { network, prefix_len }) + } +} + +impl<'de> Deserialize<'de> for TrustedProxyCidr { + fn deserialize(deserializer: D) -> Result + where + D: Deserializer<'de>, + { + let value = String::deserialize(deserializer)?; + value.parse().map_err(serde::de::Error::custom) + } +} + +fn mask_v4(prefix: u8) -> u32 { + if prefix == 0 { 0 } else { u32::MAX << (32 - prefix) } +} + +fn mask_v6(prefix: u8) -> u128 { + if prefix == 0 { 0 } else { u128::MAX << (128 - prefix) } +} + +#[derive(Debug, Clone, Deserialize)] +pub struct ProxyProtocolConfig { + #[serde(default)] + pub ingress_enabled: bool, + #[serde(default)] + pub trusted_cidrs: Vec, + #[serde(default = "default_proxy_protocol_timeout_ms")] + pub ingress_timeout_ms: u64, + #[serde(default = "default_proxy_protocol_max_header_bytes")] + pub max_header_bytes: usize, +} + +impl Default for ProxyProtocolConfig { + fn default() -> Self { + Self { + ingress_enabled: false, + trusted_cidrs: Vec::new(), + ingress_timeout_ms: default_proxy_protocol_timeout_ms(), + max_header_bytes: default_proxy_protocol_max_header_bytes(), + } + } +} + +fn default_proxy_protocol_timeout_ms() -> u64 { + 750 +} +fn default_proxy_protocol_max_header_bytes() -> usize { + 512 +} diff --git a/src/config/sections/mod.rs b/src/config/sections/mod.rs index 0febf42..bc11814 100644 --- a/src/config/sections/mod.rs +++ b/src/config/sections/mod.rs @@ -4,8 +4,14 @@ mod detect; mod edge; mod platform; -pub use detect::{DetectAlertConfig, DetectAutobanConfig, DetectConfig, DetectPrefixConfig}; #[cfg(feature = "protocol-http")] -pub use detect::{HttpProtocolConfig, ProtocolConfig}; -pub use edge::{BackendConfig, BanConfig, BindConfig, LimitsConfig, PowConfig, WorkerConfig}; +pub use detect::HttpProtocolConfig; +#[cfg(feature = "protocol-minecraft")] +pub use detect::MinecraftProtocolConfig; +#[cfg(any(feature = "protocol-http", feature = "protocol-minecraft"))] +pub use detect::ProtocolConfig; +pub use detect::{DetectAlertConfig, DetectAutobanConfig, DetectConfig, DetectPrefixConfig}; +pub use edge::{ + BackendConfig, BanConfig, BindConfig, LimitsConfig, PowConfig, ProxyProtocolConfig, TrustedProxyCidr, WorkerConfig, +}; pub use platform::{LoggingConfig, MetricsConfig, StoreConfig, XdpConfig}; diff --git a/src/engine/challenge/pow.rs b/src/engine/challenge/pow.rs index 1e8350e..1d1cb40 100644 --- a/src/engine/challenge/pow.rs +++ b/src/engine/challenge/pow.rs @@ -1,4 +1,4 @@ -use rand::RngCore; +use rand::Rng; use sha2::{Digest, Sha256}; use std::net::IpAddr; use std::time::{Duration, Instant}; @@ -22,7 +22,7 @@ impl Challenge { #[must_use] pub fn generate(difficulty: u8) -> Self { let mut token = [0u8; 32]; - rand::thread_rng().fill_bytes(&mut token); + rand::rng().fill_bytes(&mut token); Self { token, created_at: Instant::now(), diff --git a/src/engine/listener.rs b/src/engine/listener.rs index 965ca20..c17ffab 100644 --- a/src/engine/listener.rs +++ b/src/engine/listener.rs @@ -77,10 +77,13 @@ async fn accept_loop( tokio::spawn(async move { // Hot path Traffic Intelligence: только атомики и DashMap. hook.on_accept(); - if let Err(e) = gateway.handle(stream, peer_addr).await { + let outcome = gateway.handle(stream, peer_addr).await; + if let Err(e) = outcome.result { tracing::debug!("connection from {peer_addr}: {e}"); } - hook.on_connection_end(peer_addr.ip()); + if let Some(client_ip) = outcome.client_ip { + hook.on_connection_end(client_ip); + } }); } } diff --git a/src/engine/tunnel.rs b/src/engine/tunnel.rs index 8fd176c..39028df 100644 --- a/src/engine/tunnel.rs +++ b/src/engine/tunnel.rs @@ -1,28 +1,30 @@ //! Generic TCP proxy: фильтры входа → protocol handshake → upstream. use crate::config::Config; -use crate::engine::challenge::{DifficultyAdjuster, enforce as enforce_pow}; +use crate::engine::challenge::DifficultyAdjuster; use crate::engine::subnet_tracker::SubnetTracker; use crate::filter::blacklist::Blacklist; +use crate::filter::connection_limit::ConnectionLimiter; use crate::filter::rate_limit::RateLimiter; -use crate::metrics; use crate::protocol::ProtocolRegistry; -use crate::store::clickhouse::{ClickHouseEvent, ClickHouseWriter}; +use crate::store::clickhouse::ClickHouseWriter; use crate::traffic::reputation::IpReputation; use crate::xdp::XdpFilter; use std::collections::HashSet; use std::net::IpAddr; use std::sync::Arc; use std::sync::Mutex; -use std::sync::atomic::{AtomicU64, AtomicUsize, Ordering}; -use std::time::Duration; -use tokio::net::TcpStream; +use std::sync::atomic::{AtomicU64, AtomicUsize}; use tokio::sync::Mutex as TokioMutex; +mod gateway; +#[cfg(feature = "protocol-minecraft")] +mod proxy; /// Общее состояние edge-движка, разделяемое между accept-loop'ами. pub struct Gateway { pub config: Arc, pub rate_limiter: Arc, + pub connection_limiter: ConnectionLimiter, pub blacklist: Arc, pub adjuster: Arc>, pub whitelist: Arc>, @@ -35,166 +37,9 @@ pub struct Gateway { upstream_cursor: AtomicUsize, } -impl Gateway { - #[allow(clippy::too_many_arguments)] - pub fn new( - config: Arc, - rate_limiter: Arc, - blacklist: Arc, - adjuster: Arc>, - whitelist: Arc>, - reputation: Arc, - xdp: Option>>, - clickhouse: Option>>, - allowed_1s: Arc, - registry: Arc, - subnet_tracker: Option>, - ) -> Self { - Self { - config, - rate_limiter, - blacklist, - adjuster, - whitelist, - reputation, - xdp, - clickhouse, - allowed_1s, - registry, - subnet_tracker, - upstream_cursor: AtomicUsize::new(0), - } - } - - /// Полный конвейер обработки входящего соединения. - /// - /// # Errors - /// Возвращает ошибку только при сбое ввода-вывода апстрима; блокировки - /// клиента ошибкой не считаются. - pub async fn handle(&self, mut client: TcpStream, peer_addr: std::net::SocketAddr) -> anyhow::Result<()> { - let peer_ip = peer_addr.ip(); - - if let Some(tracker) = &self.subnet_tracker { - tracker.record_connection(peer_ip); - } - - if self.blacklist.is_blocked(peer_ip) { - metrics::CONNECTIONS_TOTAL.with_label_values(&["blocked"]).inc(); - return Ok(()); - } - - if !self.pass_pow_gate(&mut client, peer_ip).await? { - return Ok(()); - } - - if !self.rate_limiter.check(peer_ip) { - self.block_rate_limit(peer_ip).await; - return Ok(()); - } - - let handler = self.registry.primary()?; - let upstream = match handler.handshake(&mut client).await { - Ok(upstream) => upstream, - Err(e) => { - tracing::debug!("handshake rejected from {peer_addr}: {e}"); - metrics::CONNECTIONS_TOTAL.with_label_values(&["blocked"]).inc(); - return Ok(()); - }, - }; - - if !self.rate_limiter.check(peer_ip) { - self.block_rate_limit(peer_ip).await; - return Ok(()); - } - - metrics::CONNECTIONS_TOTAL.with_label_values(&["allowed"]).inc(); - self.allowed_1s.fetch_add(1, Ordering::Relaxed); - self.reputation.record_good(peer_ip); - - let mut backend = TcpStream::connect(self.next_upstream(&upstream.addr)).await?; - tokio::io::copy_bidirectional(&mut client, &mut backend).await?; - Ok(()) - } - - async fn pass_pow_gate(&self, client: &mut TcpStream, peer_ip: IpAddr) -> anyhow::Result { - let pow_config = &self.config.pow; - if !(pow_config.enabled && pow_config.difficulty > 0) { - return Ok(true); - } - if self.whitelist.contains(&peer_ip) { - metrics::POW_CHALLENGES_TOTAL.with_label_values(&["skipped"]).inc(); - metrics::POW_CURRENT_DIFFICULTY.set(pow_config.difficulty as i64); - return Ok(true); - } - - let diff = { - let mut adjuster = self.adjuster.lock().expect("adjuster lock poisoned"); - adjuster.record_connection(); - adjuster.current_difficulty() - }; - let result = enforce_pow(client, peer_ip, diff).await?; - if !result { - metrics::POW_CHALLENGES_TOTAL.with_label_values(&["failed"]).inc(); - tracing::debug!("pow: failed for {peer_ip}, dropping connection"); - return Ok(false); - } - metrics::POW_CHALLENGES_TOTAL.with_label_values(&["passed"]).inc(); - metrics::POW_CURRENT_DIFFICULTY.set(diff as i64); - Ok(true) - } - - fn next_upstream<'a>(&'a self, negotiated: &'a str) -> &'a str { - let upstreams = &self.config.backend.upstreams; - if upstreams.len() > 1 { - let idx = self.upstream_cursor.fetch_add(1, Ordering::Relaxed) % upstreams.len(); - return upstreams[idx].as_str(); - } - if let Some(first) = upstreams.first() { - return first.as_str(); - } - negotiated - } - - async fn block_rate_limit(&self, ip: IpAddr) { - metrics::RATE_LIMIT_HITS.with_label_values(&["hit"]).inc(); - metrics::CONNECTIONS_TOTAL.with_label_values(&["blocked"]).inc(); - self.reputation.record_bad(ip); - if self.reputation.score(ip) < -40 { - let duration_secs = Duration::from_secs(self.config.ban.ban_duration_secs); - self.blacklist.add(ip, duration_secs, "low_reputation"); - self.xdp_ban(ip, duration_secs.as_secs()); - self.push_event("block", ip, "low_reputation").await; - tracing::info!("low reputation ban {ip}: rate-limit abuse"); - } - } - - fn xdp_ban(&self, ip: IpAddr, duration_secs: u64) { - let Some(xdp) = &self.xdp else { - return; - }; - let IpAddr::V4(ip_v4) = ip else { - return; - }; - match xdp.lock().expect("xdp lock poisoned").ban_ip(ip_v4, duration_secs) { - Ok(()) => tracing::debug!("xdp ban {ip_v4} for {duration_secs}s"), - Err(e) => tracing::warn!("xdp ban failed for {ip_v4}: {e}"), - } - } - - async fn push_event(&self, event_type: &str, ip: IpAddr, data_string: &str) { - let Some(writer) = &self.clickhouse else { - return; - }; - let event = ClickHouseEvent { - timestamp: chrono::Utc::now(), - event_type: event_type.to_string(), - ip: ip.to_string(), - data_float: 0.0, - data_int: 0, - data_string: data_string.to_string(), - }; - if let Err(e) = writer.lock().await.push(event).await { - tracing::debug!("clickhouse push error: {e}"); - } - } +/// Result of a connection attempt, retaining the verified client identity for +/// post-connection traffic accounting. +pub struct GatewayOutcome { + pub client_ip: Option, + pub result: anyhow::Result<()>, } diff --git a/src/engine/tunnel/gateway.rs b/src/engine/tunnel/gateway.rs new file mode 100644 index 0000000..49d69a4 --- /dev/null +++ b/src/engine/tunnel/gateway.rs @@ -0,0 +1,230 @@ +mod challenge; + +#[cfg(feature = "protocol-minecraft")] +use super::proxy; +use super::{Gateway, GatewayOutcome}; +use crate::config::Config; +use crate::engine::challenge::DifficultyAdjuster; +use crate::engine::subnet::tracker::SubnetTracker; +use crate::filter::blacklist::Blacklist; +use crate::filter::connection_limit::ConnectionLimiter; +use crate::filter::rate_limit::RateLimiter; +use crate::metrics; +use crate::protocol::ProtocolRegistry; +use crate::store::clickhouse::{ClickHouseEvent, ClickHouseWriter}; +use crate::traffic::reputation::IpReputation; +use crate::xdp::XdpFilter; +use std::collections::HashSet; +use std::net::IpAddr; +use std::sync::atomic::{AtomicU64, AtomicUsize, Ordering}; +use std::sync::{Arc, Mutex}; +use std::time::Duration; +use tokio::io::AsyncWriteExt; +use tokio::net::TcpStream; +use tokio::sync::Mutex as TokioMutex; + +impl Gateway { + #[allow(clippy::too_many_arguments)] + pub fn new( + config: Arc, + rate_limiter: Arc, + blacklist: Arc, + adjuster: Arc>, + whitelist: Arc>, + reputation: Arc, + xdp: Option>>, + clickhouse: Option>>, + allowed_1s: Arc, + registry: Arc, + subnet_tracker: Option>, + ) -> Self { + let max_connections = config.limits.max_connections_per_ip as usize; + Self { + config, + rate_limiter, + connection_limiter: ConnectionLimiter::new(max_connections), + blacklist, + adjuster, + whitelist, + reputation, + xdp, + clickhouse, + allowed_1s, + registry, + subnet_tracker, + upstream_cursor: AtomicUsize::new(0), + } + } + + /// Полный конвейер обработки входящего соединения. + /// + /// # Errors + /// Возвращает ошибку только при сбое ввода-вывода апстрима; блокировки + /// клиента ошибкой не считаются. + #[allow(unused_mut)] + pub async fn handle(&self, mut client: TcpStream, peer_addr: std::net::SocketAddr) -> GatewayOutcome { + let client_addr = if self.config.proxy_protocol.ingress_enabled { + #[cfg(feature = "protocol-minecraft")] + { + if !self + .config + .proxy_protocol + .trusted_cidrs + .iter() + .any(|cidr| cidr.contains(peer_addr.ip())) + { + return GatewayOutcome { + client_ip: None, + result: Err(anyhow::anyhow!("untrusted peer attempted inbound PROXY protocol")), + }; + } + match proxy::read_v2_header( + &mut client, + Duration::from_millis(self.config.proxy_protocol.ingress_timeout_ms), + self.config.proxy_protocol.max_header_bytes, + ) + .await + { + Ok(client_addr) => client_addr, + Err(error) => { + return GatewayOutcome { + client_ip: None, + result: Err(error), + }; + }, + } + } + #[cfg(not(feature = "protocol-minecraft"))] + { + return GatewayOutcome { + client_ip: None, + result: Err(anyhow::anyhow!("inbound PROXY protocol requires protocol-minecraft")), + }; + } + } else { + peer_addr + }; + let client_ip = client_addr.ip(); + let result = self.handle_client(client, peer_addr, client_addr).await; + GatewayOutcome { + client_ip: Some(client_ip), + result, + } + } + + async fn handle_client( + &self, + mut client: TcpStream, + peer_addr: std::net::SocketAddr, + client_addr: std::net::SocketAddr, + ) -> anyhow::Result<()> { + let peer_ip = client_addr.ip(); + + if let Some(tracker) = &self.subnet_tracker { + tracker.record_connection(peer_ip); + } + + if self.blacklist.is_blocked(peer_ip) { + metrics::CONNECTIONS_TOTAL.with_label_values(&["blocked"]).inc(); + return Ok(()); + } + + let Some(_connection_permit) = self.connection_limiter.try_acquire(peer_ip) else { + self.block_rate_limit(peer_ip).await; + return Ok(()); + }; + + if !self.pass_pow_gate(&mut client, peer_ip).await? { + return Ok(()); + } + + if !self.rate_limiter.check(peer_ip) { + self.block_rate_limit(peer_ip).await; + return Ok(()); + } + + let handler = self.registry.primary()?; + let handshake = match handler.handshake(&mut client).await { + Ok(handshake) => handshake, + Err(e) => { + tracing::debug!("handshake rejected from {peer_addr}: {e}"); + metrics::CONNECTIONS_TOTAL.with_label_values(&["blocked"]).inc(); + return Ok(()); + }, + }; + + metrics::CONNECTIONS_TOTAL.with_label_values(&["allowed"]).inc(); + self.allowed_1s.fetch_add(1, Ordering::Relaxed); + self.reputation.record_good(peer_ip); + + let mut backend = TcpStream::connect(self.next_upstream(&handshake.upstream.addr)).await?; + #[cfg(feature = "protocol-minecraft")] + if self.config.protocol.minecraft.enabled && self.config.protocol.minecraft.send_proxy_protocol { + let source = client_addr; + let destination = client.local_addr()?; + backend.write_all(&proxy::protocol_v2(source, destination)?).await?; + } + if !handshake.initial_backend_data.is_empty() { + backend.write_all(&handshake.initial_backend_data).await?; + } + tokio::io::copy_bidirectional(&mut client, &mut backend).await?; + Ok(()) + } + + fn next_upstream<'a>(&'a self, negotiated: &'a str) -> &'a str { + let upstreams = &self.config.backend.upstreams; + if upstreams.len() > 1 { + let idx = self.upstream_cursor.fetch_add(1, Ordering::Relaxed) % upstreams.len(); + return upstreams[idx].as_str(); + } + if let Some(first) = upstreams.first() { + return first.as_str(); + } + negotiated + } + + async fn block_rate_limit(&self, ip: IpAddr) { + metrics::RATE_LIMIT_HITS.with_label_values(&["hit"]).inc(); + metrics::CONNECTIONS_TOTAL.with_label_values(&["blocked"]).inc(); + self.reputation.record_bad(ip); + if self.reputation.score(ip) < -40 { + let duration_secs = Duration::from_secs(self.config.ban.ban_duration_secs); + self.blacklist.add(ip, duration_secs, "low_reputation"); + if !self.config.proxy_protocol.ingress_enabled { + self.xdp_ban(ip, duration_secs.as_secs()); + } + self.push_event("block", ip, "low_reputation").await; + tracing::info!("low reputation ban {ip}: rate-limit abuse"); + } + } + + fn xdp_ban(&self, ip: IpAddr, duration_secs: u64) { + let Some(xdp) = &self.xdp else { + return; + }; + let IpAddr::V4(ip_v4) = ip else { + return; + }; + match xdp.lock().expect("xdp lock poisoned").ban_ip(ip_v4, duration_secs) { + Ok(()) => tracing::debug!("xdp ban {ip_v4} for {duration_secs}s"), + Err(e) => tracing::warn!("xdp ban failed for {ip_v4}: {e}"), + } + } + + async fn push_event(&self, event_type: &str, ip: IpAddr, data_string: &str) { + let Some(writer) = &self.clickhouse else { + return; + }; + let event = ClickHouseEvent { + timestamp: chrono::Utc::now(), + event_type: event_type.to_string(), + ip: ip.to_string(), + data_float: 0.0, + data_int: 0, + data_string: data_string.to_string(), + }; + if let Err(e) = writer.lock().await.push(event).await { + tracing::debug!("clickhouse push error: {e}"); + } + } +} diff --git a/src/engine/tunnel/gateway/challenge.rs b/src/engine/tunnel/gateway/challenge.rs new file mode 100644 index 0000000..9ba76ea --- /dev/null +++ b/src/engine/tunnel/gateway/challenge.rs @@ -0,0 +1,34 @@ +use super::Gateway; +use crate::engine::challenge::enforce as enforce_pow; +use crate::metrics; +use std::net::IpAddr; +use tokio::net::TcpStream; + +impl Gateway { + pub(super) async fn pass_pow_gate(&self, client: &mut TcpStream, peer_ip: IpAddr) -> anyhow::Result { + let pow_config = &self.config.pow; + if !(pow_config.enabled && pow_config.difficulty > 0) { + return Ok(true); + } + if self.whitelist.contains(&peer_ip) { + metrics::POW_CHALLENGES_TOTAL.with_label_values(&["skipped"]).inc(); + metrics::POW_CURRENT_DIFFICULTY.set(pow_config.difficulty as i64); + return Ok(true); + } + + let diff = { + let mut adjuster = self.adjuster.lock().expect("adjuster lock poisoned"); + adjuster.record_connection(); + adjuster.current_difficulty() + }; + let result = enforce_pow(client, peer_ip, diff).await?; + if !result { + metrics::POW_CHALLENGES_TOTAL.with_label_values(&["failed"]).inc(); + tracing::debug!("pow: failed for {peer_ip}, dropping connection"); + return Ok(false); + } + metrics::POW_CHALLENGES_TOTAL.with_label_values(&["passed"]).inc(); + metrics::POW_CURRENT_DIFFICULTY.set(diff as i64); + Ok(true) + } +} diff --git a/src/engine/tunnel/proxy.rs b/src/engine/tunnel/proxy.rs new file mode 100644 index 0000000..c984f99 --- /dev/null +++ b/src/engine/tunnel/proxy.rs @@ -0,0 +1,40 @@ +use std::net::SocketAddr; + +mod inbound; +pub(super) use inbound::read_v2_header; + +/// Encodes a PROXY protocol v2 TCP header for the backend. +/// The backend must accept connections only from trusted Rampart nodes. +pub(super) fn protocol_v2(source: SocketAddr, destination: SocketAddr) -> anyhow::Result> { + const SIGNATURE: [u8; 12] = *b"\r\n\r\n\0\r\nQUIT\n"; + if source.is_ipv4() != destination.is_ipv4() { + anyhow::bail!("PROXY protocol source/destination address families differ"); + } + + let (family, address_len) = if source.is_ipv4() { + (0x11, 12usize) + } else { + (0x21, 36usize) + }; + let mut header = Vec::with_capacity(16 + address_len); + header.extend_from_slice(&SIGNATURE); + header.push(0x21); + header.push(family); + header.extend_from_slice(&(address_len as u16).to_be_bytes()); + match (source, destination) { + (SocketAddr::V4(src), SocketAddr::V4(dst)) => { + header.extend_from_slice(&src.ip().octets()); + header.extend_from_slice(&dst.ip().octets()); + header.extend_from_slice(&src.port().to_be_bytes()); + header.extend_from_slice(&dst.port().to_be_bytes()); + }, + (SocketAddr::V6(src), SocketAddr::V6(dst)) => { + header.extend_from_slice(&src.ip().octets()); + header.extend_from_slice(&dst.ip().octets()); + header.extend_from_slice(&src.port().to_be_bytes()); + header.extend_from_slice(&dst.port().to_be_bytes()); + }, + _ => anyhow::bail!("PROXY protocol source/destination address families differ"), + } + Ok(header) +} diff --git a/src/engine/tunnel/proxy/inbound.rs b/src/engine/tunnel/proxy/inbound.rs new file mode 100644 index 0000000..4638285 --- /dev/null +++ b/src/engine/tunnel/proxy/inbound.rs @@ -0,0 +1,70 @@ +//! Strict, bounded parser for trusted inbound PROXY protocol v2 headers. + +use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6}; +use std::time::Duration; +use tokio::io::AsyncReadExt; +use tokio::net::TcpStream; + +const SIGNATURE: [u8; 12] = *b"\r\n\r\n\0\r\nQUIT\n"; +const FIXED_HEADER_BYTES: usize = 16; + +pub(crate) async fn read_v2_header( + stream: &mut TcpStream, + timeout: Duration, + max_header_bytes: usize, +) -> anyhow::Result { + tokio::time::timeout(timeout, read_v2_header_inner(stream, max_header_bytes)) + .await + .map_err(|_| anyhow::anyhow!("timed out reading inbound PROXY v2 header"))? +} + +async fn read_v2_header_inner(stream: &mut TcpStream, max_header_bytes: usize) -> anyhow::Result { + let mut fixed = [0u8; FIXED_HEADER_BYTES]; + stream.read_exact(&mut fixed).await?; + + if fixed[..12] != SIGNATURE { + anyhow::bail!("invalid inbound PROXY protocol signature"); + } + if fixed[12] != 0x21 { + anyhow::bail!("inbound PROXY protocol requires version 2 PROXY command"); + } + + let payload_len = usize::from(u16::from_be_bytes([fixed[14], fixed[15]])); + let total_len = FIXED_HEADER_BYTES + .checked_add(payload_len) + .ok_or_else(|| anyhow::anyhow!("inbound PROXY header length overflow"))?; + if total_len > max_header_bytes { + anyhow::bail!("inbound PROXY header exceeds configured limit"); + } + + let address_len = match fixed[13] { + 0x11 => 12, + 0x21 => 36, + family => anyhow::bail!("unsupported inbound PROXY address family/protocol 0x{family:02x}"), + }; + if payload_len < address_len { + anyhow::bail!("inbound PROXY header is shorter than its address block"); + } + if payload_len != address_len { + anyhow::bail!("inbound PROXY v2 TLVs are not supported"); + } + + let mut payload = vec![0u8; payload_len]; + stream.read_exact(&mut payload).await?; + match fixed[13] { + 0x11 => { + let source = Ipv4Addr::new(payload[0], payload[1], payload[2], payload[3]); + let port = u16::from_be_bytes([payload[8], payload[9]]); + Ok(SocketAddr::V4(SocketAddrV4::new(source, port))) + }, + 0x21 => { + let source_bytes: [u8; 16] = payload[..16] + .try_into() + .map_err(|_| anyhow::anyhow!("invalid inbound PROXY IPv6 source address"))?; + let source = Ipv6Addr::from(source_bytes); + let port = u16::from_be_bytes([payload[32], payload[33]]); + Ok(SocketAddr::V6(SocketAddrV6::new(source, port, 0, 0))) + }, + family => anyhow::bail!("unsupported inbound PROXY address family/protocol 0x{family:02x}"), + } +} diff --git a/src/filter/blacklist.rs b/src/filter/blacklist.rs index ff17d8a..2ac1f14 100644 --- a/src/filter/blacklist.rs +++ b/src/filter/blacklist.rs @@ -10,6 +10,7 @@ struct BanEntry { pub struct Blacklist { entries: Arc>, + redis_entries: Arc>, } impl Default for Blacklist { @@ -22,18 +23,12 @@ impl Blacklist { pub fn new() -> Self { Self { entries: Arc::new(DashMap::new()), + redis_entries: Arc::new(DashMap::new()), } } pub fn is_blocked(&self, ip: IpAddr) -> bool { - if let Some(entry) = self.entries.get(&ip) { - if entry.expires > Instant::now() { - return true; - } - drop(entry); - self.entries.remove(&ip); - } - false + Self::is_blocked_in(&self.entries, ip) || Self::is_blocked_in(&self.redis_entries, ip) } pub fn add(&self, ip: IpAddr, duration: Duration, reason: &str) { @@ -50,16 +45,53 @@ impl Blacklist { self.entries.remove(&ip); } + pub fn add_redis(&self, ip: IpAddr, duration: Duration, reason: &str) { + self.redis_entries.insert( + ip, + BanEntry { + expires: Instant::now() + duration, + _reason: reason.to_string(), + }, + ); + } + + pub fn remove_redis(&self, ip: IpAddr) { + self.redis_entries.remove(&ip); + } + + /// Replace Redis-managed bans while preserving local detector bans. + pub fn replace_redis(&self, entries: I) + where + I: IntoIterator, + { + self.redis_entries.clear(); + for (ip, duration, reason) in entries { + self.add_redis(ip, duration, &reason); + } + } + pub fn len(&self) -> usize { - self.entries.len() + self.entries.len() + self.redis_entries.len() } pub fn is_empty(&self) -> bool { - self.entries.is_empty() + self.entries.is_empty() && self.redis_entries.is_empty() } pub fn clear_expired(&self) { self.entries.retain(|_, entry| entry.expires > Instant::now()); + self.redis_entries.retain(|_, entry| entry.expires > Instant::now()); + } + + fn is_blocked_in(entries: &DashMap, ip: IpAddr) -> bool { + if let Some(entry) = entries.get(&ip) { + if entry.expires > Instant::now() { + return true; + } + drop(entry); + entries.remove(&ip); + } + false } } diff --git a/src/filter/connection_limit/mod.rs b/src/filter/connection_limit/mod.rs new file mode 100644 index 0000000..bf07117 --- /dev/null +++ b/src/filter/connection_limit/mod.rs @@ -0,0 +1,59 @@ +use dashmap::DashMap; +use std::net::IpAddr; +use std::sync::Arc; +use std::sync::atomic::{AtomicUsize, Ordering}; + +/// Caps simultaneous in-flight connections per source IP. +pub struct ConnectionLimiter { + counts: Arc>>, + limit: usize, +} + +impl ConnectionLimiter { + #[must_use] + pub fn new(limit: usize) -> Self { + Self { + counts: Arc::new(DashMap::new()), + limit: limit.max(1), + } + } + + pub fn try_acquire(&self, ip: IpAddr) -> Option { + let entry = self.counts.entry(ip).or_insert_with(|| Arc::new(AtomicUsize::new(0))); + let count = Arc::clone(entry.value()); + let current = count.fetch_add(1, Ordering::AcqRel); + drop(entry); + if current >= self.limit { + count.fetch_sub(1, Ordering::AcqRel); + self.remove_if_idle(ip, &count); + return None; + } + Some(ConnectionPermit { + ip, + count, + counts: Arc::clone(&self.counts), + }) + } + + fn remove_if_idle(&self, ip: IpAddr, count: &Arc) { + self.counts.remove_if(&ip, |_, current| { + Arc::ptr_eq(current, count) && current.load(Ordering::Acquire) == 0 + }); + } +} + +pub struct ConnectionPermit { + ip: IpAddr, + count: Arc, + counts: Arc>>, +} + +impl Drop for ConnectionPermit { + fn drop(&mut self) { + if self.count.fetch_sub(1, Ordering::AcqRel) == 1 { + self.counts.remove_if(&self.ip, |_, current| { + Arc::ptr_eq(current, &self.count) && current.load(Ordering::Acquire) == 0 + }); + } + } +} diff --git a/src/filter/mod.rs b/src/filter/mod.rs index 0a5432c..050eab2 100644 --- a/src/filter/mod.rs +++ b/src/filter/mod.rs @@ -1,5 +1,6 @@ //! Фильтры входящего трафика. pub mod blacklist; +pub mod connection_limit; pub mod geo; pub mod rate_limit; diff --git a/src/manager/api/blacklist.rs b/src/manager/api/blacklist.rs index c22c708..2f02bee 100644 --- a/src/manager/api/blacklist.rs +++ b/src/manager/api/blacklist.rs @@ -1,10 +1,4 @@ -#[cfg(feature = "store-redis")] -use crate::manager::AppState; -#[cfg(feature = "store-redis")] -use axum::{Json, extract::State}; use serde::{Deserialize, Serialize}; -#[cfg(feature = "store-redis")] -use std::sync::Arc; #[derive(Debug, Serialize, Deserialize)] pub struct BlacklistEntry { @@ -32,68 +26,19 @@ pub struct AddBlacklistRequest { pub duration_secs: Option, } -#[cfg(feature = "store-redis")] -pub async fn list_blacklist(State(state): State>) -> Json { - let mut conn = match state.redis_client.get_multiplexed_async_connection().await { - Ok(c) => c, - Err(_) => { - return Json(BlacklistResponse { - items: vec![], - total: 0, - }); - }, - }; - - let members: Vec = match redis::cmd("SMEMBERS") - .arg("rampart:blacklist") - .query_async(&mut conn) - .await - { - Ok(m) => m, - Err(_) => { - return Json(BlacklistResponse { - items: vec![], - total: 0, - }); - }, - }; - - let items: Vec = members - .into_iter() - .map(|target| BlacklistEntry { - target, - entry_type: "ip".to_string(), - reason: "manual".to_string(), - created_at: chrono::Utc::now().to_rfc3339(), - expires_at: None, - }) - .collect(); - - let total = items.len(); - Json(BlacklistResponse { items, total }) +#[derive(Deserialize)] +pub struct RemoveBlacklistRequest { + pub target: String, } #[cfg(feature = "store-redis")] -pub async fn add_blacklist( - State(state): State>, - Json(req): Json, -) -> Json { - let mut conn = match state.redis_client.get_multiplexed_async_connection().await { - Ok(c) => c, - Err(_) => return Json(serde_json::json!({"error": "redis unavailable"})), - }; +mod common; +#[cfg(feature = "store-redis")] +mod list; +#[cfg(feature = "store-redis")] +mod mutate; - let _: () = redis::cmd("SADD") - .arg("rampart:blacklist") - .arg(&req.target) - .query_async(&mut conn) - .await - .unwrap_or_default(); - tracing::info!("Added to blacklist: {} ({})", req.target, req.reason); - - Json(serde_json::json!({ - "status": "added", - "target": req.target, - "reason": req.reason - })) -} +#[cfg(feature = "store-redis")] +pub use list::list_blacklist; +#[cfg(feature = "store-redis")] +pub use mutate::{add_blacklist, remove_blacklist}; diff --git a/src/manager/api/blacklist/common.rs b/src/manager/api/blacklist/common.rs new file mode 100644 index 0000000..16b72e6 --- /dev/null +++ b/src/manager/api/blacklist/common.rs @@ -0,0 +1,75 @@ +use axum::{Json, http::StatusCode}; +use serde::{Deserialize, Serialize}; + +#[derive(Serialize)] +pub(super) struct BlacklistEvent<'a> { + ip: &'a str, + action: &'a str, + duration_secs: u64, + #[serde(skip_serializing_if = "Option::is_none")] + expires_at_unix: Option, +} + +#[derive(Clone, Debug, Serialize, Deserialize)] +pub(super) struct BlacklistMetadata { + pub created_at_unix: i64, + pub expires_at_unix: i64, + pub reason: String, +} + +pub(super) const BLACKLIST_KEY: &str = "rampart:blacklist"; +pub(super) const BLACKLIST_METADATA_KEY: &str = "rampart:blacklist:metadata"; +pub(super) const BLACKLIST_CHANNEL: &str = "rampart:blacklist:events"; +pub(super) const DEFAULT_BAN_DURATION_SECS: u64 = 300; +pub(super) const LEGACY_BAN_DURATION_SECS: u64 = 300; +pub(super) const MAX_BAN_DURATION_SECS: u64 = 31_536_000; +pub(super) const ADD_BAN_SCRIPT: &str = "redis.call('HSET', KEYS[2], ARGV[1], ARGV[2]); redis.call('SADD', KEYS[1], ARGV[1]); redis.call('PUBLISH', KEYS[3], ARGV[3]); return 1"; +pub(super) const REMOVE_BAN_SCRIPT: &str = "redis.call('SREM', KEYS[1], ARGV[1]); redis.call('HDEL', KEYS[2], ARGV[1]); redis.call('PUBLISH', KEYS[3], ARGV[2]); return 1"; + +pub(super) fn legacy_metadata(now: i64) -> BlacklistMetadata { + BlacklistMetadata { + created_at_unix: now, + expires_at_unix: now.saturating_add(LEGACY_BAN_DURATION_SECS as i64), + reason: "legacy_unverified".to_string(), + } +} + +pub(super) fn format_timestamp(timestamp: i64) -> String { + chrono::DateTime::from_timestamp(timestamp, 0) + .map(|value| value.to_rfc3339()) + .unwrap_or_else(|| chrono::Utc::now().to_rfc3339()) +} + +pub(super) fn event_payload( + ip: &str, + action: &str, + duration_secs: u64, + expires_at_unix: Option, +) -> Result)> { + serde_json::to_string(&BlacklistEvent { + ip, + action, + duration_secs, + expires_at_unix, + }) + .map_err(|_| api_error(StatusCode::INTERNAL_SERVER_ERROR, "failed to serialize blacklist event")) +} + +pub(super) fn parse_ip(target: &str) -> Result)> { + target + .parse() + .map_err(|_| api_error(StatusCode::BAD_REQUEST, "target must be an IP address")) +} + +pub(super) fn api_error(status: StatusCode, message: &str) -> (StatusCode, Json) { + (status, Json(serde_json::json!({"error": message}))) +} + +pub(super) fn redis_unavailable(_: redis::RedisError) -> (StatusCode, Json) { + api_error(StatusCode::SERVICE_UNAVAILABLE, "redis unavailable") +} + +pub(super) fn redis_error(error: redis::RedisError) -> (StatusCode, Json) { + tracing::error!("Blacklist Redis operation failed: {error}"); + api_error(StatusCode::SERVICE_UNAVAILABLE, "redis operation failed") +} diff --git a/src/manager/api/blacklist/list.rs b/src/manager/api/blacklist/list.rs new file mode 100644 index 0000000..3120764 --- /dev/null +++ b/src/manager/api/blacklist/list.rs @@ -0,0 +1,79 @@ +use super::common::{ + BLACKLIST_KEY, BLACKLIST_METADATA_KEY, BlacklistMetadata, format_timestamp, legacy_metadata, redis_error, + redis_unavailable, +}; +use super::{BlacklistEntry, BlacklistResponse}; +use crate::manager::AppState; +use axum::{Json, extract::State, http::StatusCode}; +use redis::AsyncCommands; +use std::collections::HashMap; +use std::sync::Arc; + +pub async fn list_blacklist( + State(state): State>, +) -> Result, (StatusCode, Json)> { + let mut conn = state + .redis_client + .get_multiplexed_async_connection() + .await + .map_err(redis_unavailable)?; + let members: Vec = redis::cmd("SMEMBERS") + .arg(BLACKLIST_KEY) + .query_async(&mut conn) + .await + .map_err(redis_error)?; + let metadata: HashMap = conn.hgetall(BLACKLIST_METADATA_KEY).await.map_err(redis_error)?; + let now = chrono::Utc::now().timestamp(); + let mut items = Vec::with_capacity(members.len()); + + for target in members { + let Ok(ip) = target.parse::() else { + continue; + }; + let record = match metadata.get(&target) { + Some(encoded) => match serde_json::from_str::(encoded) { + Ok(record) => record, + Err(_) => continue, + }, + None => { + let legacy = legacy_metadata(now); + let encoded = serde_json::to_string(&legacy).map_err(|_| { + super::common::api_error(StatusCode::INTERNAL_SERVER_ERROR, "failed to encode blacklist metadata") + })?; + let inserted: i64 = redis::cmd("HSETNX") + .arg(BLACKLIST_METADATA_KEY) + .arg(&target) + .arg(encoded) + .query_async(&mut conn) + .await + .map_err(redis_error)?; + if inserted == 1 { + legacy + } else { + let current: Option = + conn.hget(BLACKLIST_METADATA_KEY, &target).await.map_err(redis_error)?; + match current.and_then(|value| serde_json::from_str(&value).ok()) { + Some(record) => record, + None => continue, + } + } + }, + }; + if record.expires_at_unix <= now + || chrono::DateTime::from_timestamp(record.created_at_unix, 0).is_none() + || chrono::DateTime::from_timestamp(record.expires_at_unix, 0).is_none() + { + continue; + } + items.push(BlacklistEntry { + target: ip.to_string(), + entry_type: "ip".to_string(), + reason: record.reason, + created_at: format_timestamp(record.created_at_unix), + expires_at: Some(format_timestamp(record.expires_at_unix)), + }); + } + + let total = items.len(); + Ok(Json(BlacklistResponse { items, total })) +} diff --git a/src/manager/api/blacklist/mutate.rs b/src/manager/api/blacklist/mutate.rs new file mode 100644 index 0000000..a3244a7 --- /dev/null +++ b/src/manager/api/blacklist/mutate.rs @@ -0,0 +1,98 @@ +use super::common::{ + ADD_BAN_SCRIPT, BLACKLIST_CHANNEL, BLACKLIST_KEY, BLACKLIST_METADATA_KEY, DEFAULT_BAN_DURATION_SECS, + MAX_BAN_DURATION_SECS, REMOVE_BAN_SCRIPT, api_error, event_payload, parse_ip, redis_error, redis_unavailable, +}; +use super::{AddBlacklistRequest, RemoveBlacklistRequest}; +use crate::manager::AppState; +use axum::{Json, extract::State, http::StatusCode}; +use std::sync::Arc; + +pub async fn add_blacklist( + State(state): State>, + Json(req): Json, +) -> Result, (StatusCode, Json)> { + let ip = parse_ip(&req.target)?; + if req.entry_type != "ip" { + return Err(api_error( + StatusCode::BAD_REQUEST, + "only IP blacklist entries are supported", + )); + } + let duration_secs = req.duration_secs.unwrap_or(DEFAULT_BAN_DURATION_SECS); + if duration_secs == 0 { + return Err(api_error( + StatusCode::BAD_REQUEST, + "duration_secs must be greater than zero", + )); + } + if duration_secs > MAX_BAN_DURATION_SECS { + return Err(api_error( + StatusCode::BAD_REQUEST, + "duration_secs must not exceed one year", + )); + } + + let target = ip.to_string(); + let created_at_unix = chrono::Utc::now().timestamp(); + let metadata = super::common::BlacklistMetadata { + created_at_unix, + expires_at_unix: created_at_unix + duration_secs as i64, + reason: req.reason.clone(), + }; + let encoded_metadata = serde_json::to_string(&metadata) + .map_err(|_| api_error(StatusCode::INTERNAL_SERVER_ERROR, "failed to encode blacklist metadata"))?; + let event = event_payload(&target, "ban", duration_secs, Some(metadata.expires_at_unix))?; + let mut conn = state + .redis_client + .get_multiplexed_async_connection() + .await + .map_err(redis_unavailable)?; + let _: i64 = redis::cmd("EVAL") + .arg(ADD_BAN_SCRIPT) + .arg(3) + .arg(BLACKLIST_KEY) + .arg(BLACKLIST_METADATA_KEY) + .arg(BLACKLIST_CHANNEL) + .arg(&target) + .arg(encoded_metadata) + .arg(event) + .query_async(&mut conn) + .await + .map_err(redis_error)?; + + tracing::info!("Added to blacklist: {} ({})", target, req.reason); + Ok(Json(serde_json::json!({ + "status": "added", + "target": target, + "reason": req.reason, + "duration_secs": duration_secs + }))) +} + +pub async fn remove_blacklist( + State(state): State>, + Json(req): Json, +) -> Result, (StatusCode, Json)> { + let ip = parse_ip(&req.target)?; + let target = ip.to_string(); + let event = event_payload(&target, "unban", 0, None)?; + let mut conn = state + .redis_client + .get_multiplexed_async_connection() + .await + .map_err(redis_unavailable)?; + let _: i64 = redis::cmd("EVAL") + .arg(REMOVE_BAN_SCRIPT) + .arg(3) + .arg(BLACKLIST_KEY) + .arg(BLACKLIST_METADATA_KEY) + .arg(BLACKLIST_CHANNEL) + .arg(&target) + .arg(event) + .query_async(&mut conn) + .await + .map_err(redis_error)?; + + tracing::info!("Removed from blacklist: {target}"); + Ok(Json(serde_json::json!({"status": "removed", "target": target}))) +} diff --git a/src/manager/auth.rs b/src/manager/auth.rs index 8fdd743..6b972ef 100644 --- a/src/manager/auth.rs +++ b/src/manager/auth.rs @@ -1,5 +1,6 @@ use axum::Json; use axum::body::Body; +use axum::extract::State; use axum::http::{Request, StatusCode}; use axum::middleware::Next; use axum::response::Response; @@ -36,6 +37,7 @@ pub fn verify_token(token: &str, secret: &str, audience: &str) -> Result>, request: Request, next: Next, ) -> Result)> { @@ -55,16 +57,6 @@ pub async fn auth_middleware( }, }; - let state = match request.extensions().get::>() { - Some(s) => s, - None => { - return Err(( - StatusCode::INTERNAL_SERVER_ERROR, - Json(serde_json::json!({"error": "internal error"})), - )); - }, - }; - if verify_token(token, &state.jwt_secret, &state.jwt_audience).is_err() { return Err(( StatusCode::UNAUTHORIZED, diff --git a/src/manager/sync/heartbeat.rs b/src/manager/sync/heartbeat.rs index 773f689..f369bd6 100644 --- a/src/manager/sync/heartbeat.rs +++ b/src/manager/sync/heartbeat.rs @@ -59,7 +59,7 @@ async fn collect_node_keys(conn: &mut redis::aio::MultiplexedConnection) -> anyh let mut iter = conn.scan_options::(opts).await?; let mut keys = Vec::new(); while let Some(key) = iter.next().await { - keys.push(key); + keys.push(key?); } Ok(keys) } diff --git a/src/protocol/http/mod.rs b/src/protocol/http/mod.rs index 94cfa0e..35751d9 100644 --- a/src/protocol/http/mod.rs +++ b/src/protocol/http/mod.rs @@ -3,16 +3,16 @@ //! Первый plugin-реализаций [`ProtocolHandler`]: читает request-head //! постепенно (TCP приходит фрагментами), проверяет его по политике из //! секции `[protocol.http]` и возвращает upstream для туннелирования. -//! Голова читается через `peek`, чтобы байты остались в сокете и движок -//! проксировал запрос на backend без потерь. +//! Прочитанная голова передаётся upstream как начальные байты туннеля. mod parser; use crate::config::HttpProtocolConfig; -use crate::protocol::{ProtocolHandler, Upstream}; +use crate::protocol::{HandshakeResult, ProtocolHandler, Upstream}; use std::future::Future; use std::pin::Pin; use std::time::Duration; +use tokio::io::AsyncReadExt; use tokio::net::TcpStream; /// Обработчик HTTP/1.1: verdict Allow → tunnel на upstream, Reject → drop. @@ -37,31 +37,27 @@ impl HttpProtocolHandler { } } - /// Накапливает request-head через `peek` до терминатора или лимита. + /// Накапливает request-head без повторного чтения одного и того же префикса. /// /// # Errors /// Таймаут, закрытие клиента, превышение `max_header_bytes` или ошибка I/O. - async fn read_head(&self, stream: &TcpStream) -> anyhow::Result> { + async fn read_head(&self, stream: &mut TcpStream) -> anyhow::Result> { let limit = self.policy.max_header_bytes; if limit == 0 { anyhow::bail!("protocol.http.max_header_bytes must be positive"); } - let mut buf = vec![0u8; limit]; - let mut len = 0usize; + let mut buf = Vec::with_capacity(limit); let accumulate = async { loop { - if let Some(head_len) = parser::scan_head(&buf[..len]) { - buf.truncate(head_len); + if parser::scan_head(&buf).is_some() { return Ok(buf); } - if len >= limit { + if buf.len() >= limit { anyhow::bail!("request head exceeds {limit} bytes"); } - let n = stream.peek(&mut buf[len..]).await?; - if n == 0 { - anyhow::bail!("client closed connection before head was complete"); - } - len += n; + let mut byte = [0u8; 1]; + stream.read_exact(&mut byte).await?; + buf.push(byte[0]); } }; match tokio::time::timeout(self.timeout, accumulate).await { @@ -79,11 +75,14 @@ impl ProtocolHandler for HttpProtocolHandler { fn handshake<'a>( &'a self, stream: &'a mut TcpStream, - ) -> Pin> + Send + 'a>> { + ) -> Pin> + Send + 'a>> { Box::pin(async move { let head = self.read_head(stream).await?; match parser::evaluate(&head, &self.policy) { - parser::Verdict::Allow { .. } => Ok(Upstream::new(self.upstream.clone())), + parser::Verdict::Allow { .. } => Ok(HandshakeResult::with_initial_data( + Upstream::new(self.upstream.clone()), + head, + )), parser::Verdict::Reject { reason } => Err(anyhow::anyhow!("http: {reason}")), } }) @@ -104,9 +103,9 @@ mod tests { let client = tokio::net::TcpStream::connect(listener.local_addr().expect("addr")) .await .expect("connect"); - let (server, _) = listener.accept().await.expect("accept"); + let (mut server, _) = listener.accept().await.expect("accept"); drop(listener); - assert!(handler.read_head(&server).await.is_err()); + assert!(handler.read_head(&mut server).await.is_err()); drop(client); } } diff --git a/src/protocol/minecraft/mod.rs b/src/protocol/minecraft/mod.rs new file mode 100644 index 0000000..d75fb6c --- /dev/null +++ b/src/protocol/minecraft/mod.rs @@ -0,0 +1,85 @@ +//! Minecraft Java TCP handshake validation (feature `protocol-minecraft`). + +mod parser; + +use crate::config::MinecraftProtocolConfig; +use crate::protocol::{HandshakeResult, ProtocolHandler, Upstream}; +use std::future::Future; +use std::pin::Pin; +use std::time::Duration; +use tokio::io::AsyncReadExt; +use tokio::net::TcpStream; + +pub struct MinecraftProtocolHandler { + upstream: String, + max_frame_bytes: usize, + timeout: Duration, +} + +impl MinecraftProtocolHandler { + #[must_use] + pub fn new(config: &MinecraftProtocolConfig, upstreams: &[String]) -> Self { + Self { + // Config validation requires exactly one backend when this handler is enabled. + upstream: upstreams.first().cloned().unwrap_or_default(), + max_frame_bytes: config.max_frame_bytes, + timeout: Duration::from_secs(config.timeout_secs), + } + } + + async fn read_handshake(&self, stream: &mut TcpStream) -> anyhow::Result> { + let mut frame = Vec::with_capacity(64); + let mut frame_len = 0usize; + for index in 0..5 { + let mut byte = [0u8; 1]; + stream.read_exact(&mut byte).await?; + frame.push(byte[0]); + if index == 4 && byte[0] & 0xf0 != 0 { + anyhow::bail!("Minecraft frame length VarInt exceeds 32 bits"); + } + if byte[0] & 0x80 == 0 { + let (decoded, prefix_len) = parser::decode_frame_length(&frame)?; + frame_len = decoded; + if frame_len == 0 || frame_len > self.max_frame_bytes { + anyhow::bail!("Minecraft handshake frame length {frame_len} is outside allowed range"); + } + if prefix_len != frame.len() { + anyhow::bail!("invalid Minecraft frame length prefix"); + } + break; + } + if index == 4 { + anyhow::bail!("Minecraft frame length VarInt exceeds five bytes"); + } + } + if frame_len == 0 { + anyhow::bail!("invalid empty Minecraft handshake frame"); + } + let prefix_len = frame.len(); + frame.resize(prefix_len + frame_len, 0); + stream.read_exact(&mut frame[prefix_len..]).await?; + parser::parse_frame(&frame, self.max_frame_bytes)?; + Ok(frame) + } +} + +impl ProtocolHandler for MinecraftProtocolHandler { + fn name(&self) -> &'static str { + "minecraft" + } + + fn handshake<'a>( + &'a self, + stream: &'a mut TcpStream, + ) -> Pin> + Send + 'a>> { + Box::pin(async move { + let frame = tokio::time::timeout(self.timeout, self.read_handshake(stream)) + .await + .map_err(|_| anyhow::anyhow!("timed out reading Minecraft handshake"))??; + Ok(HandshakeResult::with_initial_data( + Upstream::new(self.upstream.clone()), + frame, + )) + }) + } +} diff --git a/src/protocol/minecraft/parser.rs b/src/protocol/minecraft/parser.rs new file mode 100644 index 0000000..38a6177 --- /dev/null +++ b/src/protocol/minecraft/parser.rs @@ -0,0 +1,94 @@ +//! Bounded parser for the Minecraft Java handshake packet. + +const HANDSHAKE_PACKET_ID: i32 = 0; +const MAX_VARINT_BYTES: usize = 5; +const MAX_HOST_BYTES: usize = 255; + +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub(super) enum NextState { + Status, + Login, +} + +pub(super) fn decode_frame_length(prefix: &[u8]) -> anyhow::Result<(usize, usize)> { + let (length, bytes_read) = decode_varint(prefix, 0)?; + let length = usize::try_from(length).map_err(|_| anyhow::anyhow!("negative frame length"))?; + Ok((length, bytes_read)) +} + +/// Validates a complete length-prefixed handshake frame and returns its state. +pub(super) fn parse_frame(frame: &[u8], max_frame_bytes: usize) -> anyhow::Result { + let (frame_len, prefix_len) = decode_varint(frame, 0)?; + let frame_len = usize::try_from(frame_len).map_err(|_| anyhow::anyhow!("negative frame length"))?; + if frame_len == 0 || frame_len > max_frame_bytes { + anyhow::bail!("Minecraft handshake frame length {frame_len} is outside allowed range"); + } + if frame.len() != prefix_len + frame_len { + anyhow::bail!("Minecraft handshake frame length does not match packet"); + } + + let body = &frame[prefix_len..]; + let (packet_id, mut cursor) = decode_varint(body, 0)?; + if packet_id != HANDSHAKE_PACKET_ID { + anyhow::bail!("unexpected Minecraft packet id {packet_id} in handshake state"); + } + + let (protocol_version, next) = decode_varint(body, cursor)?; + if protocol_version < 0 { + anyhow::bail!("Minecraft protocol version must be non-negative"); + } + cursor = next; + + let (host_len, next) = decode_varint(body, cursor)?; + let host_len = usize::try_from(host_len).map_err(|_| anyhow::anyhow!("negative host length"))?; + if host_len == 0 || host_len > MAX_HOST_BYTES { + anyhow::bail!("Minecraft handshake hostname length is outside allowed range"); + } + cursor = next; + let host_end = cursor + .checked_add(host_len) + .ok_or_else(|| anyhow::anyhow!("hostname length overflow"))?; + let host_bytes = body + .get(cursor..host_end) + .ok_or_else(|| anyhow::anyhow!("truncated Minecraft handshake hostname"))?; + std::str::from_utf8(host_bytes).map_err(|_| anyhow::anyhow!("Minecraft handshake hostname is not UTF-8"))?; + cursor = host_end; + + let port_end = cursor + .checked_add(2) + .ok_or_else(|| anyhow::anyhow!("port length overflow"))?; + if body.get(cursor..port_end).is_none() { + anyhow::bail!("truncated Minecraft handshake port"); + } + cursor = port_end; + + let (state, next) = decode_varint(body, cursor)?; + cursor = next; + if cursor != body.len() { + anyhow::bail!("unexpected trailing bytes in Minecraft handshake"); + } + + match state { + 1 => Ok(NextState::Status), + 2 => Ok(NextState::Login), + _ => anyhow::bail!("unsupported Minecraft next state {state}; expected status or login"), + } +} + +/// Decodes signed Minecraft VarInt from a packet, returning value and next offset. +fn decode_varint(bytes: &[u8], start: usize) -> anyhow::Result<(i32, usize)> { + let mut value = 0u32; + for index in 0..MAX_VARINT_BYTES { + let byte = *bytes + .get(start + index) + .ok_or_else(|| anyhow::anyhow!("truncated Minecraft VarInt"))?; + if index == 4 && byte & 0xf0 != 0 { + anyhow::bail!("Minecraft VarInt exceeds 32 bits"); + } + value |= u32::from(byte & 0x7f) << (index * 7); + if byte & 0x80 == 0 { + return Ok((value as i32, start + index + 1)); + } + } + anyhow::bail!("Minecraft VarInt exceeds five bytes") +} diff --git a/src/protocol/mod.rs b/src/protocol/mod.rs index 1dc82f5..6eb0a1a 100644 --- a/src/protocol/mod.rs +++ b/src/protocol/mod.rs @@ -1,5 +1,7 @@ #[cfg(feature = "protocol-http")] pub mod http; +#[cfg(feature = "protocol-minecraft")] +pub mod minecraft; use std::future::Future; use std::pin::Pin; @@ -19,6 +21,30 @@ impl Upstream { } } +#[derive(Debug, Clone, PartialEq, Eq)] +pub struct HandshakeResult { + pub upstream: Upstream, + pub initial_backend_data: Vec, +} + +impl HandshakeResult { + #[must_use] + pub fn new(upstream: Upstream) -> Self { + Self { + upstream, + initial_backend_data: Vec::new(), + } + } + + #[must_use] + pub fn with_initial_data(upstream: Upstream, initial_backend_data: Vec) -> Self { + Self { + upstream, + initial_backend_data, + } + } +} + /// Точка расширения платформы: реализация для конкретного L7-протокола. /// /// Контракт минимальный: обработчик проводит handshake с клиентом @@ -39,7 +65,7 @@ pub trait ProtocolHandler: Send + Sync { fn handshake<'a>( &'a self, stream: &'a mut TcpStream, - ) -> Pin> + Send + 'a>>; + ) -> Pin> + Send + 'a>>; } /// Реестр скомпилированных протокольных обработчиков. @@ -108,8 +134,8 @@ mod tests { fn handshake<'a>( &'a self, _stream: &'a mut TcpStream, - ) -> Pin> + Send + 'a>> { - Box::pin(async { Ok(Upstream::new("127.0.0.1:9000")) }) + ) -> Pin> + Send + 'a>> { + Box::pin(async { Ok(HandshakeResult::new(Upstream::new("127.0.0.1:9000"))) }) } } diff --git a/src/store/redis.rs b/src/store/redis.rs index 6b4abc4..18a3af7 100644 --- a/src/store/redis.rs +++ b/src/store/redis.rs @@ -1,29 +1,13 @@ -use crate::filter::blacklist::Blacklist; use crate::store::StateStore; -use futures::StreamExt; use redis::AsyncCommands; -use redis::Msg; -use serde::Deserialize; -use std::sync::Arc; -use std::time::Duration; -use tokio::sync::watch; + +mod sync; +pub use sync::start_blacklist_sync; pub struct RedisStore { client: redis::Client, } -#[derive(Deserialize)] -struct BlacklistEvent { - ip: String, - action: String, - #[serde(default = "default_duration")] - duration_secs: u64, -} - -fn default_duration() -> u64 { - 300 -} - impl RedisStore { pub fn new(url: &str) -> anyhow::Result { let client = redis::Client::open(url)?; @@ -31,140 +15,6 @@ impl RedisStore { } } -const BLACKLIST_CHANNEL: &str = "rampart:blacklist:events"; -const BACKOFF_MIN: Duration = Duration::from_secs(1); -const BACKOFF_MAX: Duration = Duration::from_secs(30); - -/// Capped exponential backoff step: `prev` doubled, clamped to `max`. -fn next_backoff(prev: Duration, max: Duration) -> Duration { - prev.saturating_mul(2).min(max) -} - -/// What the outer reconnect loop should do after one pubsub session. -enum Flow { - /// Shutdown requested — exit the task. - Stop, - /// Connection dropped or session failed — reconnect with backoff. - Retry, -} - -/// Resolves only when shutdown is truly requested (value `true`) or every -/// sender has been dropped; spurious non-shutdown notifications keep it pending -/// so it never cancels in-flight connect/subscribe work. -async fn wait_for_shutdown(shutdown: &mut watch::Receiver) { - loop { - if shutdown.changed().await.is_err() || *shutdown.borrow_and_update() { - return; - } - } -} - -/// Blacklist pubsub subscriber with real reconnect: on connect/subscribe -/// failure or stream end it retries with capped exponential backoff (reset to -/// `BACKOFF_MIN` after each successfully applied message). Every await is -/// raced against the shutdown watch so the task stays cancellable. -pub async fn start_blacklist_sync( - client: &redis::Client, - blacklist: Arc, - mut shutdown: watch::Receiver, -) { - let mut backoff = BACKOFF_MIN; - loop { - match subscribe_once(client, &blacklist, &mut shutdown, &mut backoff).await { - Flow::Stop => { - tracing::info!("shutting down blacklist subscriber"); - return; - }, - Flow::Retry => {}, - } - - tokio::select! { - _ = tokio::time::sleep(backoff) => {}, - () = wait_for_shutdown(&mut shutdown) => { - tracing::info!("shutting down blacklist subscriber"); - return; - }, - } - backoff = next_backoff(backoff, BACKOFF_MAX); - } -} - -/// One connect+subscribe+consume session. Sets `*backoff` to `BACKOFF_MIN` -/// whenever a message is applied, proving the link is healthy. Each blocking -/// await is raced against shutdown. (Connect+subscribe stay inline: the -/// `PubSub` type produced by `into_pubsub` is awkward to name in a split -/// helper's return type.) -async fn subscribe_once( - client: &redis::Client, - blacklist: &Blacklist, - shutdown: &mut watch::Receiver, - backoff: &mut Duration, -) -> Flow { - #[allow(deprecated)] - let conn = tokio::select! { - connected = client.get_async_connection() => match connected { - Ok(c) => c, - Err(e) => { - tracing::error!("failed to connect to Redis for blacklist sync: {e}"); - return Flow::Retry; - }, - }, - () = wait_for_shutdown(shutdown) => return Flow::Stop, - }; - - let mut pubsub = conn.into_pubsub(); - tokio::select! { - subscribed = pubsub.subscribe(BLACKLIST_CHANNEL) => match subscribed { - Ok(()) => tracing::info!("subscribed to {BLACKLIST_CHANNEL}"), - Err(e) => { - tracing::error!("failed to subscribe to blacklist events: {e}"); - return Flow::Retry; - }, - }, - () = wait_for_shutdown(shutdown) => return Flow::Stop, - } - - let mut stream = pubsub.on_message(); - loop { - tokio::select! { - maybe_msg = stream.next() => match maybe_msg { - Some(msg) => { - if let Err(e) = handle_event(&msg, blacklist) { - tracing::error!("blacklist event error: {e}"); - } else { - *backoff = BACKOFF_MIN; - } - }, - None => { - tracing::error!("blacklist pubsub stream ended; resubscribing"); - return Flow::Retry; - }, - }, - () = wait_for_shutdown(shutdown) => return Flow::Stop, - } - } -} - -fn handle_event(msg: &Msg, blacklist: &Blacklist) -> anyhow::Result<()> { - let payload: String = msg.get_payload()?; - let event: BlacklistEvent = serde_json::from_str(&payload)?; - - let ip: std::net::IpAddr = event.ip.parse()?; - - match event.action.as_str() { - "ban" => { - blacklist.add(ip, Duration::from_secs(event.duration_secs), "redis"); - tracing::info!("blacklist add via Redis: {}", event.ip); - }, - "unban" => { - blacklist.remove(ip); - tracing::info!("blacklist remove via Redis: {}", event.ip); - }, - a => anyhow::bail!("unknown action: {a}"), - } - Ok(()) -} - impl StateStore for RedisStore { async fn get(&self, key: &str) -> anyhow::Result> { let mut conn = self.client.get_multiplexed_async_connection().await?; @@ -189,23 +39,3 @@ impl StateStore for RedisStore { Ok(()) } } - -#[cfg(test)] -mod tests { - use super::*; - - #[test] - fn backoff_doubles_until_cap() { - let mut b = BACKOFF_MIN; - for expected_secs in [2, 4, 8, 16, 30, 30] { - b = next_backoff(b, BACKOFF_MAX); - assert_eq!(b, Duration::from_secs(expected_secs)); - } - } - - #[test] - fn backoff_never_exceeds_max_even_with_huge_prev() { - let b = next_backoff(Duration::from_secs(u64::MAX / 2), BACKOFF_MAX); - assert!(b <= BACKOFF_MAX); - } -} diff --git a/src/store/redis/sync.rs b/src/store/redis/sync.rs new file mode 100644 index 0000000..63eb73f --- /dev/null +++ b/src/store/redis/sync.rs @@ -0,0 +1,134 @@ +mod event; +mod snapshot; + +use crate::filter::blacklist::Blacklist; +use futures::StreamExt; +use std::sync::Arc; +use std::time::Duration; +use tokio::sync::watch; + +const BLACKLIST_CHANNEL: &str = "rampart:blacklist:events"; +const BACKOFF_MIN: Duration = Duration::from_secs(1); +const BACKOFF_MAX: Duration = Duration::from_secs(30); + +fn next_backoff(prev: Duration, max: Duration) -> Duration { + prev.saturating_mul(2).min(max) +} + +enum Flow { + Stop, + Retry, +} + +async fn wait_for_shutdown(shutdown: &mut watch::Receiver) { + loop { + if shutdown.changed().await.is_err() || *shutdown.borrow_and_update() { + return; + } + } +} + +pub async fn start_blacklist_sync( + client: &redis::Client, + blacklist: Arc, + mut shutdown: watch::Receiver, +) { + let mut backoff = BACKOFF_MIN; + loop { + match subscribe_once(client, &blacklist, &mut shutdown, &mut backoff).await { + Flow::Stop => { + tracing::info!("shutting down blacklist subscriber"); + return; + }, + Flow::Retry => {}, + } + tokio::select! { + _ = tokio::time::sleep(backoff) => {}, + () = wait_for_shutdown(&mut shutdown) => { + tracing::info!("shutting down blacklist subscriber"); + return; + }, + } + backoff = next_backoff(backoff, BACKOFF_MAX); + } +} + +async fn subscribe_once( + client: &redis::Client, + blacklist: &Blacklist, + shutdown: &mut watch::Receiver, + backoff: &mut Duration, +) -> Flow { + let mut pubsub = tokio::select! { + connected = client.get_async_pubsub() => match connected { + Ok(pubsub) => pubsub, + Err(e) => { + tracing::error!("failed to connect to Redis for blacklist sync: {e}"); + return Flow::Retry; + }, + }, + () = wait_for_shutdown(shutdown) => return Flow::Stop, + }; + + tokio::select! { + subscribed = pubsub.subscribe(BLACKLIST_CHANNEL) => match subscribed { + Ok(()) => tracing::info!("subscribed to {BLACKLIST_CHANNEL}"), + Err(e) => { + tracing::error!("failed to subscribe to blacklist events: {e}"); + return Flow::Retry; + }, + }, + () = wait_for_shutdown(shutdown) => return Flow::Stop, + } + + tokio::select! { + loaded = snapshot::reconcile(client, blacklist) => match loaded { + Ok(()) => tracing::info!("blacklist snapshot reconciled from Redis"), + Err(e) => { + tracing::error!("failed to reconcile blacklist snapshot: {e}"); + return Flow::Retry; + }, + }, + () = wait_for_shutdown(shutdown) => return Flow::Stop, + } + + let mut stream = pubsub.on_message(); + loop { + tokio::select! { + maybe_msg = stream.next() => match maybe_msg { + Some(msg) => { + if let Err(e) = event::handle(&msg, blacklist) { + tracing::error!("blacklist event error: {e}"); + } else { + *backoff = BACKOFF_MIN; + } + }, + None => { + tracing::error!("blacklist pubsub stream ended; resubscribing"); + return Flow::Retry; + }, + }, + () = wait_for_shutdown(shutdown) => return Flow::Stop, + } + } +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn backoff_doubles_until_cap() { + let mut b = BACKOFF_MIN; + for expected_secs in [2, 4, 8, 16, 30, 30] { + b = next_backoff(b, BACKOFF_MAX); + assert_eq!(b, Duration::from_secs(expected_secs)); + } + } + + #[test] + fn backoff_never_exceeds_max_even_with_huge_prev() { + let b = next_backoff(Duration::from_secs(u64::MAX / 2), BACKOFF_MAX); + assert!(b <= BACKOFF_MAX); + } +} diff --git a/src/store/redis/sync/event.rs b/src/store/redis/sync/event.rs new file mode 100644 index 0000000..88dc376 --- /dev/null +++ b/src/store/redis/sync/event.rs @@ -0,0 +1,57 @@ +use crate::filter::blacklist::Blacklist; +use redis::Msg; +use serde::Deserialize; +use std::time::Duration; + +const MAX_BAN_DURATION_SECS: u64 = 31_536_000; + +#[derive(Deserialize)] +struct BlacklistEvent { + ip: String, + action: String, + #[serde(default = "default_duration")] + duration_secs: u64, + #[serde(default)] + expires_at_unix: Option, +} + +fn default_duration() -> u64 { + 300 +} + +pub(super) fn handle(msg: &Msg, blacklist: &Blacklist) -> anyhow::Result<()> { + let payload: String = msg.get_payload()?; + let event: BlacklistEvent = serde_json::from_str(&payload)?; + let ip: std::net::IpAddr = event.ip.parse()?; + + match event.action.as_str() { + "ban" => { + let duration = match event.expires_at_unix { + Some(expires_at) => { + if chrono::DateTime::from_timestamp(expires_at, 0).is_none() { + anyhow::bail!("invalid blacklist event expiry timestamp"); + } + let remaining = expires_at.saturating_sub(chrono::Utc::now().timestamp()); + if remaining <= 0 { + blacklist.remove_redis(ip); + return Ok(()); + } + let remaining = u64::try_from(remaining)?; + if remaining > MAX_BAN_DURATION_SECS { + anyhow::bail!("blacklist event expiry exceeds maximum duration"); + } + Duration::from_secs(remaining) + }, + None => Duration::from_secs(event.duration_secs), + }; + blacklist.add_redis(ip, duration, "manager_event"); + tracing::info!("blacklist add via Redis: {}", event.ip); + }, + "unban" => { + blacklist.remove_redis(ip); + tracing::info!("blacklist remove via Redis: {}", event.ip); + }, + action => anyhow::bail!("unknown action: {action}"), + } + Ok(()) +} diff --git a/src/store/redis/sync/snapshot.rs b/src/store/redis/sync/snapshot.rs new file mode 100644 index 0000000..aefd132 --- /dev/null +++ b/src/store/redis/sync/snapshot.rs @@ -0,0 +1,77 @@ +use crate::filter::blacklist::Blacklist; +use redis::AsyncCommands; +use serde::{Deserialize, Serialize}; +use std::collections::HashMap; +use std::time::Duration; + +const BLACKLIST_KEY: &str = "rampart:blacklist"; +const BLACKLIST_METADATA_KEY: &str = "rampart:blacklist:metadata"; +const LEGACY_BAN_DURATION_SECS: i64 = 300; +const MAX_BAN_DURATION_SECS: i64 = 31_536_000; + +#[derive(Deserialize, Serialize)] +struct BlacklistMetadata { + created_at_unix: i64, + expires_at_unix: i64, + reason: String, +} + +/// Restore current durable bans after subscribing to the event channel. +pub(super) async fn reconcile(client: &redis::Client, blacklist: &Blacklist) -> anyhow::Result<()> { + let mut conn = client.get_multiplexed_async_connection().await?; + let members: Vec = redis::cmd("SMEMBERS").arg(BLACKLIST_KEY).query_async(&mut conn).await?; + let metadata: HashMap = conn.hgetall(BLACKLIST_METADATA_KEY).await?; + let now = chrono::Utc::now().timestamp(); + let mut active = Vec::with_capacity(members.len()); + + for target in members { + let ip: std::net::IpAddr = match target.parse() { + Ok(ip) => ip, + Err(_) => continue, + }; + let record = match metadata.get(&target) { + Some(encoded) => match serde_json::from_str::(encoded) { + Ok(record) => record, + Err(_) => continue, + }, + None => match legacy_record(&mut conn, &target, now).await? { + Some(record) => record, + None => continue, + }, + }; + if record.expires_at_unix <= now + || chrono::DateTime::from_timestamp(record.created_at_unix, 0).is_none() + || chrono::DateTime::from_timestamp(record.expires_at_unix, 0).is_none() + || record.expires_at_unix.saturating_sub(now) > MAX_BAN_DURATION_SECS + { + continue; + } + let remaining = u64::try_from(record.expires_at_unix - now)?; + active.push((ip, Duration::from_secs(remaining), record.reason)); + } + blacklist.replace_redis(active); + Ok(()) +} + +async fn legacy_record( + conn: &mut redis::aio::MultiplexedConnection, + target: &str, + now: i64, +) -> anyhow::Result> { + let legacy = BlacklistMetadata { + created_at_unix: now, + expires_at_unix: now.saturating_add(LEGACY_BAN_DURATION_SECS), + reason: "legacy_unverified".to_string(), + }; + let inserted: i64 = redis::cmd("HSETNX") + .arg(BLACKLIST_METADATA_KEY) + .arg(target) + .arg(serde_json::to_string(&legacy)?) + .query_async(conn) + .await?; + if inserted == 1 { + return Ok(Some(legacy)); + } + let current: Option = conn.hget(BLACKLIST_METADATA_KEY, target).await?; + Ok(current.and_then(|value| serde_json::from_str(&value).ok())) +} diff --git a/src/xdp/filter/maps.rs b/src/xdp/filter/maps.rs index 330ae43..c07ac2b 100644 --- a/src/xdp/filter/maps.rs +++ b/src/xdp/filter/maps.rs @@ -1,3 +1,8 @@ +use super::XdpFilter; +use anyhow::{Result, bail}; +use libbpf_rs::{MapCore, MapFlags}; +use std::net::{IpAddr, Ipv4Addr}; + pub(super) fn unix_ns() -> u64 { std::time::SystemTime::now() .duration_since(std::time::UNIX_EPOCH) @@ -20,6 +25,35 @@ pub(super) fn blacklist_expiry_ns(now_ns: u64, duration_secs: u64) -> u64 { now_ns.saturating_add(duration_secs.saturating_mul(1_000_000_000)) } +impl XdpFilter { + pub fn ban_ip(&self, ip: Ipv4Addr, duration_secs: u64) -> Result<()> { + self.blacklist_update(32, &ip.octets(), duration_secs) + } + + /// Adds a CIDR ban to the LPM trie. IPv6 enforcement is not supported yet. + pub fn ban_cidr(&self, prefix: IpAddr, prefix_len: u8, duration_secs: u64) -> Result<()> { + let IpAddr::V4(net) = prefix else { + bail!("ipv6 cidr bans not supported yet"); + }; + self.blacklist_update(prefix_len, &net.octets(), duration_secs) + } + + fn blacklist_update(&self, prefix_len: u8, v4: &[u8; 4], duration_secs: u64) -> Result<()> { + let map = self.find_map("blacklist_map")?; + let key = blacklist_key(prefix_len, v4); + let expiry_ns = blacklist_expiry_ns(unix_ns(), duration_secs); + map.update(&key, &expiry_ns.to_le_bytes(), MapFlags::ANY)?; + Ok(()) + } + + pub fn unban_ip(&self, ip: Ipv4Addr) -> Result<()> { + let map = self.find_map("blacklist_map")?; + let key = blacklist_key(32, &ip.octets()); + map.delete(&key)?; + Ok(()) + } +} + #[cfg(test)] mod tests { use super::*; diff --git a/src/xdp/filter/mod.rs b/src/xdp/filter/mod.rs index 6d7923f..d5655c9 100644 --- a/src/xdp/filter/mod.rs +++ b/src/xdp/filter/mod.rs @@ -1,7 +1,5 @@ use anyhow::{Context, Result, bail}; use libbpf_rs::{MapCore, MapFlags, Object, ObjectBuilder, RingBuffer, Xdp, XdpFlags}; -use std::net::IpAddr; -use std::net::Ipv4Addr; use std::os::unix::io::AsFd; use std::sync::Arc; @@ -13,7 +11,6 @@ use crate::traffic::prefix::{PrefixKey, PrefixStatsVal}; use attach::{build_ringbuf, interface_cstr, patch_rodata, xdp_attach_mode_name}; use events::AutoBanConfig; -use maps::{blacklist_expiry_ns, blacklist_key, unix_ns}; mod attach; pub(crate) mod events; @@ -168,36 +165,6 @@ impl XdpFilter { .with_context(|| format!("map '{}' not found", name)) } - pub fn ban_ip(&self, ip: Ipv4Addr, duration_secs: u64) -> Result<()> { - self.blacklist_update(32, &ip.octets(), duration_secs) - } - - /// Бан CIDR через `blacklist_map` (LPM trie): длина префикса в key[0]. - /// - /// # Errors - /// XDP не загружен, IPv6-префиксы (ядро их пока не банит) или ошибка карты. - pub fn ban_cidr(&self, prefix: IpAddr, prefix_len: u8, duration_secs: u64) -> Result<()> { - let IpAddr::V4(net) = prefix else { - bail!("ipv6 cidr bans not supported yet"); - }; - self.blacklist_update(prefix_len, &net.octets(), duration_secs) - } - - fn blacklist_update(&self, prefix_len: u8, v4: &[u8; 4], duration_secs: u64) -> Result<()> { - let map = self.find_map("blacklist_map")?; - let key = blacklist_key(prefix_len, v4); - let expiry_ns = blacklist_expiry_ns(unix_ns(), duration_secs); - map.update(&key, &expiry_ns.to_le_bytes(), MapFlags::ANY)?; - Ok(()) - } - - pub fn unban_ip(&self, ip: Ipv4Addr) -> Result<()> { - let map = self.find_map("blacklist_map")?; - let key = blacklist_key(32, &ip.octets()); - map.delete(&key)?; - Ok(()) - } - /// Читает карту `prefix_stats` (агрегаты по префиксам /24 и /64). /// /// # Errors diff --git a/tests/protocol_registry.rs b/tests/protocol_registry.rs index 06c9ad5..bd19d8e 100644 --- a/tests/protocol_registry.rs +++ b/tests/protocol_registry.rs @@ -1,7 +1,7 @@ use std::future::Future; use std::pin::Pin; -use rampart::protocol::{ProtocolHandler, ProtocolRegistry, Upstream}; +use rampart::protocol::{HandshakeResult, ProtocolHandler, ProtocolRegistry, Upstream}; use tokio::net::TcpStream; struct NoopHandler; @@ -14,8 +14,8 @@ impl ProtocolHandler for NoopHandler { fn handshake<'a>( &'a self, _stream: &'a mut TcpStream, - ) -> Pin> + Send + 'a>> { - Box::pin(async { Ok(Upstream::new("127.0.0.1:9000")) }) + ) -> Pin> + Send + 'a>> { + Box::pin(async { Ok(HandshakeResult::new(Upstream::new("127.0.0.1:9000"))) }) } }