mirror of
https://github.com/sadoyan/aralez.git
synced 2026-04-30 14:58:38 +08:00
Compare commits
21 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
2b62d1e6de | ||
|
|
8a290e5084 | ||
|
|
3541b20c80 | ||
|
|
bd5fed9be0 | ||
|
|
b916b152ea | ||
|
|
5d4915d6b9 | ||
|
|
3ea3996e27 | ||
|
|
dd069b8532 | ||
|
|
c78245e695 | ||
|
|
66b1a1c399 | ||
|
|
bba6dd8514 | ||
|
|
79485ac69d | ||
|
|
61c5625016 | ||
|
|
57bdc71acd | ||
|
|
9e09b829a6 | ||
|
|
d3602fa578 | ||
|
|
e304482667 | ||
|
|
f8118f9596 | ||
|
|
f654312466 | ||
|
|
b44f7069a0 | ||
|
|
a44979ec82 |
2
.gitignore
vendored
2
.gitignore
vendored
@@ -5,6 +5,8 @@
|
|||||||
*.dll
|
*.dll
|
||||||
*.exe
|
*.exe
|
||||||
*.sh
|
*.sh
|
||||||
|
/docs/
|
||||||
|
/docs
|
||||||
/target/
|
/target/
|
||||||
*.iml
|
*.iml
|
||||||
.idea/
|
.idea/
|
||||||
|
|||||||
356
Cargo.lock
generated
356
Cargo.lock
generated
@@ -112,7 +112,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "aralez"
|
name = "aralez"
|
||||||
version = "0.9.1"
|
version = "0.9.2"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"arc-swap",
|
"arc-swap",
|
||||||
"async-trait",
|
"async-trait",
|
||||||
@@ -120,6 +120,7 @@ dependencies = [
|
|||||||
"axum-server",
|
"axum-server",
|
||||||
"base16ct",
|
"base16ct",
|
||||||
"base64",
|
"base64",
|
||||||
|
"ctrlc",
|
||||||
"dashmap",
|
"dashmap",
|
||||||
"env_logger",
|
"env_logger",
|
||||||
"futures",
|
"futures",
|
||||||
@@ -134,8 +135,10 @@ dependencies = [
|
|||||||
"pingora-http",
|
"pingora-http",
|
||||||
"pingora-limits",
|
"pingora-limits",
|
||||||
"pingora-proxy",
|
"pingora-proxy",
|
||||||
|
"port_check",
|
||||||
|
"privdrop",
|
||||||
"prometheus 0.14.0",
|
"prometheus 0.14.0",
|
||||||
"rand 0.9.1",
|
"rand 0.9.2",
|
||||||
"reqwest",
|
"reqwest",
|
||||||
"rustls-pemfile",
|
"rustls-pemfile",
|
||||||
"serde",
|
"serde",
|
||||||
@@ -223,9 +226,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "async-trait"
|
name = "async-trait"
|
||||||
version = "0.1.88"
|
version = "0.1.89"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
|
checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
@@ -346,9 +349,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "base16ct"
|
name = "base16ct"
|
||||||
version = "0.2.0"
|
version = "0.3.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
|
checksum = "d8b59d472eab27ade8d770dcb11da7201c11234bef9f82ce7aa517be028d462b"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "base64"
|
name = "base64"
|
||||||
@@ -388,9 +391,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "block-buffer"
|
name = "block-buffer"
|
||||||
version = "0.11.0-rc.4"
|
version = "0.11.0-rc.5"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a229bfd78e4827c91b9b95784f69492c1b77c1ab75a45a8a037b139215086f94"
|
checksum = "e9ef36a6fcdb072aa548f3da057640ec10859eb4e91ddf526ee648d50c76a949"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"hybrid-array",
|
"hybrid-array",
|
||||||
]
|
]
|
||||||
@@ -479,6 +482,12 @@ version = "1.0.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "cfg_aliases"
|
||||||
|
version = "0.2.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "chrono"
|
name = "chrono"
|
||||||
version = "0.4.39"
|
version = "0.4.39"
|
||||||
@@ -603,13 +612,24 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "crypto-common"
|
name = "crypto-common"
|
||||||
version = "0.2.0-rc.3"
|
version = "0.2.0-rc.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8a23fa214dea9efd4dacee5a5614646b30216ae0f05d4bb51bafb50e9da1c5be"
|
checksum = "6a8235645834fbc6832939736ce2f2d08192652269e11010a6240f61b908a1c6"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"hybrid-array",
|
"hybrid-array",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "ctrlc"
|
||||||
|
version = "3.5.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "881c5d0a13b2f1498e2306e82cbada78390e152d4b1378fb28a84f4dcd0dc4f3"
|
||||||
|
dependencies = [
|
||||||
|
"dispatch",
|
||||||
|
"nix 0.30.1",
|
||||||
|
"windows-sys 0.61.0",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "daemonize"
|
name = "daemonize"
|
||||||
version = "0.5.0"
|
version = "0.5.0"
|
||||||
@@ -686,14 +706,20 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "digest"
|
name = "digest"
|
||||||
version = "0.11.0-rc.0"
|
version = "0.11.0-rc.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "460dd7f37e4950526b54a5a6b1f41b6c8e763c58eb9a8fc8fc05ba5c2f44ca7b"
|
checksum = "6749b668519cd7149ee3d11286a442a8a8bdc3a9d529605f579777bfccc5a4bc"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"block-buffer 0.11.0-rc.4",
|
"block-buffer 0.11.0-rc.5",
|
||||||
"crypto-common 0.2.0-rc.3",
|
"crypto-common 0.2.0-rc.4",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "dispatch"
|
||||||
|
version = "0.2.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "displaydoc"
|
name = "displaydoc"
|
||||||
version = "0.2.5"
|
version = "0.2.5"
|
||||||
@@ -765,18 +791,6 @@ version = "2.3.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
|
checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "filetime"
|
|
||||||
version = "0.2.25"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
|
|
||||||
dependencies = [
|
|
||||||
"cfg-if",
|
|
||||||
"libc",
|
|
||||||
"libredox",
|
|
||||||
"windows-sys 0.59.0",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "flate2"
|
name = "flate2"
|
||||||
version = "1.0.35"
|
version = "1.0.35"
|
||||||
@@ -975,9 +989,9 @@ checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "h2"
|
name = "h2"
|
||||||
version = "0.4.7"
|
version = "0.4.12"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e"
|
checksum = "f3c0b69cfcb4e1b9f1bf2f53f95f766e4661169728ec61cd3fe5a0166f2d1386"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"atomic-waker",
|
"atomic-waker",
|
||||||
"bytes",
|
"bytes",
|
||||||
@@ -1101,9 +1115,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "hybrid-array"
|
name = "hybrid-array"
|
||||||
version = "0.3.1"
|
version = "0.4.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "891d15931895091dea5c47afa5b3c9a01ba634b311919fd4d41388fa0e3d76af"
|
checksum = "c7116c472cf19838450b1d421b4e842569f52b519d640aee9ace1ebcf5b21051"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"typenum",
|
"typenum",
|
||||||
]
|
]
|
||||||
@@ -1193,7 +1207,7 @@ dependencies = [
|
|||||||
"libc",
|
"libc",
|
||||||
"percent-encoding",
|
"percent-encoding",
|
||||||
"pin-project-lite",
|
"pin-project-lite",
|
||||||
"socket2",
|
"socket2 0.5.10",
|
||||||
"system-configuration",
|
"system-configuration",
|
||||||
"tokio",
|
"tokio",
|
||||||
"tower-service",
|
"tower-service",
|
||||||
@@ -1468,9 +1482,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "kqueue"
|
name = "kqueue"
|
||||||
version = "1.0.8"
|
version = "1.1.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c"
|
checksum = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"kqueue-sys",
|
"kqueue-sys",
|
||||||
"libc",
|
"libc",
|
||||||
@@ -1500,25 +1514,14 @@ checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "libmimalloc-sys"
|
name = "libmimalloc-sys"
|
||||||
version = "0.1.43"
|
version = "0.1.44"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "bf88cd67e9de251c1781dbe2f641a1a3ad66eaae831b8a2c38fbdc5ddae16d4d"
|
checksum = "667f4fec20f29dfc6bc7357c582d91796c169ad7e2fce709468aefeb2c099870"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cc",
|
"cc",
|
||||||
"libc",
|
"libc",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "libredox"
|
|
||||||
version = "0.1.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
|
|
||||||
dependencies = [
|
|
||||||
"bitflags 2.8.0",
|
|
||||||
"libc",
|
|
||||||
"redox_syscall",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "libz-ng-sys"
|
name = "libz-ng-sys"
|
||||||
version = "1.1.21"
|
version = "1.1.21"
|
||||||
@@ -1571,9 +1574,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "log"
|
name = "log"
|
||||||
version = "0.4.27"
|
version = "0.4.28"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
|
checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lru"
|
name = "lru"
|
||||||
@@ -1613,9 +1616,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "mimalloc"
|
name = "mimalloc"
|
||||||
version = "0.1.47"
|
version = "0.1.48"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "b1791cbe101e95af5764f06f20f6760521f7158f69dbf9d6baf941ee1bf6bc40"
|
checksum = "e1ee66a4b64c74f4ef288bcbb9192ad9c3feaad75193129ac8509af543894fd8"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"libmimalloc-sys",
|
"libmimalloc-sys",
|
||||||
]
|
]
|
||||||
@@ -1717,6 +1720,18 @@ dependencies = [
|
|||||||
"memoffset",
|
"memoffset",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "nix"
|
||||||
|
version = "0.30.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags 2.8.0",
|
||||||
|
"cfg-if",
|
||||||
|
"cfg_aliases",
|
||||||
|
"libc",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "nom"
|
name = "nom"
|
||||||
version = "7.1.3"
|
version = "7.1.3"
|
||||||
@@ -1729,12 +1744,11 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "notify"
|
name = "notify"
|
||||||
version = "8.0.0"
|
version = "8.2.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "2fee8403b3d66ac7b26aee6e40a897d85dc5ce26f44da36b8b73e987cc52e943"
|
checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.8.0",
|
"bitflags 2.8.0",
|
||||||
"filetime",
|
|
||||||
"fsevent-sys",
|
"fsevent-sys",
|
||||||
"inotify",
|
"inotify",
|
||||||
"kqueue",
|
"kqueue",
|
||||||
@@ -1743,7 +1757,7 @@ dependencies = [
|
|||||||
"mio",
|
"mio",
|
||||||
"notify-types",
|
"notify-types",
|
||||||
"walkdir",
|
"walkdir",
|
||||||
"windows-sys 0.59.0",
|
"windows-sys 0.60.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -1806,9 +1820,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "once_cell"
|
name = "once_cell"
|
||||||
version = "1.20.2"
|
version = "1.21.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
|
checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "openssl"
|
name = "openssl"
|
||||||
@@ -1949,9 +1963,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pingora"
|
name = "pingora"
|
||||||
version = "0.5.0"
|
version = "0.6.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "0d793bb3f61d3aacb02b10d0e32724f5b4f1d3fcf2f51efc4188a1a6a5810606"
|
checksum = "1a1f02a6347e81953ab831fdcf090a028db12d67ec3badf47831d1299dac6e20"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"pingora-cache",
|
"pingora-cache",
|
||||||
"pingora-core",
|
"pingora-core",
|
||||||
@@ -1963,9 +1977,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pingora-cache"
|
name = "pingora-cache"
|
||||||
version = "0.5.0"
|
version = "0.6.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "dcb4b85ca73955092e7e2a6654304f6ee7868d38792f442733a197cbb3ac5f75"
|
checksum = "7ef622051fbb2cb98a524df3a8112f02d0919ccda600a44d705ec550f1a28fe2"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ahash",
|
"ahash",
|
||||||
"async-trait",
|
"async-trait",
|
||||||
@@ -1988,6 +2002,7 @@ dependencies = [
|
|||||||
"pingora-http",
|
"pingora-http",
|
||||||
"pingora-lru",
|
"pingora-lru",
|
||||||
"pingora-timeout",
|
"pingora-timeout",
|
||||||
|
"rand 0.8.5",
|
||||||
"regex",
|
"regex",
|
||||||
"rmp",
|
"rmp",
|
||||||
"rmp-serde",
|
"rmp-serde",
|
||||||
@@ -1998,9 +2013,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pingora-core"
|
name = "pingora-core"
|
||||||
version = "0.5.0"
|
version = "0.6.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "2298292e2dbd156294bcc8dd2ec34507277c78bab31bfe3aecc1cab9b1f91dff"
|
checksum = "76f63d3f67d99c95a1f85623fc43242fd644dd12ccbaa18c38a54e1580c6846a"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ahash",
|
"ahash",
|
||||||
"async-trait",
|
"async-trait",
|
||||||
@@ -2018,7 +2033,7 @@ dependencies = [
|
|||||||
"httpdate",
|
"httpdate",
|
||||||
"libc",
|
"libc",
|
||||||
"log",
|
"log",
|
||||||
"nix",
|
"nix 0.24.3",
|
||||||
"once_cell",
|
"once_cell",
|
||||||
"openssl-probe",
|
"openssl-probe",
|
||||||
"parking_lot",
|
"parking_lot",
|
||||||
@@ -2035,7 +2050,7 @@ dependencies = [
|
|||||||
"serde",
|
"serde",
|
||||||
"serde_yaml 0.8.26",
|
"serde_yaml 0.8.26",
|
||||||
"sfv",
|
"sfv",
|
||||||
"socket2",
|
"socket2 0.6.0",
|
||||||
"strum",
|
"strum",
|
||||||
"strum_macros",
|
"strum_macros",
|
||||||
"tokio",
|
"tokio",
|
||||||
@@ -2047,15 +2062,15 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pingora-error"
|
name = "pingora-error"
|
||||||
version = "0.5.0"
|
version = "0.6.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ca838db1ee9beef844d6db7e2e85e0006b50bb6bf8f19c96fb64bf2567e59039"
|
checksum = "52119570d3f4644e09654ad24df2b7d851bf12eaa8c4148b4674c7f90916598e"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pingora-header-serde"
|
name = "pingora-header-serde"
|
||||||
version = "0.5.0"
|
version = "0.6.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "659b46bad022e1b4a3ee6b12739e4e597ccca5e3652c9cbfb06155686c94adbe"
|
checksum = "252a16def05c7adbbdda776e87b2be36e9481c8a77249207a2f3b563e8933b35"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bytes",
|
"bytes",
|
||||||
"http",
|
"http",
|
||||||
@@ -2069,9 +2084,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pingora-http"
|
name = "pingora-http"
|
||||||
version = "0.5.0"
|
version = "0.6.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "0f15f9fa5ae034435adfe2b94620e25dee7b0859c2460acec499163de3d299f1"
|
checksum = "5a3542fd0fd0a83212882c5066ae739ba51804f20d624ff7e12ec85113c5c89a"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bytes",
|
"bytes",
|
||||||
"http",
|
"http",
|
||||||
@@ -2080,27 +2095,27 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pingora-ketama"
|
name = "pingora-ketama"
|
||||||
version = "0.5.0"
|
version = "0.6.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e672fab42518ae10cbcbed2e4532c46744b222425c12886d2e6ae2ffd64b1e74"
|
checksum = "3f5dd8546b1874d5cfca594375c1cfb852c3dffd4f060428fa031a6e790dea18"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"crc32fast",
|
"crc32fast",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pingora-limits"
|
name = "pingora-limits"
|
||||||
version = "0.5.0"
|
version = "0.6.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a719a8cb5558ca06bd6076c97b8905d500ea556da89e132ba53d4272844f95b9"
|
checksum = "b93c897e8cc04ff0d077ee2a655142910618222aeefc83f7f99f5b9fc59ccb13"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ahash",
|
"ahash",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pingora-load-balancing"
|
name = "pingora-load-balancing"
|
||||||
version = "0.5.0"
|
version = "0.6.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "1c6fe587777e321fbead02352aa089e9965f6e3b87a944d12d7dfd3717fac4b1"
|
checksum = "4b5bb0314830a64b73b50b3782f3089f87947b61b4324c804d6f8d4ff9ce1c70"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"arc-swap",
|
"arc-swap",
|
||||||
"async-trait",
|
"async-trait",
|
||||||
@@ -2120,9 +2135,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pingora-lru"
|
name = "pingora-lru"
|
||||||
version = "0.5.0"
|
version = "0.6.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "32f1c33f6ce9ca9b8e81190796f7d4d543d1ab2a310097d884ebe48ce5d33c4d"
|
checksum = "ba89e4400cb978f0d7be1c14bd7ab4168c8e2c00d97ff19f964fc0048780237c"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"arrayvec",
|
"arrayvec",
|
||||||
"hashbrown 0.15.2",
|
"hashbrown 0.15.2",
|
||||||
@@ -2132,9 +2147,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pingora-openssl"
|
name = "pingora-openssl"
|
||||||
version = "0.5.0"
|
version = "0.6.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "7c82984830763c614e2f5950efbfb0b6f92fd59610ce656be35abf0fb8232308"
|
checksum = "d390f21024c6c8e171fd9ee82aee0cacdd324d079535d1b47011acabed87673b"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"foreign-types",
|
"foreign-types",
|
||||||
"libc",
|
"libc",
|
||||||
@@ -2145,9 +2160,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pingora-pool"
|
name = "pingora-pool"
|
||||||
version = "0.5.0"
|
version = "0.6.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a74589c2e4f089d00fde78030e2d51b44406341e1e43b0bdb5456b93b4459937"
|
checksum = "996c574f30a6e1ad10b47ac1626a86e0e47d5075953dd049d60df16ba5f7076e"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"crossbeam-queue",
|
"crossbeam-queue",
|
||||||
"log",
|
"log",
|
||||||
@@ -2160,9 +2175,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pingora-proxy"
|
name = "pingora-proxy"
|
||||||
version = "0.5.0"
|
version = "0.6.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "1d12839bb50f9716db46b6bafc2ea9cf0de504dee857ff79d7a96dc64f46063a"
|
checksum = "6c4097fd2639905bf5b81f3618551cd826d5e03aac063e17fd7a4137f19c1a5b"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"async-trait",
|
"async-trait",
|
||||||
"bytes",
|
"bytes",
|
||||||
@@ -2176,15 +2191,16 @@ dependencies = [
|
|||||||
"pingora-core",
|
"pingora-core",
|
||||||
"pingora-error",
|
"pingora-error",
|
||||||
"pingora-http",
|
"pingora-http",
|
||||||
|
"rand 0.8.5",
|
||||||
"regex",
|
"regex",
|
||||||
"tokio",
|
"tokio",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pingora-runtime"
|
name = "pingora-runtime"
|
||||||
version = "0.5.0"
|
version = "0.6.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e720a120466e8f61a64384deff6d7a52de6df6a4c54b0046c70c9cf0eaad1092"
|
checksum = "8ccc165021cf55a39b9e760121b22c4260b17a0b2c530d5b93092fc5bc765b94"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"once_cell",
|
"once_cell",
|
||||||
"rand 0.8.5",
|
"rand 0.8.5",
|
||||||
@@ -2194,9 +2210,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pingora-timeout"
|
name = "pingora-timeout"
|
||||||
version = "0.5.0"
|
version = "0.6.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "7fd4538cb5a3ae793c63126fc21e77e20778742931e31a5ac64e75b3ca10d176"
|
checksum = "548cd21d41611c725827677937e68f2cd008bbfa09f3416d3fbad07e1e42f6d7"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"once_cell",
|
"once_cell",
|
||||||
"parking_lot",
|
"parking_lot",
|
||||||
@@ -2211,6 +2227,12 @@ version = "0.3.31"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
|
checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "port_check"
|
||||||
|
version = "0.3.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "4c2749dcd0984ec1be3c01001bb1d83623a58c3c0049a99b9afec61464fa98e7"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "portable-atomic"
|
name = "portable-atomic"
|
||||||
version = "1.11.0"
|
version = "1.11.0"
|
||||||
@@ -2241,6 +2263,16 @@ dependencies = [
|
|||||||
"zerocopy",
|
"zerocopy",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "privdrop"
|
||||||
|
version = "0.5.6"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "70722a5a3728c9603c8d9469b64b8d1ee54dae6d74e24146da7f501b4c76540f"
|
||||||
|
dependencies = [
|
||||||
|
"libc",
|
||||||
|
"nix 0.30.1",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "proc-macro-error"
|
name = "proc-macro-error"
|
||||||
version = "1.0.4"
|
version = "1.0.4"
|
||||||
@@ -2304,15 +2336,6 @@ dependencies = [
|
|||||||
"thiserror 2.0.12",
|
"thiserror 2.0.12",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "prost"
|
|
||||||
version = "0.13.5"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5"
|
|
||||||
dependencies = [
|
|
||||||
"bytes",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "protobuf"
|
name = "protobuf"
|
||||||
version = "2.28.0"
|
version = "2.28.0"
|
||||||
@@ -2361,9 +2384,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rand"
|
name = "rand"
|
||||||
version = "0.9.1"
|
version = "0.9.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
|
checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"rand_chacha 0.9.0",
|
"rand_chacha 0.9.0",
|
||||||
"rand_core 0.9.3",
|
"rand_core 0.9.3",
|
||||||
@@ -2447,9 +2470,9 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "reqwest"
|
name = "reqwest"
|
||||||
version = "0.12.20"
|
version = "0.12.23"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "eabf4c97d9130e2bf606614eb937e86edac8292eaa6f422f995d7e8de1eb1813"
|
checksum = "d429f34c8092b2d42c7c93cec323bb4adeb7c67698f70839adec842ec10c7ceb"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"base64",
|
"base64",
|
||||||
"bytes",
|
"bytes",
|
||||||
@@ -2749,13 +2772,13 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "sha2"
|
name = "sha2"
|
||||||
version = "0.11.0-rc.0"
|
version = "0.11.0-rc.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "aa1d2e6b3cc4e43a8258a9a3b17aa5dfd2cc5186c7024bba8a64aa65b2c71a59"
|
checksum = "d1e3878ab0f98e35b2df35fe53201d088299b41a6bb63e3e34dada2ac4abd924"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
"cpufeatures",
|
"cpufeatures",
|
||||||
"digest 0.11.0-rc.0",
|
"digest 0.11.0-rc.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -2810,6 +2833,16 @@ dependencies = [
|
|||||||
"windows-sys 0.52.0",
|
"windows-sys 0.52.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "socket2"
|
||||||
|
version = "0.6.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807"
|
||||||
|
dependencies = [
|
||||||
|
"libc",
|
||||||
|
"windows-sys 0.59.0",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "stable_deref_trait"
|
name = "stable_deref_trait"
|
||||||
version = "1.2.0"
|
version = "1.2.0"
|
||||||
@@ -3055,7 +3088,7 @@ dependencies = [
|
|||||||
"parking_lot",
|
"parking_lot",
|
||||||
"pin-project-lite",
|
"pin-project-lite",
|
||||||
"signal-hook-registry",
|
"signal-hook-registry",
|
||||||
"socket2",
|
"socket2 0.5.10",
|
||||||
"tokio-macros",
|
"tokio-macros",
|
||||||
"windows-sys 0.52.0",
|
"windows-sys 0.52.0",
|
||||||
]
|
]
|
||||||
@@ -3141,9 +3174,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tonic"
|
name = "tonic"
|
||||||
version = "0.13.1"
|
version = "0.14.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "7e581ba15a835f4d9ea06c55ab1bd4dce26fc53752c69a04aac00703bfb49ba9"
|
checksum = "eb7613188ce9f7df5bfe185db26c5814347d110db17920415cf2fbcad85e7203"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"async-trait",
|
"async-trait",
|
||||||
"axum",
|
"axum",
|
||||||
@@ -3158,8 +3191,8 @@ dependencies = [
|
|||||||
"hyper-util",
|
"hyper-util",
|
||||||
"percent-encoding",
|
"percent-encoding",
|
||||||
"pin-project",
|
"pin-project",
|
||||||
"prost",
|
"socket2 0.6.0",
|
||||||
"socket2",
|
"sync_wrapper",
|
||||||
"tokio",
|
"tokio",
|
||||||
"tokio-stream",
|
"tokio-stream",
|
||||||
"tower",
|
"tower",
|
||||||
@@ -3509,9 +3542,15 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows-link"
|
name = "windows-link"
|
||||||
version = "0.1.1"
|
version = "0.1.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
|
checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows-link"
|
||||||
|
version = "0.2.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows-registry"
|
name = "windows-registry"
|
||||||
@@ -3519,7 +3558,7 @@ version = "0.5.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "b3bab093bdd303a1240bb99b8aba8ea8a69ee19d34c9e2ef9594e708a4878820"
|
checksum = "b3bab093bdd303a1240bb99b8aba8ea8a69ee19d34c9e2ef9594e708a4878820"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"windows-link",
|
"windows-link 0.1.3",
|
||||||
"windows-result",
|
"windows-result",
|
||||||
"windows-strings",
|
"windows-strings",
|
||||||
]
|
]
|
||||||
@@ -3530,7 +3569,7 @@ version = "0.3.4"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
|
checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"windows-link",
|
"windows-link 0.1.3",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -3539,7 +3578,7 @@ version = "0.4.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
|
checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"windows-link",
|
"windows-link 0.1.3",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -3569,6 +3608,24 @@ dependencies = [
|
|||||||
"windows-targets 0.52.6",
|
"windows-targets 0.52.6",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows-sys"
|
||||||
|
version = "0.60.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
|
||||||
|
dependencies = [
|
||||||
|
"windows-targets 0.53.3",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows-sys"
|
||||||
|
version = "0.61.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e201184e40b2ede64bc2ea34968b28e33622acdbbf37104f0e4a33f7abe657aa"
|
||||||
|
dependencies = [
|
||||||
|
"windows-link 0.2.0",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows-targets"
|
name = "windows-targets"
|
||||||
version = "0.48.5"
|
version = "0.48.5"
|
||||||
@@ -3593,13 +3650,30 @@ dependencies = [
|
|||||||
"windows_aarch64_gnullvm 0.52.6",
|
"windows_aarch64_gnullvm 0.52.6",
|
||||||
"windows_aarch64_msvc 0.52.6",
|
"windows_aarch64_msvc 0.52.6",
|
||||||
"windows_i686_gnu 0.52.6",
|
"windows_i686_gnu 0.52.6",
|
||||||
"windows_i686_gnullvm",
|
"windows_i686_gnullvm 0.52.6",
|
||||||
"windows_i686_msvc 0.52.6",
|
"windows_i686_msvc 0.52.6",
|
||||||
"windows_x86_64_gnu 0.52.6",
|
"windows_x86_64_gnu 0.52.6",
|
||||||
"windows_x86_64_gnullvm 0.52.6",
|
"windows_x86_64_gnullvm 0.52.6",
|
||||||
"windows_x86_64_msvc 0.52.6",
|
"windows_x86_64_msvc 0.52.6",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows-targets"
|
||||||
|
version = "0.53.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
|
||||||
|
dependencies = [
|
||||||
|
"windows-link 0.1.3",
|
||||||
|
"windows_aarch64_gnullvm 0.53.0",
|
||||||
|
"windows_aarch64_msvc 0.53.0",
|
||||||
|
"windows_i686_gnu 0.53.0",
|
||||||
|
"windows_i686_gnullvm 0.53.0",
|
||||||
|
"windows_i686_msvc 0.53.0",
|
||||||
|
"windows_x86_64_gnu 0.53.0",
|
||||||
|
"windows_x86_64_gnullvm 0.53.0",
|
||||||
|
"windows_x86_64_msvc 0.53.0",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_aarch64_gnullvm"
|
name = "windows_aarch64_gnullvm"
|
||||||
version = "0.48.5"
|
version = "0.48.5"
|
||||||
@@ -3612,6 +3686,12 @@ version = "0.52.6"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
|
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows_aarch64_gnullvm"
|
||||||
|
version = "0.53.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_aarch64_msvc"
|
name = "windows_aarch64_msvc"
|
||||||
version = "0.48.5"
|
version = "0.48.5"
|
||||||
@@ -3624,6 +3704,12 @@ version = "0.52.6"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
|
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows_aarch64_msvc"
|
||||||
|
version = "0.53.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_i686_gnu"
|
name = "windows_i686_gnu"
|
||||||
version = "0.48.5"
|
version = "0.48.5"
|
||||||
@@ -3636,12 +3722,24 @@ version = "0.52.6"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
|
checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows_i686_gnu"
|
||||||
|
version = "0.53.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_i686_gnullvm"
|
name = "windows_i686_gnullvm"
|
||||||
version = "0.52.6"
|
version = "0.52.6"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
|
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows_i686_gnullvm"
|
||||||
|
version = "0.53.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_i686_msvc"
|
name = "windows_i686_msvc"
|
||||||
version = "0.48.5"
|
version = "0.48.5"
|
||||||
@@ -3654,6 +3752,12 @@ version = "0.52.6"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
|
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows_i686_msvc"
|
||||||
|
version = "0.53.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_x86_64_gnu"
|
name = "windows_x86_64_gnu"
|
||||||
version = "0.48.5"
|
version = "0.48.5"
|
||||||
@@ -3666,6 +3770,12 @@ version = "0.52.6"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
|
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows_x86_64_gnu"
|
||||||
|
version = "0.53.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_x86_64_gnullvm"
|
name = "windows_x86_64_gnullvm"
|
||||||
version = "0.48.5"
|
version = "0.48.5"
|
||||||
@@ -3678,6 +3788,12 @@ version = "0.52.6"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
|
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows_x86_64_gnullvm"
|
||||||
|
version = "0.53.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_x86_64_msvc"
|
name = "windows_x86_64_msvc"
|
||||||
version = "0.48.5"
|
version = "0.48.5"
|
||||||
@@ -3690,6 +3806,12 @@ version = "0.52.6"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
|
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows_x86_64_msvc"
|
||||||
|
version = "0.53.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wit-bindgen-rt"
|
name = "wit-bindgen-rt"
|
||||||
version = "0.33.0"
|
version = "0.33.0"
|
||||||
@@ -3713,9 +3835,9 @@ checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "x509-parser"
|
name = "x509-parser"
|
||||||
version = "0.17.0"
|
version = "0.18.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "4569f339c0c402346d4a75a9e39cf8dad310e287eef1ff56d4c68e5067f53460"
|
checksum = "eb3e137310115a65136898d2079f003ce33331a6c4b0d51f1531d1be082b6425"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"asn1-rs",
|
"asn1-rs",
|
||||||
"data-encoding",
|
"data-encoding",
|
||||||
|
|||||||
46
Cargo.toml
46
Cargo.toml
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "aralez"
|
name = "aralez"
|
||||||
version = "0.9.1"
|
version = "0.9.2"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[profile.release]
|
[profile.release]
|
||||||
@@ -12,44 +12,44 @@ strip = true
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
tokio = { version = "1.45.1", features = ["full"] }
|
tokio = { version = "1.45.1", features = ["full"] }
|
||||||
#pingora = { version = "0.5.0", features = ["lb", "rustls"] } # openssl, rustls, boringssl
|
pingora = { version = "0.6.0", features = ["lb", "openssl"] } # openssl, rustls, boringssl
|
||||||
pingora = { version = "0.5.0", features = ["lb", "openssl"] } # openssl, rustls, boringssl
|
|
||||||
serde = { version = "1.0.219", features = ["derive"] }
|
serde = { version = "1.0.219", features = ["derive"] }
|
||||||
dashmap = "7.0.0-rc2"
|
dashmap = "7.0.0-rc2"
|
||||||
pingora-core = "0.5.0"
|
pingora-core = "0.6.0"
|
||||||
pingora-proxy = "0.5.0"
|
pingora-proxy = "0.6.0"
|
||||||
pingora-http = "0.5.0"
|
pingora-http = "0.6.0"
|
||||||
pingora-limits = "0.5.0"
|
pingora-limits = "0.6.0"
|
||||||
#pingora-pool = "0.5.0"
|
async-trait = "0.1.89"
|
||||||
async-trait = "0.1.88"
|
|
||||||
env_logger = "0.11.8"
|
env_logger = "0.11.8"
|
||||||
log = "0.4.27"
|
log = "0.4.28"
|
||||||
futures = "0.3.31"
|
futures = "0.3.31"
|
||||||
notify = "8.0.0"
|
notify = "8.2.0"
|
||||||
axum = { version = "0.8.4" }
|
axum = { version = "0.8.4" }
|
||||||
axum-server = { version = "0.7.2", features = ["tls-openssl"] }
|
axum-server = { version = "0.7.2", features = ["tls-openssl"] }
|
||||||
reqwest = { version = "0.12.20", features = ["json", "native-tls-alpn"] }
|
reqwest = { version = "0.12.23", features = ["json", "native-tls-alpn"] }
|
||||||
#reqwest = { version = "0.12.15", features = ["json", "rustls-tls"] }
|
#reqwest = { version = "0.12.15", features = ["json", "rustls-tls"] }
|
||||||
#reqwest = { version = "0.12.15", default-features = false, features = ["rustls-tls", "json"] }
|
#reqwest = { version = "0.12.15", default-features = false, features = ["rustls-tls", "json"] }
|
||||||
|
|
||||||
serde_yaml = "0.9.34-deprecated"
|
serde_yaml = "0.9.34-deprecated"
|
||||||
rand = "0.9.0"
|
rand = "0.9.2"
|
||||||
base64 = "0.22.1"
|
base64 = "0.22.1"
|
||||||
jsonwebtoken = "9.3.1"
|
jsonwebtoken = "9.3.1"
|
||||||
tonic = "0.13.1"
|
tonic = "0.14.2"
|
||||||
sha2 = { version = "0.11.0-rc.0", default-features = false }
|
sha2 = { version = "0.11.0-rc.2", default-features = false }
|
||||||
base16ct = { version = "0.2.0", features = ["alloc"] }
|
base16ct = { version = "0.3.0", features = ["alloc"] }
|
||||||
urlencoding = "2.1.3"
|
urlencoding = "2.1.3"
|
||||||
arc-swap = "1.7.1"
|
arc-swap = "1.7.1"
|
||||||
#rustls = { version = "0.23.27", features = ["ring"] }
|
mimalloc = { version = "0.1.48", default-features = false }
|
||||||
mimalloc = { version = "0.1.47", default-features = false }
|
|
||||||
prometheus = "0.14.0"
|
prometheus = "0.14.0"
|
||||||
lazy_static = "1.5.0"
|
lazy_static = "1.5.0"
|
||||||
#openssl = "0.10.73"
|
x509-parser = "0.18.0"
|
||||||
x509-parser = "0.17.0"
|
|
||||||
rustls-pemfile = "2.2.0"
|
rustls-pemfile = "2.2.0"
|
||||||
tower-http = { version = "0.6.6", features = ["fs"] }
|
tower-http = { version = "0.6.6", features = ["fs"] }
|
||||||
once_cell = "1.20.2"
|
once_cell = "1.21.3"
|
||||||
|
privdrop = "0.5.6"
|
||||||
|
ctrlc = "3.5.0"
|
||||||
|
port_check = "0.3.0"
|
||||||
#moka = { version = "0.12.10", features = ["sync"] }
|
#moka = { version = "0.12.10", features = ["sync"] }
|
||||||
|
#rustls = { version = "0.23.27", features = ["ring"] }
|
||||||
|
#hickory-client = { version = "0.25.2" }
|
||||||
|
#openssl = "0.10.73"
|
||||||
|
|||||||
120
METRICS.md
120
METRICS.md
@@ -1,120 +0,0 @@
|
|||||||
# 📈 Aralez Prometheus Metrics Reference
|
|
||||||
|
|
||||||
This document outlines Prometheus metrics for the [Aralez](https://github.com/sadoyan/aralez) reverse proxy.
|
|
||||||
These metrics can be used for monitoring, alerting and performance analysis.
|
|
||||||
|
|
||||||
Exposed to `http://config_address/metrics`
|
|
||||||
|
|
||||||
By default `http://127.0.0.1:3000/metrics`
|
|
||||||
|
|
||||||
# 📊 Example Grafana dashboard during stress test :
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 🛠️ Prometheus Metrics
|
|
||||||
|
|
||||||
### 1. `aralez_requests_total`
|
|
||||||
|
|
||||||
- **Type**: `Counter`
|
|
||||||
- **Purpose**: Total amount requests served by Aralez.
|
|
||||||
|
|
||||||
**PromQL example:**
|
|
||||||
|
|
||||||
```promql
|
|
||||||
rate(aralez_requests_total[5m])
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 2. `aralez_errors_total`
|
|
||||||
|
|
||||||
- **Type**: `Counter`
|
|
||||||
- **Purpose**: Count of requests that resulted in an error.
|
|
||||||
|
|
||||||
**PromQL example:**
|
|
||||||
|
|
||||||
```promql
|
|
||||||
rate(aralez_errors_total[5m])
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 3. `aralez_responses_total{status="200"}`
|
|
||||||
|
|
||||||
- **Type**: `CounterVec`
|
|
||||||
- **Purpose**: Count of responses by HTTP status code.
|
|
||||||
|
|
||||||
**PromQL example:**
|
|
||||||
|
|
||||||
```promql
|
|
||||||
rate(aralez_responses_total{status=~"5.."}[5m]) > 0
|
|
||||||
```
|
|
||||||
|
|
||||||
> Useful for alerting on 5xx errors.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 4. `aralez_response_latency_seconds`
|
|
||||||
|
|
||||||
- **Type**: `Histogram`
|
|
||||||
- **Purpose**: Tracks the latency of responses in seconds.
|
|
||||||
|
|
||||||
**Example bucket output:**
|
|
||||||
|
|
||||||
```prometheus
|
|
||||||
aralez_response_latency_seconds_bucket{le="0.01"} 15
|
|
||||||
aralez_response_latency_seconds_bucket{le="0.1"} 120
|
|
||||||
aralez_response_latency_seconds_bucket{le="0.25"} 245
|
|
||||||
aralez_response_latency_seconds_bucket{le="0.5"} 500
|
|
||||||
...
|
|
||||||
aralez_response_latency_seconds_count 1023
|
|
||||||
aralez_response_latency_seconds_sum 42.6
|
|
||||||
```
|
|
||||||
|
|
||||||
| Metric | Meaning |
|
|
||||||
|-------------------------|---------------------------------------------------------------|
|
|
||||||
| `bucket{le="0.1"} 120` | 120 requests were ≤ 100ms |
|
|
||||||
| `bucket{le="0.25"} 245` | 245 requests were ≤ 250ms |
|
|
||||||
| `count` | Total number of observations (i.e., total responses measured) |
|
|
||||||
| `sum` | Total time of all responses, in seconds |
|
|
||||||
|
|
||||||
### 🔍 How to interpret:
|
|
||||||
|
|
||||||
- `le` means “less than or equal to”.
|
|
||||||
- `count` is total amount of observations.
|
|
||||||
- `sum` is the total time (in seconds) of all responses.
|
|
||||||
|
|
||||||
**PromQL examples:**
|
|
||||||
|
|
||||||
🔹 **95th percentile latency**
|
|
||||||
|
|
||||||
```promql
|
|
||||||
histogram_quantile(0.95, rate(aralez_response_latency_seconds_bucket[5m]))
|
|
||||||
|
|
||||||
```
|
|
||||||
|
|
||||||
🔹 **Average latency**
|
|
||||||
|
|
||||||
```promql
|
|
||||||
rate(aralez_response_latency_seconds_sum[5m]) / rate(aralez_response_latency_seconds_count[5m])
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## ✅ Notes
|
|
||||||
|
|
||||||
- Metrics are registered after the first served request.
|
|
||||||
|
|
||||||
---
|
|
||||||
✅ Summary of key metrics
|
|
||||||
|
|
||||||
| Metric Name | Type | What it Tells You |
|
|
||||||
|---------------------------------------|------------|---------------------------|
|
|
||||||
| `aralez_requests_total` | Counter | Total requests served |
|
|
||||||
| `aralez_errors_total` | Counter | Number of failed requests |
|
|
||||||
| `aralez_responses_total{status="200"}` | CounterVec | Response status breakdown |
|
|
||||||
| `aralez_response_latency_seconds` | Histogram | How fast responses are |
|
|
||||||
|
|
||||||
📘 *Last updated: May 2025*
|
|
||||||
87
README.md
87
README.md
@@ -1,12 +1,18 @@
|
|||||||
|
|
||||||
|
|
||||||
# Aralez (Արալեզ), Reverse proxy and service mesh built on top of Cloudflare's Pingora
|
---
|
||||||
|
|
||||||
|
# Aralez (Արալեզ),
|
||||||
|
|
||||||
|
### **Reverse proxy and service mesh built on top of Cloudflare's Pingora**
|
||||||
|
|
||||||
What Aralez means ?
|
What Aralez means ?
|
||||||
**Aralez = Արալեզ** <ins>.Named after the legendary Armenian guardian spirit, winged dog-like creature, that descend upon fallen heroes to lick their wounds and resurrect them.</ins>.
|
**Aralez = Արալեզ** <ins>.Named after the legendary Armenian guardian spirit, winged dog-like creature, that descend upon fallen heroes to lick their wounds and resurrect them.</ins>.
|
||||||
|
|
||||||
Built on Rust, on top of **Cloudflare’s Pingora engine**, **Aralez** delivers world-class performance, security and scalability — right out of the box.
|
Built on Rust, on top of **Cloudflare’s Pingora engine**, **Aralez** delivers world-class performance, security and scalability — right out of the box.
|
||||||
|
|
||||||
|
[](https://www.buymeacoffee.com/sadoyan)
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## 🔧 Key Features
|
## 🔧 Key Features
|
||||||
@@ -66,31 +72,32 @@ Built on Rust, on top of **Cloudflare’s Pingora engine**, **Aralez** delivers
|
|||||||
|
|
||||||
### 🔧 `main.yaml`
|
### 🔧 `main.yaml`
|
||||||
|
|
||||||
| Key | Example Value | Description |
|
| Key | Example Value | Description |
|
||||||
|----------------------------------|--------------------------------------|--------------------------------------------------------------------------------------------------|
|
|----------------------------------|--------------------------------------|----------------------------------------------------------------------------------------------------|
|
||||||
| **threads** | 12 | Number of running daemon threads. Optional, defaults to 1 |
|
| **threads** | 12 | Number of running daemon threads. Optional, defaults to 1 |
|
||||||
| **user** | aralez | Optional, Username for running aralez after dropping root privileges, requires to launch as root |
|
| **runuser** | aralez | Optional, Username for running aralez after dropping root privileges, requires to launch as root |
|
||||||
| **group** | aralez | Optional,Group for running aralez after dropping root privileges, requires to launch as root |
|
| **rungroup** | aralez | Optional,Group for running aralez after dropping root privileges, requires to launch as root |
|
||||||
| **daemon** | false | Run in background (boolean) |
|
| **daemon** | false | Run in background (boolean) |
|
||||||
| **upstream_keepalive_pool_size** | 500 | Pool size for upstream keepalive connections |
|
| **upstream_keepalive_pool_size** | 500 | Pool size for upstream keepalive connections |
|
||||||
| **pid_file** | /tmp/aralez.pid | Path to PID file |
|
| **pid_file** | /tmp/aralez.pid | Path to PID file |
|
||||||
| **error_log** | /tmp/aralez_err.log | Path to error log file |
|
| **error_log** | /tmp/aralez_err.log | Path to error log file |
|
||||||
| **upgrade_sock** | /tmp/aralez.sock | Path to live upgrade socket file |
|
| **upgrade_sock** | /tmp/aralez.sock | Path to live upgrade socket file |
|
||||||
| **config_address** | 0.0.0.0:3000 | HTTP API address for pushing upstreams.yaml from remote location |
|
| **config_address** | 0.0.0.0:3000 | HTTP API address for pushing upstreams.yaml from remote location |
|
||||||
| **config_tls_address** | 0.0.0.0:3001 | HTTPS API address for pushing upstreams.yaml from remote location |
|
| **config_tls_address** | 0.0.0.0:3001 | HTTPS API address for pushing upstreams.yaml from remote location |
|
||||||
| **config_tls_certificate** | etc/server.crt | Certificate file path for API. Mandatory if proxy_address_tls is set, else optional |
|
| **config_tls_certificate** | etc/server.crt | Certificate file path for API. Mandatory if proxy_address_tls is set, else optional |
|
||||||
| **config_tls_key_file** | etc/key.pem | Private Key file path. Mandatory if proxy_address_tls is set, else optional |
|
| **proxy_tls_grade** | (high, medium, unsafe) | Grade of TLS ciphers, for easy configuration. High matches Qualys SSL Labs A+ (defaults to medium) |
|
||||||
| **proxy_address_http** | 0.0.0.0:6193 | Aralez HTTP bind address |
|
| **config_tls_key_file** | etc/key.pem | Private Key file path. Mandatory if proxy_address_tls is set, else optional |
|
||||||
| **proxy_address_tls** | 0.0.0.0:6194 | Aralez HTTPS bind address (Optional) |
|
| **proxy_address_http** | 0.0.0.0:6193 | Aralez HTTP bind address |
|
||||||
| **proxy_certificates** | etc/certs/ | The directory containing certificate and key files. In a format {NAME}.crt, {NAME}.key. |
|
| **proxy_address_tls** | 0.0.0.0:6194 | Aralez HTTPS bind address (Optional) |
|
||||||
| **upstreams_conf** | etc/upstreams.yaml | The location of upstreams file |
|
| **proxy_certificates** | etc/certs/ | The directory containing certificate and key files. In a format {NAME}.crt, {NAME}.key. |
|
||||||
| **log_level** | info | Log level , possible values : info, warn, error, debug, trace, off |
|
| **upstreams_conf** | etc/upstreams.yaml | The location of upstreams file |
|
||||||
| **hc_method** | HEAD | Healthcheck method (HEAD, GET, POST are supported) UPPERCASE |
|
| **log_level** | info | Log level , possible values : info, warn, error, debug, trace, off |
|
||||||
| **hc_interval** | 2 | Interval for health checks in seconds |
|
| **hc_method** | HEAD | Healthcheck method (HEAD, GET, POST are supported) UPPERCASE |
|
||||||
| **master_key** | 5aeff7f9-7b94-447c-af60-e8c488544a3e | Master key for working with API server and JWT Secret generation |
|
| **hc_interval** | 2 | Interval for health checks in seconds |
|
||||||
| **file_server_folder** | /some/local/folder | Optional, local folder to serve |
|
| **master_key** | 5aeff7f9-7b94-447c-af60-e8c488544a3e | Master key for working with API server and JWT Secret generation |
|
||||||
| **file_server_address** | 127.0.0.1:3002 | Optional, Local address for file server. Can set as upstream for public access |
|
| **file_server_folder** | /some/local/folder | Optional, local folder to serve |
|
||||||
| **config_api_enabled** | true | Boolean to enable/disable remote config push capability |
|
| **file_server_address** | 127.0.0.1:3002 | Optional, Local address for file server. Can set as upstream for public access |
|
||||||
|
| **config_api_enabled** | true | Boolean to enable/disable remote config push capability |
|
||||||
|
|
||||||
### 🌐 `upstreams.yaml`
|
### 🌐 `upstreams.yaml`
|
||||||
|
|
||||||
@@ -111,12 +118,23 @@ Make the binary executable `chmod 755 ./aralez-VERSION` and run.
|
|||||||
|
|
||||||
File names:
|
File names:
|
||||||
|
|
||||||
| File Name | Description |
|
| File Name | Description |
|
||||||
|---------------------------|---------------------------------------------------------------|
|
|---------------------------|--------------------------------------------------------------------------|
|
||||||
| `aralez-x86_64-musl.gz` | Static Linux x86_64 binary, without any system dependency |
|
| `aralez-x86_64-musl.gz` | Static Linux x86_64 binary, without any system dependency |
|
||||||
| `aralez-x86_64-glibc.gz` | Dynamic Linux x86_64 binary, with minimal system dependencies |
|
| `aralez-x86_64-glibc.gz` | Dynamic Linux x86_64 binary, with minimal system dependencies |
|
||||||
| `aralez-aarch64-musl.gz` | Static Linux ARM64 binary, without any system dependency |
|
| `aralez-aarch64-musl.gz` | Static Linux ARM64 binary, without any system dependency |
|
||||||
| `aralez-aarch64-glibc.gz` | Dynamic Linux ARM64 binary, with minimal system dependencies |
|
| `aralez-aarch64-glibc.gz` | Dynamic Linux ARM64 binary, with minimal system dependencies |
|
||||||
|
| `sadoyan/aralez` | Docker image on Debian 13 slim (https://hub.docker.com/r/sadoyan/aralez) |
|
||||||
|
|
||||||
|
**Via docker**
|
||||||
|
|
||||||
|
```shell
|
||||||
|
docker run -d \
|
||||||
|
-v /local/path/to/config:/etc/aralez:ro \
|
||||||
|
-p 80:80 \
|
||||||
|
-p 443:443 \
|
||||||
|
sadoyan/aralez
|
||||||
|
```
|
||||||
|
|
||||||
## 💡 Note
|
## 💡 Note
|
||||||
|
|
||||||
@@ -194,6 +212,10 @@ myhost.mydomain.com:
|
|||||||
servers:
|
servers:
|
||||||
- "127.0.0.4:8443"
|
- "127.0.0.4:8443"
|
||||||
- "127.0.0.5:8443"
|
- "127.0.0.5:8443"
|
||||||
|
"/.well-known/acme-challenge":
|
||||||
|
healthcheck: false
|
||||||
|
servers:
|
||||||
|
- "127.0.0.1:8001"
|
||||||
```
|
```
|
||||||
|
|
||||||
**This means:**
|
**This means:**
|
||||||
@@ -208,6 +230,7 @@ myhost.mydomain.com:
|
|||||||
- Requests to `myhost.mydomain.com/` will be proxied to `127.0.0.1` and `127.0.0.2`.
|
- Requests to `myhost.mydomain.com/` will be proxied to `127.0.0.1` and `127.0.0.2`.
|
||||||
- Plain HTTP to `myhost.mydomain.com/foo` will get 301 redirect to configured TLS port of Aralez.
|
- Plain HTTP to `myhost.mydomain.com/foo` will get 301 redirect to configured TLS port of Aralez.
|
||||||
- Requests to `myhost.mydomain.com/foo` will be proxied to `127.0.0.4` and `127.0.0.5`.
|
- Requests to `myhost.mydomain.com/foo` will be proxied to `127.0.0.4` and `127.0.0.5`.
|
||||||
|
- Requests to `myhost.mydomain.com/.well-known/acme-challenge` will be proxied to `127.0.0.1:8001`, but healthcheks are disabled.
|
||||||
- SSL/TLS for upstreams is detected automatically, no need to set any config parameter.
|
- SSL/TLS for upstreams is detected automatically, no need to set any config parameter.
|
||||||
- Assuming the `127.0.0.5:8443` is SSL protected. The inner traffic will use TLS.
|
- Assuming the `127.0.0.5:8443` is SSL protected. The inner traffic will use TLS.
|
||||||
- Self-signed certificates are silently accepted.
|
- Self-signed certificates are silently accepted.
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
# Main configuration file, applied on startup
|
# Main configuration file, applied on startup
|
||||||
threads: 12 # Number of daemon threads default setting
|
threads: 12 # Number of daemon threads default setting
|
||||||
#user: pastor # Username for running aralez after dropping root privileges, requires program to start as root
|
#runuser: pastor # Username for running aralez after dropping root privileges, requires program to start as root
|
||||||
#group: pastor # Group for running aralez after dropping root privileges, requires program to start as root
|
#rungroup: pastor # Group for running aralez after dropping root privileges, requires program to start as root
|
||||||
daemon: false # Run in background
|
daemon: false # Run in background
|
||||||
upstream_keepalive_pool_size: 500 # Pool size for upstream keepalive connections
|
upstream_keepalive_pool_size: 500 # Pool size for upstream keepalive connections
|
||||||
pid_file: /tmp/aralez.pid # Path to PID file
|
pid_file: /tmp/aralez.pid # Path to PID file
|
||||||
@@ -10,15 +10,16 @@ upgrade_sock: /tmp/aralez.sock # Path to socket file
|
|||||||
config_api_enabled: true # Boolean to enable/disable remote config push capability.
|
config_api_enabled: true # Boolean to enable/disable remote config push capability.
|
||||||
config_address: 0.0.0.0:3000 # HTTP API address for pushing upstreams.yaml from remote location
|
config_address: 0.0.0.0:3000 # HTTP API address for pushing upstreams.yaml from remote location
|
||||||
config_tls_address: 0.0.0.0:3001 # HTTP TLS API address for pushing upstreams.yaml from remote location
|
config_tls_address: 0.0.0.0:3001 # HTTP TLS API address for pushing upstreams.yaml from remote location
|
||||||
config_tls_certificate: /opt/Rust/Projects/asyncweb/etc/server.crt # Mandatory if config_tls_address is set
|
config_tls_certificate: /etc/server.crt # Mandatory if config_tls_address is set
|
||||||
config_tls_key_file: /opt/Rust/Projects/asyncweb/etc/key.pem # Mandatory if config_tls_address is set
|
config_tls_key_file: /etc/key.pem # Mandatory if config_tls_address is set
|
||||||
proxy_address_http: 0.0.0.0:6193 # Proxy HTTP bind address
|
proxy_address_http: 0.0.0.0:6193 # Proxy HTTP bind address
|
||||||
proxy_address_tls: 0.0.0.0:6194 # Optional, Proxy TLS bind address
|
proxy_address_tls: 0.0.0.0:6194 # Optional, Proxy TLS bind address
|
||||||
proxy_certificates: /opt/Rust/Projects/asyncweb/etc/yoyo # Mandatory if proxy_address_tls set, should contain certificate and key files strictly in a format {NAME}.crt, {NAME}.key.
|
proxy_certificates: /etc/certs # Mandatory if proxy_address_tls set, should contain a certificate and key files strictly in a format {NAME}.crt, {NAME}.key.
|
||||||
upstreams_conf: /opt/Rust/Projects/asyncweb/etc/upstreams.yaml # the location of upstreams file
|
proxy_tls_grade: a+ # Grade of TLS suite for proxy (a+, a, b, c, unsafe), matching grades of Qualys SSL Labs
|
||||||
|
upstreams_conf: /etc/upstreams.yaml # the location of upstreams file
|
||||||
file_server_folder: /opt/storage # Optional, local folder to serve
|
file_server_folder: /opt/storage # Optional, local folder to serve
|
||||||
file_server_address: 127.0.0.1:3002 # Optional, Local address for file server. Can set as upstream for public access.
|
file_server_address: 127.0.0.1:3002 # Optional, Local address for file server. Can set as upstream for public access.
|
||||||
log_level: info # info, warn, error, debug, trace, off
|
log_level: info # info, warn, error, debug, trace, off
|
||||||
hc_method: HEAD # Healthcheck method (HEAD, GET, POST are supported) UPPERCASE
|
hc_method: HEAD # Healthcheck method (HEAD, GET, POST are supported) UPPERCASE
|
||||||
hc_interval: 2 #Interval for health checks in seconds
|
hc_interval: 2 #Interval for health checks in seconds
|
||||||
master_key: 910517d9-f9a1-48de-8826-dbadacbd84af-cb6f830e-ab16-47ec-9d8f-0090de732774 # Mater key for working with API server and JWT Secret
|
master_key: 910517d9-f9a1-48de-8826-dbadacbd84af-cb6f830e-ab16-47ec-9d8f-0090de732774 # Mater key for working with API server and JWT Secret
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
# The file under watch and hot reload, changes are applied immediately, no need to restart or reload.
|
# The file under watch and hot reload, changes are applied immediately, no need to restart or reload.
|
||||||
provider: "file" # consul
|
provider: "file" # consul, kubernetes
|
||||||
sticky_sessions: false
|
sticky_sessions: false
|
||||||
to_ssl: false
|
to_ssl: false
|
||||||
#rate_limit: 100
|
#rate_limit: 100
|
||||||
@@ -24,6 +24,19 @@ consul: # If the provider is consul. Otherwise, ignored.
|
|||||||
- proxy: "proxy-frontend-dev-frontend-srv"
|
- proxy: "proxy-frontend-dev-frontend-srv"
|
||||||
real: "frontend-dev-frontend-srv"
|
real: "frontend-dev-frontend-srv"
|
||||||
token: "8e2db809-845b-45e1-8b47-2c8356a09da0-a4370955-18c2-4d6e-a8f8-ffcc0b47be81" # Consul server access token, If Consul auth is enabled
|
token: "8e2db809-845b-45e1-8b47-2c8356a09da0-a4370955-18c2-4d6e-a8f8-ffcc0b47be81" # Consul server access token, If Consul auth is enabled
|
||||||
|
kubernetes:
|
||||||
|
servers:
|
||||||
|
- "172.16.0.11:5443" # KUBERNETES_SERVICE_HOST : KUBERNETES_SERVICE_PORT_HTTPS
|
||||||
|
services:
|
||||||
|
- proxy: "api-service"
|
||||||
|
real: "api-service"
|
||||||
|
path: "/"
|
||||||
|
- proxy: "api-service"
|
||||||
|
real: "search-service"
|
||||||
|
path: "/search"
|
||||||
|
- proxy: "websocket-service"
|
||||||
|
real: "websocket-service"
|
||||||
|
tokenpath: "/tmp/token.txt" # /var/run/secrets/kubernetes.io/serviceaccount/token
|
||||||
upstreams:
|
upstreams:
|
||||||
myip.mydomain.com:
|
myip.mydomain.com:
|
||||||
paths:
|
paths:
|
||||||
@@ -54,9 +67,11 @@ upstreams:
|
|||||||
headers:
|
headers:
|
||||||
- "X-Some-Thing:Yaaaaaaaaaaaaaaa"
|
- "X-Some-Thing:Yaaaaaaaaaaaaaaa"
|
||||||
servers:
|
servers:
|
||||||
- "192.168.1.1:8000"
|
|
||||||
- "192.168.1.10:8000"
|
|
||||||
- "127.0.0.1:8000"
|
- "127.0.0.1:8000"
|
||||||
- "127.0.0.2:8000"
|
- "127.0.0.2:8000"
|
||||||
- "127.0.0.3:8000"
|
- "127.0.0.3:8000"
|
||||||
- "127.0.0.4:8000"
|
- "127.0.0.4:8000"
|
||||||
|
"/.well-known/acme-challenge":
|
||||||
|
healthcheck: false
|
||||||
|
servers:
|
||||||
|
- "127.0.0.1:8001"
|
||||||
@@ -1,11 +1,14 @@
|
|||||||
pub mod auth;
|
pub mod auth;
|
||||||
pub mod consul;
|
pub mod consul;
|
||||||
pub mod discovery;
|
pub mod discovery;
|
||||||
|
pub mod dnsclient;
|
||||||
mod filewatch;
|
mod filewatch;
|
||||||
pub mod healthcheck;
|
pub mod healthcheck;
|
||||||
pub mod jwt;
|
pub mod jwt;
|
||||||
|
pub mod kuber;
|
||||||
pub mod metrics;
|
pub mod metrics;
|
||||||
pub mod parceyaml;
|
pub mod parceyaml;
|
||||||
|
pub mod state;
|
||||||
pub mod structs;
|
pub mod structs;
|
||||||
pub mod tls;
|
pub mod tls;
|
||||||
pub mod tools;
|
pub mod tools;
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
use crate::utils::parceyaml::load_configuration;
|
|
||||||
use crate::utils::structs::{Configuration, InnerMap, ServiceMapping, UpstreamsDashMap};
|
use crate::utils::structs::{Configuration, InnerMap, ServiceMapping, UpstreamsDashMap};
|
||||||
use crate::utils::tools::{clone_dashmap_into, compare_dashmaps};
|
use crate::utils::tools::{clone_dashmap_into, compare_dashmaps, print_upstreams};
|
||||||
use dashmap::DashMap;
|
use dashmap::DashMap;
|
||||||
use futures::channel::mpsc::Sender;
|
use futures::channel::mpsc::Sender;
|
||||||
use futures::SinkExt;
|
use futures::SinkExt;
|
||||||
@@ -11,6 +10,7 @@ use reqwest::header::{HeaderMap, HeaderValue};
|
|||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
use std::sync::atomic::AtomicUsize;
|
use std::sync::atomic::AtomicUsize;
|
||||||
|
use std::sync::Arc;
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
|
|
||||||
#[derive(Debug, Deserialize)]
|
#[derive(Debug, Deserialize)]
|
||||||
@@ -27,59 +27,53 @@ struct TaggedAddress {
|
|||||||
port: u16,
|
port: u16,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn start(fp: String, mut toreturn: Sender<Configuration>) {
|
pub async fn start(mut toreturn: Sender<Configuration>, config: Arc<Configuration>) {
|
||||||
let config = load_configuration(fp.as_str(), "filepath");
|
|
||||||
let headers = DashMap::new();
|
let headers = DashMap::new();
|
||||||
match config {
|
info!("Consul Discovery is enabled : {}", config.typecfg);
|
||||||
Some(config) => {
|
let consul = config.consul.clone();
|
||||||
if config.typecfg.to_string() != "consul" {
|
let prev_upstreams = UpstreamsDashMap::new();
|
||||||
info!("Not running Consul discovery, requested type is: {}", config.typecfg);
|
match consul {
|
||||||
return;
|
Some(consul) => {
|
||||||
}
|
let servers = consul.servers.unwrap();
|
||||||
|
info!("Consul Servers => {:?}", servers);
|
||||||
|
let end = servers.len() - 1;
|
||||||
|
|
||||||
info!("Consul Discovery is enabled : {}", config.typecfg);
|
loop {
|
||||||
let consul = config.consul.clone();
|
let mut num = 0;
|
||||||
let prev_upstreams = UpstreamsDashMap::new();
|
if end > 0 {
|
||||||
match consul {
|
num = rand::rng().random_range(0..end);
|
||||||
Some(consul) => {
|
|
||||||
let servers = consul.servers.unwrap();
|
|
||||||
info!("Consul Servers => {:?}", servers);
|
|
||||||
let end = servers.len();
|
|
||||||
|
|
||||||
loop {
|
|
||||||
let num = rand::rng().random_range(1..end);
|
|
||||||
headers.clear();
|
|
||||||
for (k, v) in config.headers.clone() {
|
|
||||||
headers.insert(k.to_string(), v);
|
|
||||||
}
|
|
||||||
let consul_data = servers.get(num).unwrap().to_string();
|
|
||||||
let upstreams = consul_request(consul_data, consul.services.clone(), consul.token.clone());
|
|
||||||
match upstreams.await {
|
|
||||||
Some(upstreams) => {
|
|
||||||
if !compare_dashmaps(&upstreams, &prev_upstreams) {
|
|
||||||
let mut tosend: Configuration = Configuration {
|
|
||||||
upstreams: Default::default(),
|
|
||||||
headers: Default::default(),
|
|
||||||
consul: None,
|
|
||||||
typecfg: "".to_string(),
|
|
||||||
extraparams: config.extraparams.clone(),
|
|
||||||
};
|
|
||||||
|
|
||||||
clone_dashmap_into(&upstreams, &prev_upstreams);
|
|
||||||
clone_dashmap_into(&upstreams, &tosend.upstreams);
|
|
||||||
tosend.headers = headers.clone();
|
|
||||||
tosend.extraparams.authentication = config.extraparams.authentication.clone();
|
|
||||||
tosend.typecfg = config.typecfg.clone();
|
|
||||||
tosend.consul = config.consul.clone();
|
|
||||||
toreturn.send(tosend).await.unwrap();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
None => {}
|
|
||||||
}
|
|
||||||
sleep(Duration::from_secs(5)).await;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
None => {}
|
headers.clear();
|
||||||
|
for (k, v) in config.headers.clone() {
|
||||||
|
headers.insert(k.to_string(), v);
|
||||||
|
}
|
||||||
|
let consul_data = servers.get(num).unwrap().to_string();
|
||||||
|
let upstreams = consul_request(consul_data, consul.services.clone(), consul.token.clone());
|
||||||
|
match upstreams.await {
|
||||||
|
Some(upstreams) => {
|
||||||
|
if !compare_dashmaps(&upstreams, &prev_upstreams) {
|
||||||
|
let mut tosend: Configuration = Configuration {
|
||||||
|
upstreams: Default::default(),
|
||||||
|
headers: Default::default(),
|
||||||
|
consul: None,
|
||||||
|
kubernetes: None,
|
||||||
|
typecfg: "".to_string(),
|
||||||
|
extraparams: config.extraparams.clone(),
|
||||||
|
};
|
||||||
|
|
||||||
|
clone_dashmap_into(&upstreams, &prev_upstreams);
|
||||||
|
clone_dashmap_into(&upstreams, &tosend.upstreams);
|
||||||
|
tosend.headers = headers.clone();
|
||||||
|
tosend.extraparams.authentication = config.extraparams.authentication.clone();
|
||||||
|
tosend.typecfg = config.typecfg.clone();
|
||||||
|
tosend.consul = config.consul.clone();
|
||||||
|
print_upstreams(&tosend.upstreams);
|
||||||
|
toreturn.send(tosend).await.unwrap();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
None => {}
|
||||||
|
}
|
||||||
|
sleep(Duration::from_secs(5)).await;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
None => {}
|
None => {}
|
||||||
@@ -134,6 +128,7 @@ async fn get_by_http(url: String, token: Option<String>) -> Option<DashMap<Strin
|
|||||||
is_http2: false,
|
is_http2: false,
|
||||||
to_https: false,
|
to_https: false,
|
||||||
rate_limit: None,
|
rate_limit: None,
|
||||||
|
healthcheck: None,
|
||||||
};
|
};
|
||||||
values.push(to_add);
|
values.push(to_add);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,13 +1,11 @@
|
|||||||
use crate::utils::consul;
|
|
||||||
use crate::utils::filewatch;
|
use crate::utils::filewatch;
|
||||||
use crate::utils::structs::Configuration;
|
use crate::utils::structs::Configuration;
|
||||||
|
use crate::utils::{consul, kuber};
|
||||||
use crate::web::webserver;
|
use crate::web::webserver;
|
||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
use futures::channel::mpsc::Sender;
|
use futures::channel::mpsc::Sender;
|
||||||
|
use std::sync::Arc;
|
||||||
|
|
||||||
pub struct FromFileProvider {
|
|
||||||
pub path: String,
|
|
||||||
}
|
|
||||||
pub struct APIUpstreamProvider {
|
pub struct APIUpstreamProvider {
|
||||||
pub config_api_enabled: bool,
|
pub config_api_enabled: bool,
|
||||||
pub address: String,
|
pub address: String,
|
||||||
@@ -19,15 +17,6 @@ pub struct APIUpstreamProvider {
|
|||||||
pub file_server_folder: Option<String>,
|
pub file_server_folder: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct ConsulProvider {
|
|
||||||
pub path: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[async_trait]
|
|
||||||
pub trait Discovery {
|
|
||||||
async fn start(&self, tx: Sender<Configuration>);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
impl Discovery for APIUpstreamProvider {
|
impl Discovery for APIUpstreamProvider {
|
||||||
async fn start(&self, toreturn: Sender<Configuration>) {
|
async fn start(&self, toreturn: Sender<Configuration>) {
|
||||||
@@ -35,6 +24,23 @@ impl Discovery for APIUpstreamProvider {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub struct FromFileProvider {
|
||||||
|
pub path: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct ConsulProvider {
|
||||||
|
pub config: Arc<Configuration>,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct KubernetesProvider {
|
||||||
|
pub config: Arc<Configuration>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[async_trait]
|
||||||
|
pub trait Discovery {
|
||||||
|
async fn start(&self, tx: Sender<Configuration>);
|
||||||
|
}
|
||||||
|
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
impl Discovery for FromFileProvider {
|
impl Discovery for FromFileProvider {
|
||||||
async fn start(&self, tx: Sender<Configuration>) {
|
async fn start(&self, tx: Sender<Configuration>) {
|
||||||
@@ -45,6 +51,13 @@ impl Discovery for FromFileProvider {
|
|||||||
#[async_trait]
|
#[async_trait]
|
||||||
impl Discovery for ConsulProvider {
|
impl Discovery for ConsulProvider {
|
||||||
async fn start(&self, tx: Sender<Configuration>) {
|
async fn start(&self, tx: Sender<Configuration>) {
|
||||||
tokio::spawn(consul::start(self.path.clone(), tx.clone()));
|
tokio::spawn(consul::start(tx.clone(), self.config.clone()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[async_trait]
|
||||||
|
impl Discovery for KubernetesProvider {
|
||||||
|
async fn start(&self, tx: Sender<Configuration>) {
|
||||||
|
tokio::spawn(kuber::start(tx.clone(), self.config.clone()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
158
src/utils/dnsclient.rs
Normal file
158
src/utils/dnsclient.rs
Normal file
@@ -0,0 +1,158 @@
|
|||||||
|
/*
|
||||||
|
use crate::utils::structs::InnerMap;
|
||||||
|
use dashmap::DashMap;
|
||||||
|
use hickory_client::client::{Client, ClientHandle};
|
||||||
|
use hickory_client::proto::rr::{DNSClass, Name, RecordType};
|
||||||
|
use hickory_client::proto::runtime::TokioRuntimeProvider;
|
||||||
|
use hickory_client::proto::udp::UdpClientStream;
|
||||||
|
use std::net::SocketAddr;
|
||||||
|
use std::str::FromStr;
|
||||||
|
use std::sync::atomic::AtomicUsize;
|
||||||
|
use std::time::Duration;
|
||||||
|
use tokio::sync::Mutex;
|
||||||
|
|
||||||
|
type DnsError = Box<dyn std::error::Error + Send + Sync + 'static>;
|
||||||
|
|
||||||
|
pub struct DnsClientPool {
|
||||||
|
clients: Vec<Mutex<DnsClient>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
struct DnsClient {
|
||||||
|
client: Client,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn start2(mut toreturn: Sender<Configuration>, config: Arc<Configuration>) {
|
||||||
|
let k8s = config.kubernetes.clone();
|
||||||
|
match k8s {
|
||||||
|
Some(k8s) => {
|
||||||
|
let dnserver = k8s.servers.unwrap_or(vec!["127.0.0.1:53".to_string()]);
|
||||||
|
let headers = DashMap::new();
|
||||||
|
let end = dnserver.len() - 1;
|
||||||
|
let mut num = 0;
|
||||||
|
if end > 0 {
|
||||||
|
num = rand::rng().random_range(0..end);
|
||||||
|
}
|
||||||
|
let srv = dnserver.get(num).unwrap().to_string();
|
||||||
|
let pool = DnsClientPool::new(5, srv.clone()).await;
|
||||||
|
let u = UpstreamsDashMap::new();
|
||||||
|
if let Some(whitelist) = k8s.services {
|
||||||
|
loop {
|
||||||
|
let upstreams = UpstreamsDashMap::new();
|
||||||
|
for service in whitelist.iter() {
|
||||||
|
let ret = pool.query_srv(service.real.as_str(), srv.clone()).await;
|
||||||
|
match ret {
|
||||||
|
Ok(r) => {
|
||||||
|
upstreams.insert(service.proxy.clone(), r);
|
||||||
|
}
|
||||||
|
Err(e) => eprintln!("DNS query failed for {:?}: {:?}", service, e),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !compare_dashmaps(&u, &upstreams) {
|
||||||
|
headers.clear();
|
||||||
|
for (k, v) in config.headers.clone() {
|
||||||
|
headers.insert(k.to_string(), v);
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut tosend: Configuration = Configuration {
|
||||||
|
upstreams: Default::default(),
|
||||||
|
headers: Default::default(),
|
||||||
|
consul: None,
|
||||||
|
kubernetes: None,
|
||||||
|
typecfg: "".to_string(),
|
||||||
|
extraparams: config.extraparams.clone(),
|
||||||
|
};
|
||||||
|
|
||||||
|
clone_dashmap_into(&upstreams, &u);
|
||||||
|
clone_dashmap_into(&upstreams, &tosend.upstreams);
|
||||||
|
tosend.headers = headers.clone();
|
||||||
|
tosend.extraparams.authentication = config.extraparams.authentication.clone();
|
||||||
|
tosend.typecfg = config.typecfg.clone();
|
||||||
|
tosend.consul = config.consul.clone();
|
||||||
|
print_upstreams(&tosend.upstreams);
|
||||||
|
toreturn.send(tosend).await.unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
|
tokio::time::sleep(Duration::from_secs(1)).await;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
None => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl DnsClient {
|
||||||
|
pub async fn new(server: String) -> Result<Self, DnsError> {
|
||||||
|
let server_details = server;
|
||||||
|
let server: SocketAddr = server_details.parse().expect("Unable to parse socket address");
|
||||||
|
let conn = UdpClientStream::builder(server, TokioRuntimeProvider::default()).build();
|
||||||
|
let (client, bg) = Client::connect(conn).await.unwrap();
|
||||||
|
tokio::spawn(bg);
|
||||||
|
Ok(Self { client })
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn query_srv(&mut self, name: &str) -> Result<DashMap<String, (Vec<InnerMap>, AtomicUsize)>, DnsError> {
|
||||||
|
let upstreams: DashMap<String, (Vec<InnerMap>, AtomicUsize)> = DashMap::new();
|
||||||
|
let mut values = Vec::new();
|
||||||
|
match tokio::time::timeout(Duration::from_secs(5), self.client.query(Name::from_str(name)?, DNSClass::IN, RecordType::SRV)).await {
|
||||||
|
Ok(Ok(response)) => {
|
||||||
|
for answer in response.answers() {
|
||||||
|
if let hickory_client::proto::rr::RData::SRV(srv) = answer.data() {
|
||||||
|
let to_add = InnerMap {
|
||||||
|
address: srv.target().to_string(),
|
||||||
|
port: srv.port(),
|
||||||
|
is_ssl: false,
|
||||||
|
is_http2: false,
|
||||||
|
to_https: false,
|
||||||
|
rate_limit: None,
|
||||||
|
};
|
||||||
|
values.push(to_add);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
upstreams.insert("/".to_string(), (values, AtomicUsize::new(0)));
|
||||||
|
Ok(upstreams)
|
||||||
|
}
|
||||||
|
Ok(Err(e)) => Err(Box::new(e)),
|
||||||
|
Err(_) => Err("DNS query timed out".into()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl DnsClientPool {
|
||||||
|
pub async fn new(pool_size: usize, server: String) -> Self {
|
||||||
|
let mut clients = Vec::with_capacity(pool_size);
|
||||||
|
for _ in 0..pool_size {
|
||||||
|
if let Ok(client) = DnsClient::new(server.clone()).await {
|
||||||
|
clients.push(Mutex::new(client));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Self { clients }
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn query_srv(&self, name: &str, server: String) -> Result<DashMap<String, (Vec<InnerMap>, AtomicUsize)>, DnsError> {
|
||||||
|
// Try to get an available client
|
||||||
|
for client_mutex in &self.clients {
|
||||||
|
if let Ok(mut client) = client_mutex.try_lock() {
|
||||||
|
let vay = client.query_srv(name).await;
|
||||||
|
match vay {
|
||||||
|
Ok(_) => return vay,
|
||||||
|
Err(_) => {
|
||||||
|
// If query fails, drop this client and create a new one
|
||||||
|
*client = match DnsClient::new(server).await {
|
||||||
|
Ok(c) => c,
|
||||||
|
Err(e) => return Err(e),
|
||||||
|
};
|
||||||
|
// Retry with the new client
|
||||||
|
return client.query_srv(name).await;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// If all clients are busy, wait for the first one with a timeout
|
||||||
|
match tokio::time::timeout(Duration::from_secs(2), self.clients[0].lock()).await {
|
||||||
|
Ok(mut client) => client.query_srv(name).await,
|
||||||
|
Err(_) => Err("All DNS clients are busy and timeout reached".into()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
*/
|
||||||
@@ -2,7 +2,7 @@ use crate::utils::parceyaml::load_configuration;
|
|||||||
use crate::utils::structs::Configuration;
|
use crate::utils::structs::Configuration;
|
||||||
use futures::channel::mpsc::Sender;
|
use futures::channel::mpsc::Sender;
|
||||||
use futures::SinkExt;
|
use futures::SinkExt;
|
||||||
use log::{error, info, warn};
|
use log::error;
|
||||||
use notify::event::ModifyKind;
|
use notify::event::ModifyKind;
|
||||||
use notify::{Config, Event, EventKind, RecommendedWatcher, RecursiveMode, Watcher};
|
use notify::{Config, Event, EventKind, RecommendedWatcher, RecursiveMode, Watcher};
|
||||||
use pingora::prelude::sleep;
|
use pingora::prelude::sleep;
|
||||||
@@ -15,19 +15,7 @@ pub async fn start(fp: String, mut toreturn: Sender<Configuration>) {
|
|||||||
let file_path = fp.as_str();
|
let file_path = fp.as_str();
|
||||||
let parent_dir = Path::new(file_path).parent().unwrap();
|
let parent_dir = Path::new(file_path).parent().unwrap();
|
||||||
let (local_tx, mut local_rx) = tokio::sync::mpsc::channel::<notify::Result<Event>>(1);
|
let (local_tx, mut local_rx) = tokio::sync::mpsc::channel::<notify::Result<Event>>(1);
|
||||||
let snd = load_configuration(file_path, "filepath");
|
|
||||||
|
|
||||||
match snd {
|
|
||||||
Some(snd) => {
|
|
||||||
if snd.typecfg != "file" {
|
|
||||||
warn!("Disabling file watcher, requested discovery type is: {}", snd.typecfg);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
info!("Watching for changes in {:?}", parent_dir);
|
|
||||||
toreturn.send(snd).await.unwrap();
|
|
||||||
}
|
|
||||||
None => {}
|
|
||||||
}
|
|
||||||
let _watcher_handle = task::spawn_blocking({
|
let _watcher_handle = task::spawn_blocking({
|
||||||
let parent_dir = parent_dir.to_path_buf(); // Move directory path into the closure
|
let parent_dir = parent_dir.to_path_buf(); // Move directory path into the closure
|
||||||
move || {
|
move || {
|
||||||
@@ -53,7 +41,7 @@ pub async fn start(fp: String, mut toreturn: Sender<Configuration>) {
|
|||||||
if start.elapsed() > Duration::from_secs(2) {
|
if start.elapsed() > Duration::from_secs(2) {
|
||||||
start = Instant::now();
|
start = Instant::now();
|
||||||
// info!("Config File changed :=> {:?}", e);
|
// info!("Config File changed :=> {:?}", e);
|
||||||
let snd = load_configuration(file_path, "filepath");
|
let snd = load_configuration(file_path, "filepath").await;
|
||||||
match snd {
|
match snd {
|
||||||
Some(snd) => {
|
Some(snd) => {
|
||||||
toreturn.send(snd).await.unwrap();
|
toreturn.send(snd).await.unwrap();
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
use crate::utils::structs::{InnerMap, UpstreamsDashMap, UpstreamsIdMap};
|
use crate::utils::structs::{InnerMap, UpstreamsDashMap, UpstreamsIdMap};
|
||||||
use crate::utils::tools::*;
|
use crate::utils::tools::*;
|
||||||
use dashmap::DashMap;
|
use dashmap::DashMap;
|
||||||
use log::{error, info, warn};
|
use log::{error, warn};
|
||||||
use reqwest::{Client, Version};
|
use reqwest::{Client, Version};
|
||||||
use std::sync::atomic::AtomicUsize;
|
use std::sync::atomic::AtomicUsize;
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
@@ -9,87 +9,93 @@ use std::time::Duration;
|
|||||||
use tokio::time::interval;
|
use tokio::time::interval;
|
||||||
use tonic::transport::Endpoint;
|
use tonic::transport::Endpoint;
|
||||||
|
|
||||||
#[allow(unused_assignments)]
|
|
||||||
pub async fn hc2(upslist: Arc<UpstreamsDashMap>, fullist: Arc<UpstreamsDashMap>, idlist: Arc<UpstreamsIdMap>, params: (&str, u64)) {
|
pub async fn hc2(upslist: Arc<UpstreamsDashMap>, fullist: Arc<UpstreamsDashMap>, idlist: Arc<UpstreamsIdMap>, params: (&str, u64)) {
|
||||||
let mut period = interval(Duration::from_secs(params.1));
|
let mut period = interval(Duration::from_secs(params.1));
|
||||||
let mut first_run = 0;
|
let client = Client::builder().timeout(Duration::from_secs(params.1)).danger_accept_invalid_certs(true).build().unwrap();
|
||||||
let client = Client::builder().timeout(Duration::from_secs(2)).danger_accept_invalid_certs(true).build().unwrap();
|
|
||||||
loop {
|
loop {
|
||||||
tokio::select! {
|
tokio::select! {
|
||||||
_ = period.tick() => {
|
_ = period.tick() => {
|
||||||
let totest : UpstreamsDashMap = DashMap::new();
|
populate_upstreams(&upslist, &fullist, &idlist, params, &client).await;
|
||||||
let fclone : UpstreamsDashMap = clone_dashmap(&fullist);
|
|
||||||
for val in fclone.iter() {
|
|
||||||
let host = val.key();
|
|
||||||
let inner = DashMap::new();
|
|
||||||
let mut scheme = InnerMap::new();
|
|
||||||
for path_entry in val.value().iter() {
|
|
||||||
let path = path_entry.key();
|
|
||||||
let mut innervec= Vec::new();
|
|
||||||
for k in path_entry.value().0 .iter().enumerate() {
|
|
||||||
let mut _link = String::new();
|
|
||||||
let tls = detect_tls(k.1.address.as_str(), &k.1.port, &client).await;
|
|
||||||
let mut is_h2 = false;
|
|
||||||
|
|
||||||
if tls.1 == Some(Version::HTTP_2) {
|
|
||||||
is_h2 = true;
|
|
||||||
}
|
|
||||||
match tls.0 {
|
|
||||||
true => _link = format!("https://{}:{}{}", k.1.address, k.1.port, path),
|
|
||||||
false => _link = format!("http://{}:{}{}", k.1.address, k.1.port, path),
|
|
||||||
}
|
|
||||||
scheme = InnerMap {
|
|
||||||
address: k.1.address.clone(),
|
|
||||||
port: k.1.port,
|
|
||||||
is_ssl: tls.0,
|
|
||||||
is_http2: is_h2,
|
|
||||||
to_https: k.1.to_https,
|
|
||||||
rate_limit: k.1.rate_limit,
|
|
||||||
};
|
|
||||||
let resp = http_request(_link.as_str(), params.0, "", &client).await;
|
|
||||||
match resp.0 {
|
|
||||||
true => {
|
|
||||||
if resp.1 {
|
|
||||||
scheme = InnerMap {
|
|
||||||
address: k.1.address.clone(),
|
|
||||||
port: k.1.port,
|
|
||||||
is_ssl: tls.0,
|
|
||||||
is_http2: is_h2,
|
|
||||||
to_https: k.1.to_https,
|
|
||||||
rate_limit: k.1.rate_limit,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
innervec.push(scheme);
|
|
||||||
}
|
|
||||||
false => {
|
|
||||||
warn!("Dead Upstream : {}", _link);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
inner.insert(path.clone().to_owned(), (innervec, AtomicUsize::new(0)));
|
|
||||||
}
|
|
||||||
totest.insert(host.clone(), inner);
|
|
||||||
}
|
|
||||||
|
|
||||||
if first_run == 1 {
|
|
||||||
info!("Performing initial hatchecks and upstreams ssl detection");
|
|
||||||
clone_idmap_into(&totest, &idlist);
|
|
||||||
info!("Aralez is up and ready to serve requests, the upstreams list is:");
|
|
||||||
print_upstreams(&totest)
|
|
||||||
}
|
|
||||||
|
|
||||||
first_run+=1;
|
|
||||||
|
|
||||||
if ! compare_dashmaps(&totest, &upslist){
|
|
||||||
clone_dashmap_into(&totest, &upslist);
|
|
||||||
clone_idmap_into(&totest, &idlist);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub async fn populate_upstreams(upslist: &Arc<UpstreamsDashMap>, fullist: &Arc<UpstreamsDashMap>, idlist: &Arc<UpstreamsIdMap>, params: (&str, u64), client: &Client) {
|
||||||
|
let totest = build_upstreams(fullist, params.0, client).await;
|
||||||
|
if !compare_dashmaps(&totest, upslist) {
|
||||||
|
clone_dashmap_into(&totest, upslist);
|
||||||
|
clone_idmap_into(&totest, idlist);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn initiate_upstreams(fullist: UpstreamsDashMap) -> UpstreamsDashMap {
|
||||||
|
let client = Client::builder().timeout(Duration::from_secs(2)).danger_accept_invalid_certs(true).build().unwrap();
|
||||||
|
build_upstreams(&fullist, "HEAD", &client).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn build_upstreams(fullist: &UpstreamsDashMap, method: &str, client: &Client) -> UpstreamsDashMap {
|
||||||
|
let totest: UpstreamsDashMap = DashMap::new();
|
||||||
|
let fclone = clone_dashmap(fullist);
|
||||||
|
for val in fclone.iter() {
|
||||||
|
let host = val.key();
|
||||||
|
let inner = DashMap::new();
|
||||||
|
|
||||||
|
for path_entry in val.value().iter() {
|
||||||
|
let path = path_entry.key();
|
||||||
|
let mut innervec = Vec::new();
|
||||||
|
|
||||||
|
for (_, upstream) in path_entry.value().0.iter().enumerate() {
|
||||||
|
let tls = detect_tls(upstream.address.as_str(), &upstream.port, &client).await;
|
||||||
|
let is_h2 = matches!(tls.1, Some(Version::HTTP_2));
|
||||||
|
|
||||||
|
let link = if tls.0 {
|
||||||
|
format!("https://{}:{}{}", upstream.address, upstream.port, path)
|
||||||
|
} else {
|
||||||
|
format!("http://{}:{}{}", upstream.address, upstream.port, path)
|
||||||
|
};
|
||||||
|
|
||||||
|
let mut scheme = InnerMap {
|
||||||
|
address: upstream.address.clone(),
|
||||||
|
port: upstream.port,
|
||||||
|
is_ssl: tls.0,
|
||||||
|
is_http2: is_h2,
|
||||||
|
to_https: upstream.to_https,
|
||||||
|
rate_limit: upstream.rate_limit,
|
||||||
|
healthcheck: upstream.healthcheck,
|
||||||
|
};
|
||||||
|
|
||||||
|
if scheme.healthcheck.unwrap_or(true) {
|
||||||
|
let resp = http_request(&link, method, "", &client).await;
|
||||||
|
if resp.0 {
|
||||||
|
if resp.1 {
|
||||||
|
scheme.is_http2 = is_h2; // could be adjusted further
|
||||||
|
}
|
||||||
|
innervec.push(scheme);
|
||||||
|
} else {
|
||||||
|
warn!("Dead Upstream : {}", link);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
innervec.push(scheme);
|
||||||
|
}
|
||||||
|
|
||||||
|
// let resp = http_request(&link, method, "", &client).await;
|
||||||
|
// if resp.0 {
|
||||||
|
// if resp.1 {
|
||||||
|
// scheme.is_http2 = is_h2; // could be adjusted further
|
||||||
|
// }
|
||||||
|
// innervec.push(scheme);
|
||||||
|
// } else {
|
||||||
|
// warn!("Dead Upstream : {}", link);
|
||||||
|
// }
|
||||||
|
}
|
||||||
|
inner.insert(path.clone(), (innervec, AtomicUsize::new(0)));
|
||||||
|
}
|
||||||
|
totest.insert(host.clone(), inner);
|
||||||
|
}
|
||||||
|
totest
|
||||||
|
}
|
||||||
|
|
||||||
async fn http_request(url: &str, method: &str, payload: &str, client: &Client) -> (bool, bool) {
|
async fn http_request(url: &str, method: &str, payload: &str, client: &Client) -> (bool, bool) {
|
||||||
if !["POST", "GET", "HEAD"].contains(&method) {
|
if !["POST", "GET", "HEAD"].contains(&method) {
|
||||||
error!("Method {} not supported. Only GET|POST|HEAD are supported ", method);
|
error!("Method {} not supported. Only GET|POST|HEAD are supported ", method);
|
||||||
|
|||||||
148
src/utils/kuber.rs
Normal file
148
src/utils/kuber.rs
Normal file
@@ -0,0 +1,148 @@
|
|||||||
|
// use crate::utils::dnsclient::DnsClientPool;
|
||||||
|
use crate::utils::structs::{Configuration, InnerMap, UpstreamsDashMap};
|
||||||
|
use crate::utils::tools::{clone_dashmap_into, compare_dashmaps, print_upstreams};
|
||||||
|
use dashmap::DashMap;
|
||||||
|
use futures::channel::mpsc::Sender;
|
||||||
|
use futures::SinkExt;
|
||||||
|
use pingora::prelude::sleep;
|
||||||
|
use rand::Rng;
|
||||||
|
use reqwest::Client;
|
||||||
|
use std::env;
|
||||||
|
use std::sync::atomic::AtomicUsize;
|
||||||
|
use std::sync::Arc;
|
||||||
|
use std::time::Duration;
|
||||||
|
use tokio::fs::File;
|
||||||
|
use tokio::io::AsyncReadExt;
|
||||||
|
|
||||||
|
// static KUBERNETES_SERVICE_HOST: &str = "IP_ADDRESS";
|
||||||
|
// static TOKEN: &str = "TOKEN";
|
||||||
|
|
||||||
|
#[derive(Debug, serde::Deserialize)]
|
||||||
|
struct Endpoints {
|
||||||
|
subsets: Option<Vec<Subset>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, serde::Deserialize)]
|
||||||
|
struct Subset {
|
||||||
|
addresses: Option<Vec<Address>>,
|
||||||
|
ports: Option<Vec<Port>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, serde::Deserialize)]
|
||||||
|
struct Address {
|
||||||
|
ip: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, serde::Deserialize)]
|
||||||
|
struct Port {
|
||||||
|
// name: String,
|
||||||
|
port: u16,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn start(mut toreturn: Sender<Configuration>, config: Arc<Configuration>) {
|
||||||
|
// println!("{:?}", config);
|
||||||
|
let upstreams = UpstreamsDashMap::new();
|
||||||
|
let prev_upstreams = UpstreamsDashMap::new();
|
||||||
|
loop {
|
||||||
|
if let Some(kuber) = config.kubernetes.clone() {
|
||||||
|
let path = kuber.tokenpath.unwrap_or("/var/run/secrets/kubernetes.io/serviceaccount/token".to_string());
|
||||||
|
let token = read_token(path.as_str()).await;
|
||||||
|
let servers = kuber.servers.unwrap_or(vec![format!(
|
||||||
|
"{}:{}",
|
||||||
|
env::var("KUBERNETES_SERVICE_HOST").unwrap_or("0.0.0.0".to_string()),
|
||||||
|
env::var("KUBERNETES_SERVICE_PORT_HTTPS").unwrap_or("0".to_string())
|
||||||
|
)]);
|
||||||
|
let end = servers.len() - 1;
|
||||||
|
let mut num = 0;
|
||||||
|
if end > 0 {
|
||||||
|
num = rand::rng().random_range(0..end);
|
||||||
|
}
|
||||||
|
let server = servers.get(num).unwrap().to_string();
|
||||||
|
if let Some(svc) = kuber.services {
|
||||||
|
for i in svc {
|
||||||
|
let path = i.path.unwrap_or("/".to_string());
|
||||||
|
let url = format!("https://{}/api/v1/namespaces/staging/endpoints/{}", server, i.real);
|
||||||
|
let list = get_by_http(&*url, &*token, &*path).await;
|
||||||
|
|
||||||
|
// println!("{:?}", list);
|
||||||
|
|
||||||
|
if let Some(list) = list {
|
||||||
|
match upstreams.get(&i.proxy.clone()) {
|
||||||
|
Some(foo) => {
|
||||||
|
for (k, v) in list {
|
||||||
|
foo.value().insert(k, v);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
None => {
|
||||||
|
upstreams.insert(i.proxy.clone(), list);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// print_upstreams(&upstreams);
|
||||||
|
|
||||||
|
if !compare_dashmaps(&upstreams, &prev_upstreams) {
|
||||||
|
let tosend: Configuration = Configuration {
|
||||||
|
upstreams: Default::default(),
|
||||||
|
headers: config.headers.clone(),
|
||||||
|
consul: config.consul.clone(),
|
||||||
|
kubernetes: config.kubernetes.clone(),
|
||||||
|
typecfg: config.typecfg.clone(),
|
||||||
|
extraparams: config.extraparams.clone(),
|
||||||
|
};
|
||||||
|
|
||||||
|
clone_dashmap_into(&upstreams, &prev_upstreams);
|
||||||
|
clone_dashmap_into(&upstreams, &tosend.upstreams);
|
||||||
|
print_upstreams(&tosend.upstreams);
|
||||||
|
toreturn.send(tosend).await.unwrap();
|
||||||
|
}
|
||||||
|
sleep(Duration::from_secs(5)).await;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn get_by_http(url: &str, token: &str, path: &str) -> Option<DashMap<String, (Vec<InnerMap>, AtomicUsize)>> {
|
||||||
|
let client = Client::builder().timeout(Duration::from_secs(2)).danger_accept_invalid_certs(true).build().ok()?;
|
||||||
|
|
||||||
|
let resp = client.get(url).bearer_auth(token).send().await.ok()?;
|
||||||
|
|
||||||
|
if !resp.status().is_success() {
|
||||||
|
eprintln!("Kubernetes API returned status: {}", resp.status());
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
|
||||||
|
let endpoints: Endpoints = resp.json().await.ok()?;
|
||||||
|
let upstreams: DashMap<String, (Vec<InnerMap>, AtomicUsize)> = DashMap::new();
|
||||||
|
|
||||||
|
if let Some(subsets) = endpoints.subsets {
|
||||||
|
for subset in subsets {
|
||||||
|
if let (Some(addresses), Some(ports)) = (subset.addresses, subset.ports) {
|
||||||
|
let mut inner_vec = Vec::new();
|
||||||
|
for addr in addresses {
|
||||||
|
for port in &ports {
|
||||||
|
let to_add = InnerMap {
|
||||||
|
address: addr.ip.clone(),
|
||||||
|
port: port.port.clone(),
|
||||||
|
is_ssl: false,
|
||||||
|
is_http2: false,
|
||||||
|
to_https: false,
|
||||||
|
rate_limit: None,
|
||||||
|
healthcheck: None,
|
||||||
|
};
|
||||||
|
inner_vec.push(to_add);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
upstreams.insert(path.to_string(), (inner_vec, AtomicUsize::new(0)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Some(upstreams)
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn read_token(path: &str) -> String {
|
||||||
|
let mut file = File::open(path).await.unwrap();
|
||||||
|
let mut contents = String::new();
|
||||||
|
file.read_to_string(&mut contents).await.unwrap();
|
||||||
|
contents.trim().to_string()
|
||||||
|
}
|
||||||
@@ -61,27 +61,3 @@ pub fn calc_metrics(metric_types: &MetricTypes) {
|
|||||||
REQUESTS_BY_METHOD.with_label_values(&[&metric_types.method]).inc();
|
REQUESTS_BY_METHOD.with_label_values(&[&metric_types.method]).inc();
|
||||||
RESPONSE_LATENCY.observe(metric_types.latency.as_secs_f64());
|
RESPONSE_LATENCY.observe(metric_types.latency.as_secs_f64());
|
||||||
}
|
}
|
||||||
/*
|
|
||||||
pub fn calc_metrics(method: String, code: u16, latency: Duration) {
|
|
||||||
REQUEST_COUNT.inc();
|
|
||||||
let timer = REQUEST_LATENCY.start_timer();
|
|
||||||
timer.observe_duration();
|
|
||||||
RESPONSE_CODES.with_label_values(&[&code.to_string()]).inc();
|
|
||||||
REQUESTS_BY_METHOD.with_label_values(&[&method]).inc();
|
|
||||||
RESPONSE_LATENCY.observe(latency.as_secs_f64());
|
|
||||||
}
|
|
||||||
|
|
||||||
tokio::spawn(async move {
|
|
||||||
let mut interval = tokio::time::interval(std::time::Duration::from_secs(5));
|
|
||||||
loop {
|
|
||||||
interval.tick().await;
|
|
||||||
|
|
||||||
// read Pingora stats
|
|
||||||
let stats = pingora.get_stats();
|
|
||||||
|
|
||||||
// update Prometheus metrics accordingly
|
|
||||||
REQUEST_COUNT.set(stats.requests_total);
|
|
||||||
// ... etc
|
|
||||||
}
|
|
||||||
});
|
|
||||||
*/
|
|
||||||
|
|||||||
@@ -1,11 +1,16 @@
|
|||||||
|
use crate::utils::healthcheck;
|
||||||
|
use crate::utils::state::{is_first_run, mark_not_first_run};
|
||||||
use crate::utils::structs::*;
|
use crate::utils::structs::*;
|
||||||
|
use crate::utils::tools::{clone_dashmap, clone_dashmap_into, print_upstreams};
|
||||||
use dashmap::DashMap;
|
use dashmap::DashMap;
|
||||||
use log::{error, info, warn};
|
use log::{error, info, warn};
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
use std::fs;
|
|
||||||
use std::sync::atomic::AtomicUsize;
|
use std::sync::atomic::AtomicUsize;
|
||||||
|
// use std::sync::mpsc::{channel, Receiver, Sender};
|
||||||
|
use std::{env, fs};
|
||||||
|
// use tokio::sync::oneshot::{Receiver, Sender};
|
||||||
|
|
||||||
pub fn load_configuration(d: &str, kind: &str) -> Option<Configuration> {
|
pub async fn load_configuration(d: &str, kind: &str) -> Option<Configuration> {
|
||||||
let yaml_data = match kind {
|
let yaml_data = match kind {
|
||||||
"filepath" => match fs::read_to_string(d) {
|
"filepath" => match fs::read_to_string(d) {
|
||||||
Ok(data) => {
|
Ok(data) => {
|
||||||
@@ -38,23 +43,22 @@ pub fn load_configuration(d: &str, kind: &str) -> Option<Configuration> {
|
|||||||
|
|
||||||
let mut toreturn = Configuration::default();
|
let mut toreturn = Configuration::default();
|
||||||
|
|
||||||
populate_headers_and_auth(&mut toreturn, &parsed);
|
populate_headers_and_auth(&mut toreturn, &parsed).await;
|
||||||
toreturn.typecfg = parsed.provider.clone();
|
toreturn.typecfg = parsed.provider.clone();
|
||||||
|
|
||||||
match parsed.provider.as_str() {
|
match parsed.provider.as_str() {
|
||||||
"file" => {
|
"file" => {
|
||||||
populate_file_upstreams(&mut toreturn, &parsed);
|
populate_file_upstreams(&mut toreturn, &parsed).await;
|
||||||
Some(toreturn)
|
Some(toreturn)
|
||||||
}
|
}
|
||||||
"consul" => {
|
"consul" => {
|
||||||
toreturn.consul = parsed.consul;
|
toreturn.consul = parsed.consul;
|
||||||
if toreturn.consul.is_some() {
|
toreturn.consul.is_some().then_some(toreturn)
|
||||||
Some(toreturn)
|
}
|
||||||
} else {
|
"kubernetes" => {
|
||||||
None
|
toreturn.kubernetes = parsed.kubernetes;
|
||||||
}
|
toreturn.kubernetes.is_some().then_some(toreturn)
|
||||||
}
|
}
|
||||||
"kubernetes" => None,
|
|
||||||
_ => {
|
_ => {
|
||||||
warn!("Unknown provider {}", parsed.provider);
|
warn!("Unknown provider {}", parsed.provider);
|
||||||
None
|
None
|
||||||
@@ -62,7 +66,7 @@ pub fn load_configuration(d: &str, kind: &str) -> Option<Configuration> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn populate_headers_and_auth(config: &mut Configuration, parsed: &Config) {
|
async fn populate_headers_and_auth(config: &mut Configuration, parsed: &Config) {
|
||||||
if let Some(headers) = &parsed.headers {
|
if let Some(headers) = &parsed.headers {
|
||||||
let mut hl = Vec::new();
|
let mut hl = Vec::new();
|
||||||
for header in headers {
|
for header in headers {
|
||||||
@@ -93,7 +97,8 @@ fn populate_headers_and_auth(config: &mut Configuration, parsed: &Config) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn populate_file_upstreams(config: &mut Configuration, parsed: &Config) {
|
async fn populate_file_upstreams(config: &mut Configuration, parsed: &Config) {
|
||||||
|
let imtdashmap = UpstreamsDashMap::new();
|
||||||
if let Some(upstreams) = &parsed.upstreams {
|
if let Some(upstreams) = &parsed.upstreams {
|
||||||
for (hostname, host_config) in upstreams {
|
for (hostname, host_config) in upstreams {
|
||||||
let path_map = DashMap::new();
|
let path_map = DashMap::new();
|
||||||
@@ -116,14 +121,6 @@ fn populate_file_upstreams(config: &mut Configuration, parsed: &Config) {
|
|||||||
header_list.insert(path.clone(), hl);
|
header_list.insert(path.clone(), hl);
|
||||||
|
|
||||||
for server in &path_config.servers {
|
for server in &path_config.servers {
|
||||||
// let mut rate: Option<isize> = None;
|
|
||||||
// let size: isize = path_config.servers.len() as isize;
|
|
||||||
// if let Some(limit) = &path_config.rate_limit {
|
|
||||||
// if size > 0 {
|
|
||||||
// rate = Some(limit / size);
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
if let Some((ip, port_str)) = server.split_once(':') {
|
if let Some((ip, port_str)) = server.split_once(':') {
|
||||||
if let Ok(port) = port_str.parse::<u16>() {
|
if let Ok(port) = port_str.parse::<u16>() {
|
||||||
server_list.push(InnerMap {
|
server_list.push(InnerMap {
|
||||||
@@ -132,28 +129,36 @@ fn populate_file_upstreams(config: &mut Configuration, parsed: &Config) {
|
|||||||
is_ssl: true,
|
is_ssl: true,
|
||||||
is_http2: false,
|
is_http2: false,
|
||||||
to_https: path_config.to_https.unwrap_or(false),
|
to_https: path_config.to_https.unwrap_or(false),
|
||||||
// rate_limit: rate,
|
|
||||||
rate_limit: path_config.rate_limit,
|
rate_limit: path_config.rate_limit,
|
||||||
|
healthcheck: path_config.healthcheck,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
path_map.insert(path.clone(), (server_list, AtomicUsize::new(0)));
|
path_map.insert(path.clone(), (server_list, AtomicUsize::new(0)));
|
||||||
}
|
}
|
||||||
|
|
||||||
config.headers.insert(hostname.clone(), header_list);
|
config.headers.insert(hostname.clone(), header_list);
|
||||||
config.upstreams.insert(hostname.clone(), path_map);
|
imtdashmap.insert(hostname.clone(), path_map);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if is_first_run() {
|
||||||
|
clone_dashmap_into(&imtdashmap, &config.upstreams);
|
||||||
|
mark_not_first_run();
|
||||||
|
} else {
|
||||||
|
let y = clone_dashmap(&imtdashmap);
|
||||||
|
let r = healthcheck::initiate_upstreams(y).await;
|
||||||
|
clone_dashmap_into(&r, &config.upstreams);
|
||||||
|
}
|
||||||
|
info!("Upstream Config:");
|
||||||
|
print_upstreams(&config.upstreams);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn parce_main_config(path: &str) -> AppConfig {
|
pub fn parce_main_config(path: &str) -> AppConfig {
|
||||||
info!("Parsing configuration");
|
|
||||||
let data = fs::read_to_string(path).unwrap();
|
let data = fs::read_to_string(path).unwrap();
|
||||||
let reply = DashMap::new();
|
let reply = DashMap::new();
|
||||||
let cfg: HashMap<String, String> = serde_yaml::from_str(&*data).expect("Failed to parse main config file");
|
let cfg: HashMap<String, String> = serde_yaml::from_str(&*data).expect("Failed to parse main config file");
|
||||||
let mut cfo: AppConfig = serde_yaml::from_str(&*data).expect("Failed to parse main config file");
|
let mut cfo: AppConfig = serde_yaml::from_str(&*data).expect("Failed to parse main config file");
|
||||||
|
log_builder(&cfo);
|
||||||
cfo.hc_method = cfo.hc_method.to_uppercase();
|
cfo.hc_method = cfo.hc_method.to_uppercase();
|
||||||
for (k, v) in cfg {
|
for (k, v) in cfg {
|
||||||
reply.insert(k.to_string(), v.to_string());
|
reply.insert(k.to_string(), v.to_string());
|
||||||
@@ -170,5 +175,52 @@ pub fn parce_main_config(path: &str) -> AppConfig {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
cfo.proxy_tls_grade = parce_tls_grades(cfo.proxy_tls_grade.clone());
|
||||||
cfo
|
cfo
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn parce_tls_grades(what: Option<String>) -> Option<String> {
|
||||||
|
match what {
|
||||||
|
Some(g) => match g.to_ascii_lowercase().as_str() {
|
||||||
|
"high" => {
|
||||||
|
// info!("TLS grade set to: [ HIGH ]");
|
||||||
|
Some("high".to_string())
|
||||||
|
}
|
||||||
|
"medium" => {
|
||||||
|
// info!("TLS grade set to: [ MEDIUM ]");
|
||||||
|
Some("medium".to_string())
|
||||||
|
}
|
||||||
|
"unsafe" => {
|
||||||
|
// info!("TLS grade set to: [ UNSAFE ]");
|
||||||
|
Some("unsafe".to_string())
|
||||||
|
}
|
||||||
|
_ => {
|
||||||
|
warn!("Error parsing TLS grade, defaulting to: `medium`");
|
||||||
|
Some("medium".to_string())
|
||||||
|
}
|
||||||
|
},
|
||||||
|
None => {
|
||||||
|
warn!("TLS grade not set, defaulting to: medium");
|
||||||
|
Some("b".to_string())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn log_builder(conf: &AppConfig) {
|
||||||
|
let log_level = conf.log_level.clone();
|
||||||
|
unsafe {
|
||||||
|
match log_level.as_str() {
|
||||||
|
"info" => env::set_var("RUST_LOG", "info"),
|
||||||
|
"error" => env::set_var("RUST_LOG", "error"),
|
||||||
|
"warn" => env::set_var("RUST_LOG", "warn"),
|
||||||
|
"debug" => env::set_var("RUST_LOG", "debug"),
|
||||||
|
"trace" => env::set_var("RUST_LOG", "trace"),
|
||||||
|
"off" => env::set_var("RUST_LOG", "off"),
|
||||||
|
_ => {
|
||||||
|
println!("Error reading log level, defaulting to: INFO");
|
||||||
|
env::set_var("RUST_LOG", "info")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
env_logger::builder().init();
|
||||||
|
}
|
||||||
|
|||||||
30
src/utils/state.rs
Normal file
30
src/utils/state.rs
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
use once_cell::sync::Lazy;
|
||||||
|
use std::sync::RwLock;
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub struct SharedState {
|
||||||
|
pub first_run: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub static GLOBAL_STATE: Lazy<RwLock<SharedState>> = Lazy::new(|| RwLock::new(SharedState { first_run: true }));
|
||||||
|
|
||||||
|
pub fn mark_not_first_run() {
|
||||||
|
let mut state = GLOBAL_STATE.write().unwrap();
|
||||||
|
state.first_run = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn is_first_run() -> bool {
|
||||||
|
let state = GLOBAL_STATE.read().unwrap();
|
||||||
|
state.first_run
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
impl SharedState {
|
||||||
|
pub fn mark_first_run(&mut self) {
|
||||||
|
self.first_run = false;
|
||||||
|
}
|
||||||
|
pub fn is_first_run(&self) -> bool {
|
||||||
|
self.first_run
|
||||||
|
}
|
||||||
|
}
|
||||||
|
*/
|
||||||
@@ -3,25 +3,8 @@ use serde::{Deserialize, Serialize};
|
|||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
use std::sync::atomic::AtomicUsize;
|
use std::sync::atomic::AtomicUsize;
|
||||||
|
|
||||||
// pub type InnerMap = BackendConfig;
|
|
||||||
pub type UpstreamsDashMap = DashMap<String, DashMap<String, (Vec<InnerMap>, AtomicUsize)>>;
|
pub type UpstreamsDashMap = DashMap<String, DashMap<String, (Vec<InnerMap>, AtomicUsize)>>;
|
||||||
|
|
||||||
// #[derive(Debug, Default)]
|
|
||||||
// pub struct UpstreamsMap {
|
|
||||||
// pub upstreams: DashMap<String, DashMap<String, (Vec<InnerMap>, AtomicUsize)>>,
|
|
||||||
// pub ratelimit: DashMap<String, Option<isize>>,
|
|
||||||
// }
|
|
||||||
// impl UpstreamsMap {
|
|
||||||
// pub fn new() -> Self {
|
|
||||||
// Self {
|
|
||||||
// upstreams: Default::default(),
|
|
||||||
// ratelimit: Default::default(),
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// pub type XUpstreamsDashMap = DashMap<String, UpstreamsMap>;
|
|
||||||
|
|
||||||
pub type UpstreamsIdMap = DashMap<String, InnerMap>;
|
pub type UpstreamsIdMap = DashMap<String, InnerMap>;
|
||||||
pub type Headers = DashMap<String, DashMap<String, Vec<(String, String)>>>;
|
pub type Headers = DashMap<String, DashMap<String, Vec<(String, String)>>>;
|
||||||
|
|
||||||
@@ -29,6 +12,7 @@ pub type Headers = DashMap<String, DashMap<String, Vec<(String, String)>>>;
|
|||||||
pub struct ServiceMapping {
|
pub struct ServiceMapping {
|
||||||
pub proxy: String,
|
pub proxy: String,
|
||||||
pub real: String,
|
pub real: String,
|
||||||
|
pub path: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, Default)]
|
#[derive(Clone, Debug, Default)]
|
||||||
@@ -38,6 +22,12 @@ pub struct Extraparams {
|
|||||||
pub authentication: DashMap<String, Vec<String>>,
|
pub authentication: DashMap<String, Vec<String>>,
|
||||||
pub rate_limit: Option<isize>,
|
pub rate_limit: Option<isize>,
|
||||||
}
|
}
|
||||||
|
#[derive(Clone, Default, Debug, Serialize, Deserialize)]
|
||||||
|
pub struct Kubernetes {
|
||||||
|
pub servers: Option<Vec<String>>,
|
||||||
|
pub services: Option<Vec<ServiceMapping>>,
|
||||||
|
pub tokenpath: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Clone, Default, Debug, Serialize, Deserialize)]
|
#[derive(Clone, Default, Debug, Serialize, Deserialize)]
|
||||||
pub struct Consul {
|
pub struct Consul {
|
||||||
@@ -61,6 +51,8 @@ pub struct Config {
|
|||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
pub consul: Option<Consul>,
|
pub consul: Option<Consul>,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
|
pub kubernetes: Option<Kubernetes>,
|
||||||
|
#[serde(default)]
|
||||||
pub rate_limit: Option<isize>,
|
pub rate_limit: Option<isize>,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -76,12 +68,14 @@ pub struct PathConfig {
|
|||||||
pub to_https: Option<bool>,
|
pub to_https: Option<bool>,
|
||||||
pub headers: Option<Vec<String>>,
|
pub headers: Option<Vec<String>>,
|
||||||
pub rate_limit: Option<isize>,
|
pub rate_limit: Option<isize>,
|
||||||
|
pub healthcheck: Option<bool>,
|
||||||
}
|
}
|
||||||
#[derive(Debug, Default)]
|
#[derive(Debug, Default)]
|
||||||
pub struct Configuration {
|
pub struct Configuration {
|
||||||
pub upstreams: UpstreamsDashMap,
|
pub upstreams: UpstreamsDashMap,
|
||||||
pub headers: Headers,
|
pub headers: Headers,
|
||||||
pub consul: Option<Consul>,
|
pub consul: Option<Consul>,
|
||||||
|
pub kubernetes: Option<Kubernetes>,
|
||||||
pub typecfg: String,
|
pub typecfg: String,
|
||||||
pub extraparams: Extraparams,
|
pub extraparams: Extraparams,
|
||||||
}
|
}
|
||||||
@@ -103,8 +97,11 @@ pub struct AppConfig {
|
|||||||
pub proxy_port_tls: Option<u16>,
|
pub proxy_port_tls: Option<u16>,
|
||||||
pub local_server: Option<(String, u16)>,
|
pub local_server: Option<(String, u16)>,
|
||||||
pub proxy_certificates: Option<String>,
|
pub proxy_certificates: Option<String>,
|
||||||
|
pub proxy_tls_grade: Option<String>,
|
||||||
pub file_server_address: Option<String>,
|
pub file_server_address: Option<String>,
|
||||||
pub file_server_folder: Option<String>,
|
pub file_server_folder: Option<String>,
|
||||||
|
pub runuser: Option<String>,
|
||||||
|
pub rungroup: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
|
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
|
||||||
@@ -115,8 +112,10 @@ pub struct InnerMap {
|
|||||||
pub is_http2: bool,
|
pub is_http2: bool,
|
||||||
pub to_https: bool,
|
pub to_https: bool,
|
||||||
pub rate_limit: Option<isize>,
|
pub rate_limit: Option<isize>,
|
||||||
|
pub healthcheck: Option<bool>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[allow(dead_code)]
|
||||||
impl InnerMap {
|
impl InnerMap {
|
||||||
pub fn new() -> Self {
|
pub fn new() -> Self {
|
||||||
Self {
|
Self {
|
||||||
@@ -126,6 +125,7 @@ impl InnerMap {
|
|||||||
is_http2: Default::default(),
|
is_http2: Default::default(),
|
||||||
to_https: Default::default(),
|
to_https: Default::default(),
|
||||||
rate_limit: Default::default(),
|
rate_limit: Default::default(),
|
||||||
|
healthcheck: Default::default(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
use dashmap::DashMap;
|
use dashmap::DashMap;
|
||||||
use log::error;
|
use log::{error, info, warn};
|
||||||
use pingora::tls::ssl::{select_next_proto, AlpnError, NameType, SniError, SslAlert, SslContext, SslFiletype, SslMethod, SslRef};
|
use pingora::tls::ssl::{select_next_proto, AlpnError, NameType, SniError, SslAlert, SslContext, SslFiletype, SslMethod, SslRef, SslVersion};
|
||||||
|
use pingora_core::listeners::tls::TlsSettings;
|
||||||
use rustls_pemfile::{read_one, Item};
|
use rustls_pemfile::{read_one, Item};
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
use std::collections::HashSet;
|
use std::collections::HashSet;
|
||||||
use std::fs::File;
|
use std::fs::File;
|
||||||
use std::io::BufReader;
|
use std::io::BufReader;
|
||||||
// use tokio::time::Instant;
|
|
||||||
use x509_parser::extensions::GeneralName;
|
use x509_parser::extensions::GeneralName;
|
||||||
use x509_parser::nom::Err as NomErr;
|
use x509_parser::nom::Err as NomErr;
|
||||||
use x509_parser::prelude::*;
|
use x509_parser::prelude::*;
|
||||||
@@ -37,12 +37,12 @@ pub struct Certificates {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Certificates {
|
impl Certificates {
|
||||||
pub fn new(configs: &Vec<CertificateConfig>) -> Option<Self> {
|
pub fn new(configs: &Vec<CertificateConfig>, _grade: &str) -> Option<Self> {
|
||||||
let default_cert = configs.first().expect("At least one TLS certificate required");
|
let default_cert = configs.first().expect("At least one TLS certificate required");
|
||||||
let mut cert_infos = Vec::new();
|
let mut cert_infos = Vec::new();
|
||||||
let name_map: DashMap<String, SslContext> = DashMap::new();
|
let name_map: DashMap<String, SslContext> = DashMap::new();
|
||||||
for config in configs {
|
for config in configs {
|
||||||
let cert_info = load_cert_info(&config.cert_path, &config.key_path);
|
let cert_info = load_cert_info(&config.cert_path, &config.key_path, _grade);
|
||||||
match cert_info {
|
match cert_info {
|
||||||
Some(cert) => {
|
Some(cert) => {
|
||||||
for name in &cert.common_names {
|
for name in &cert.common_names {
|
||||||
@@ -106,7 +106,7 @@ impl Certificates {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn load_cert_info(cert_path: &str, key_path: &str) -> Option<CertificateInfo> {
|
fn load_cert_info(cert_path: &str, key_path: &str, _grade: &str) -> Option<CertificateInfo> {
|
||||||
let mut common_names = HashSet::new();
|
let mut common_names = HashSet::new();
|
||||||
let mut alt_names = HashSet::new();
|
let mut alt_names = HashSet::new();
|
||||||
|
|
||||||
@@ -185,9 +185,70 @@ fn create_ssl_context(cert_path: &str, key_path: &str) -> Result<SslContext, Box
|
|||||||
Ok(built)
|
Ok(built)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub struct CipherSuite {
|
||||||
|
pub high: &'static str,
|
||||||
|
pub medium: &'static str,
|
||||||
|
pub legacy: &'static str,
|
||||||
|
}
|
||||||
|
const CIPHERS: CipherSuite = CipherSuite {
|
||||||
|
high: "TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_GCM_SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305",
|
||||||
|
medium: "ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:AES128-GCM-SHA256",
|
||||||
|
legacy: "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH",
|
||||||
|
};
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub enum TlsGrade {
|
||||||
|
HIGH,
|
||||||
|
MEDIUM,
|
||||||
|
LEGACY,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl TlsGrade {
|
||||||
|
pub fn from_str(s: &str) -> Option<Self> {
|
||||||
|
match s.to_ascii_lowercase().as_str() {
|
||||||
|
"high" => Some(TlsGrade::HIGH),
|
||||||
|
"medium" => Some(TlsGrade::MEDIUM),
|
||||||
|
"unsafe" => Some(TlsGrade::LEGACY),
|
||||||
|
_ => None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
pub fn prefer_h2<'a>(_ssl: &mut SslRef, alpn_in: &'a [u8]) -> Result<&'a [u8], AlpnError> {
|
pub fn prefer_h2<'a>(_ssl: &mut SslRef, alpn_in: &'a [u8]) -> Result<&'a [u8], AlpnError> {
|
||||||
match select_next_proto("\x02h2\x08http/1.1".as_bytes(), alpn_in) {
|
match select_next_proto("\x02h2\x08http/1.1".as_bytes(), alpn_in) {
|
||||||
Some(p) => Ok(p),
|
Some(p) => Ok(p),
|
||||||
_ => Err(AlpnError::NOACK),
|
_ => Err(AlpnError::NOACK),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn set_tsl_grade(tls_settings: &mut TlsSettings, grade: &str) {
|
||||||
|
let config_grade = TlsGrade::from_str(grade);
|
||||||
|
match config_grade {
|
||||||
|
Some(TlsGrade::HIGH) => {
|
||||||
|
let _ = tls_settings.set_min_proto_version(Some(SslVersion::TLS1_2));
|
||||||
|
// let _ = tls_settings.set_max_proto_version(Some(SslVersion::TLS1_3));
|
||||||
|
let _ = tls_settings.set_cipher_list(CIPHERS.high);
|
||||||
|
let _ = tls_settings.set_ciphersuites(CIPHERS.high);
|
||||||
|
info!("TLS grade: {:?}, => HIGH", tls_settings.options());
|
||||||
|
}
|
||||||
|
Some(TlsGrade::MEDIUM) => {
|
||||||
|
let _ = tls_settings.set_min_proto_version(Some(SslVersion::TLS1));
|
||||||
|
let _ = tls_settings.set_cipher_list(CIPHERS.medium);
|
||||||
|
let _ = tls_settings.set_ciphersuites(CIPHERS.medium);
|
||||||
|
info!("TLS grade: {:?}, => MEDIUM", tls_settings.options());
|
||||||
|
}
|
||||||
|
Some(TlsGrade::LEGACY) => {
|
||||||
|
let _ = tls_settings.set_min_proto_version(Some(SslVersion::SSL3));
|
||||||
|
let _ = tls_settings.set_cipher_list(CIPHERS.legacy);
|
||||||
|
let _ = tls_settings.set_ciphersuites(CIPHERS.legacy);
|
||||||
|
warn!("TLS grade: {:?}, => UNSAFE", tls_settings.options());
|
||||||
|
}
|
||||||
|
None => {
|
||||||
|
// Defaults to MEDIUM
|
||||||
|
let _ = tls_settings.set_min_proto_version(Some(SslVersion::TLS1));
|
||||||
|
let _ = tls_settings.set_cipher_list(CIPHERS.medium);
|
||||||
|
let _ = tls_settings.set_ciphersuites(CIPHERS.medium);
|
||||||
|
warn!("TLS grade is not detected defaulting top MEDIUM");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -4,14 +4,19 @@ use crate::utils::tls::CertificateConfig;
|
|||||||
use dashmap::DashMap;
|
use dashmap::DashMap;
|
||||||
use log::{error, info};
|
use log::{error, info};
|
||||||
use notify::{event::ModifyKind, Config, EventKind, RecommendedWatcher, RecursiveMode, Watcher};
|
use notify::{event::ModifyKind, Config, EventKind, RecommendedWatcher, RecursiveMode, Watcher};
|
||||||
|
use port_check::is_port_reachable;
|
||||||
|
use privdrop::PrivDrop;
|
||||||
use sha2::{Digest, Sha256};
|
use sha2::{Digest, Sha256};
|
||||||
use std::any::type_name;
|
use std::any::type_name;
|
||||||
use std::collections::{HashMap, HashSet};
|
use std::collections::{HashMap, HashSet};
|
||||||
use std::fmt::Write;
|
use std::fmt::Write;
|
||||||
use std::fs;
|
use std::net::SocketAddr;
|
||||||
|
use std::os::unix::fs::MetadataExt;
|
||||||
|
use std::str::FromStr;
|
||||||
use std::sync::atomic::AtomicUsize;
|
use std::sync::atomic::AtomicUsize;
|
||||||
use std::sync::mpsc::{channel, Sender};
|
use std::sync::mpsc::{channel, Sender};
|
||||||
use std::time::{Duration, Instant};
|
use std::time::{Duration, Instant};
|
||||||
|
use std::{fs, process, thread, time};
|
||||||
|
|
||||||
#[allow(dead_code)]
|
#[allow(dead_code)]
|
||||||
pub fn print_upstreams(upstreams: &UpstreamsDashMap) {
|
pub fn print_upstreams(upstreams: &UpstreamsDashMap) {
|
||||||
@@ -155,6 +160,7 @@ pub fn clone_idmap_into(original: &UpstreamsDashMap, cloned: &UpstreamsIdMap) {
|
|||||||
is_http2: false,
|
is_http2: false,
|
||||||
to_https: false,
|
to_https: false,
|
||||||
rate_limit: None,
|
rate_limit: None,
|
||||||
|
healthcheck: None,
|
||||||
};
|
};
|
||||||
cloned.insert(id, to_add);
|
cloned.insert(id, to_add);
|
||||||
cloned.insert(hh, x.to_owned());
|
cloned.insert(hh, x.to_owned());
|
||||||
@@ -220,3 +226,40 @@ pub fn watch_folder(path: String, sender: Sender<Vec<CertificateConfig>>) -> not
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn drop_priv(user: String, group: String, http_addr: String, tls_addr: Option<String>) {
|
||||||
|
thread::sleep(time::Duration::from_millis(10));
|
||||||
|
loop {
|
||||||
|
thread::sleep(time::Duration::from_millis(10));
|
||||||
|
if is_port_reachable(http_addr.clone()) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if let Some(tls_addr) = tls_addr {
|
||||||
|
loop {
|
||||||
|
thread::sleep(time::Duration::from_millis(10));
|
||||||
|
if is_port_reachable(tls_addr.clone()) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
info!("Dropping ROOT privileges to: {}:{}", user, group);
|
||||||
|
if let Err(e) = PrivDrop::default().user(user).group(group).apply() {
|
||||||
|
error!("Failed to drop privileges: {}", e);
|
||||||
|
process::exit(1)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn check_priv(addr: &str) {
|
||||||
|
let port = SocketAddr::from_str(addr).map(|sa| sa.port()).unwrap();
|
||||||
|
match port < 1024 {
|
||||||
|
true => {
|
||||||
|
let meta = std::fs::metadata("/proc/self").map(|m| m.uid()).unwrap();
|
||||||
|
if meta != 0 {
|
||||||
|
error!("Running on privileged port requires to start as ROOT");
|
||||||
|
process::exit(1)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
false => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
use crate::utils::discovery::{APIUpstreamProvider, ConsulProvider, Discovery, FromFileProvider};
|
use crate::utils::discovery::{APIUpstreamProvider, ConsulProvider, Discovery, FromFileProvider, KubernetesProvider};
|
||||||
|
use crate::utils::parceyaml::load_configuration;
|
||||||
use crate::utils::structs::Configuration;
|
use crate::utils::structs::Configuration;
|
||||||
use crate::utils::tools::*;
|
use crate::utils::tools::*;
|
||||||
use crate::utils::*;
|
use crate::utils::*;
|
||||||
@@ -6,8 +7,8 @@ use crate::web::proxyhttp::LB;
|
|||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
use dashmap::DashMap;
|
use dashmap::DashMap;
|
||||||
use futures::channel::mpsc;
|
use futures::channel::mpsc;
|
||||||
use futures::StreamExt;
|
use futures::{SinkExt, StreamExt};
|
||||||
use log::info;
|
use log::{error, info};
|
||||||
use pingora_core::server::ShutdownWatch;
|
use pingora_core::server::ShutdownWatch;
|
||||||
use pingora_core::services::background::BackgroundService;
|
use pingora_core::services::background::BackgroundService;
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
@@ -15,23 +16,38 @@ use std::sync::Arc;
|
|||||||
#[async_trait]
|
#[async_trait]
|
||||||
impl BackgroundService for LB {
|
impl BackgroundService for LB {
|
||||||
async fn start(&self, mut shutdown: ShutdownWatch) {
|
async fn start(&self, mut shutdown: ShutdownWatch) {
|
||||||
info!("Starting background service");
|
info!("Starting background service"); // tx: Sender<Configuration>
|
||||||
let (tx, mut rx) = mpsc::channel::<Configuration>(0);
|
let (mut tx, mut rx) = mpsc::channel::<Configuration>(1);
|
||||||
|
let tx_api = tx.clone();
|
||||||
|
let config = load_configuration(self.config.upstreams_conf.clone().as_str(), "filepath")
|
||||||
|
.await
|
||||||
|
.expect("Failed to load configuration");
|
||||||
|
|
||||||
let tx_file = tx.clone();
|
match config.typecfg.as_str() {
|
||||||
let tx_consul = tx.clone();
|
"file" => {
|
||||||
|
info!("Running File discovery, requested type is: {}", config.typecfg);
|
||||||
let file_load = FromFileProvider {
|
tx.send(config).await.unwrap();
|
||||||
path: self.config.upstreams_conf.clone(),
|
let file_load = FromFileProvider {
|
||||||
};
|
path: self.config.upstreams_conf.clone(),
|
||||||
let consul_load = ConsulProvider {
|
};
|
||||||
path: self.config.upstreams_conf.clone(),
|
let _ = tokio::spawn(async move { file_load.start(tx).await });
|
||||||
};
|
}
|
||||||
|
"kubernetes" => {
|
||||||
let _ = tokio::spawn(async move { file_load.start(tx_file).await });
|
info!("Running Kubernetes discovery, requested type is: {}", config.typecfg);
|
||||||
let _ = tokio::spawn(async move { consul_load.start(tx_consul).await });
|
let cf = Arc::from(config);
|
||||||
// let _ = tokio::spawn(tls::watch_certs(self.config.proxy_certificates.clone().unwrap(), self.cert_tx.clone()));
|
let kuber_load = KubernetesProvider { config: cf.clone() };
|
||||||
// let _ = tokio::spawn(tls::watch_certs(self.config.proxy_certificates.clone().unwrap(), self.cert_tx.clone())).await;
|
let _ = tokio::spawn(async move { kuber_load.start(tx).await });
|
||||||
|
}
|
||||||
|
"consul" => {
|
||||||
|
info!("Running Consul discovery, requested type is: {}", config.typecfg);
|
||||||
|
let cf = Arc::from(config);
|
||||||
|
let consul_load = ConsulProvider { config: cf.clone() };
|
||||||
|
let _ = tokio::spawn(async move { consul_load.start(tx).await });
|
||||||
|
}
|
||||||
|
_ => {
|
||||||
|
error!("Unknown discovery type: {}", config.typecfg);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
let api_load = APIUpstreamProvider {
|
let api_load = APIUpstreamProvider {
|
||||||
address: self.config.config_address.clone(),
|
address: self.config.config_address.clone(),
|
||||||
@@ -43,7 +59,7 @@ impl BackgroundService for LB {
|
|||||||
file_server_address: self.config.file_server_address.clone(),
|
file_server_address: self.config.file_server_address.clone(),
|
||||||
file_server_folder: self.config.file_server_folder.clone(),
|
file_server_folder: self.config.file_server_folder.clone(),
|
||||||
};
|
};
|
||||||
let tx_api = tx.clone();
|
// let tx_api = tx.clone();
|
||||||
let _ = tokio::spawn(async move { api_load.start(tx_api).await });
|
let _ = tokio::spawn(async move { api_load.start(tx_api).await });
|
||||||
|
|
||||||
let uu = self.ump_upst.clone();
|
let uu = self.ump_upst.clone();
|
||||||
|
|||||||
@@ -45,6 +45,7 @@ impl GetHost for LB {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// println!("Best Match :===> {:?}", best_match);
|
||||||
best_match
|
best_match
|
||||||
}
|
}
|
||||||
fn get_header(&self, peer: &str, path: &str) -> Option<Vec<(String, String)>> {
|
fn get_header(&self, peer: &str, path: &str) -> Option<Vec<(String, String)>> {
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ use crate::web::gethosts::GetHost;
|
|||||||
use arc_swap::ArcSwap;
|
use arc_swap::ArcSwap;
|
||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
use axum::body::Bytes;
|
use axum::body::Bytes;
|
||||||
use log::{debug, warn};
|
use log::{debug, error, warn};
|
||||||
use once_cell::sync::Lazy;
|
use once_cell::sync::Lazy;
|
||||||
use pingora::http::{RequestHeader, ResponseHeader, StatusCode};
|
use pingora::http::{RequestHeader, ResponseHeader, StatusCode};
|
||||||
use pingora::prelude::*;
|
use pingora::prelude::*;
|
||||||
@@ -67,7 +67,7 @@ impl ProxyHttp for LB {
|
|||||||
};
|
};
|
||||||
|
|
||||||
let hostname = return_header_host(&session);
|
let hostname = return_header_host(&session);
|
||||||
_ctx.hostname = hostname.clone();
|
_ctx.hostname = hostname;
|
||||||
|
|
||||||
let mut backend_id = None;
|
let mut backend_id = None;
|
||||||
|
|
||||||
@@ -85,10 +85,11 @@ impl ProxyHttp for LB {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
match hostname {
|
match _ctx.hostname.as_ref() {
|
||||||
None => return Ok(false),
|
None => return Ok(false),
|
||||||
Some(host) => {
|
Some(host) => {
|
||||||
let optioninnermap = self.get_host(host.as_str(), host.as_str(), backend_id);
|
// let optioninnermap = self.get_host(host.as_str(), host.as_str(), backend_id);
|
||||||
|
let optioninnermap = self.get_host(host.as_str(), session.req_header().uri.path(), backend_id);
|
||||||
match optioninnermap {
|
match optioninnermap {
|
||||||
None => return Ok(false),
|
None => return Ok(false),
|
||||||
Some(ref innermap) => {
|
Some(ref innermap) => {
|
||||||
@@ -150,7 +151,9 @@ impl ProxyHttp for LB {
|
|||||||
Ok(peer)
|
Ok(peer)
|
||||||
}
|
}
|
||||||
None => {
|
None => {
|
||||||
session.respond_error_with_body(502, Bytes::from("502 Bad Gateway\n")).await.expect("Failed to send error");
|
if let Err(e) = session.respond_error_with_body(502, Bytes::from("502 Bad Gateway\n")).await {
|
||||||
|
error!("Failed to send error response: {:?}", e);
|
||||||
|
}
|
||||||
Err(Box::new(Error {
|
Err(Box::new(Error {
|
||||||
etype: HTTPStatus(502),
|
etype: HTTPStatus(502),
|
||||||
esource: Upstream,
|
esource: Upstream,
|
||||||
@@ -162,7 +165,10 @@ impl ProxyHttp for LB {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
None => {
|
None => {
|
||||||
session.respond_error_with_body(502, Bytes::from("502 Bad Gateway\n")).await.expect("Failed to send error");
|
// session.respond_error_with_body(502, Bytes::from("502 Bad Gateway\n")).await.expect("Failed to send error");
|
||||||
|
if let Err(e) = session.respond_error_with_body(502, Bytes::from("502 Bad Gateway\n")).await {
|
||||||
|
error!("Failed to send error response: {:?}", e);
|
||||||
|
}
|
||||||
Err(Box::new(Error {
|
Err(Box::new(Error {
|
||||||
etype: HTTPStatus(502),
|
etype: HTTPStatus(502),
|
||||||
esource: Upstream,
|
esource: Upstream,
|
||||||
@@ -174,22 +180,12 @@ impl ProxyHttp for LB {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn upstream_request_filter(&self, session: &mut Session, _upstream_request: &mut RequestHeader, _ctx: &mut Self::CTX) -> Result<()> {
|
async fn upstream_request_filter(&self, _session: &mut Session, upstream_request: &mut RequestHeader, ctx: &mut Self::CTX) -> Result<()> {
|
||||||
match session.client_addr() {
|
if let Some(hostname) = ctx.hostname.as_ref() {
|
||||||
Some(ip) => {
|
upstream_request.insert_header("Host", hostname)?;
|
||||||
let inet = ip.as_inet();
|
}
|
||||||
match inet {
|
if let Some(peer) = ctx.upstream_peer.as_ref() {
|
||||||
Some(addr) => {
|
upstream_request.insert_header("X-Forwarded-For", peer.address.as_str())?;
|
||||||
_upstream_request
|
|
||||||
.insert_header("X-Forwarded-For", addr.to_string().split(':').collect::<Vec<&str>>()[0])
|
|
||||||
.unwrap();
|
|
||||||
}
|
|
||||||
None => warn!("Malformed Client IP: {:?}", inet),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
None => {
|
|
||||||
warn!("Cannot detect client IP");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
@@ -214,7 +210,6 @@ impl ProxyHttp for LB {
|
|||||||
redirect_response.insert_header("Content-Length", "0")?;
|
redirect_response.insert_header("Content-Length", "0")?;
|
||||||
session.write_response_header(Box::new(redirect_response), false).await?;
|
session.write_response_header(Box::new(redirect_response), false).await?;
|
||||||
}
|
}
|
||||||
// match return_header_host(&session) {
|
|
||||||
match ctx.hostname.as_ref() {
|
match ctx.hostname.as_ref() {
|
||||||
Some(host) => {
|
Some(host) => {
|
||||||
let path = session.req_header().uri.path();
|
let path = session.req_header().uri.path();
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ use crate::utils::tls::CertificateConfig;
|
|||||||
use crate::utils::tools::*;
|
use crate::utils::tools::*;
|
||||||
use crate::web::proxyhttp::LB;
|
use crate::web::proxyhttp::LB;
|
||||||
use arc_swap::ArcSwap;
|
use arc_swap::ArcSwap;
|
||||||
|
use ctrlc;
|
||||||
use dashmap::DashMap;
|
use dashmap::DashMap;
|
||||||
use log::info;
|
use log::info;
|
||||||
use pingora::tls::ssl::{SslAlert, SslRef};
|
use pingora::tls::ssl::{SslAlert, SslRef};
|
||||||
@@ -13,8 +14,7 @@ use pingora_core::prelude::{background_service, Opt};
|
|||||||
use pingora_core::server::Server;
|
use pingora_core::server::Server;
|
||||||
use std::sync::mpsc::{channel, Receiver, Sender};
|
use std::sync::mpsc::{channel, Receiver, Sender};
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
use std::{env, thread};
|
use std::thread;
|
||||||
|
|
||||||
pub fn run() {
|
pub fn run() {
|
||||||
// default_provider().install_default().expect("Failed to install rustls crypto provider");
|
// default_provider().install_default().expect("Failed to install rustls crypto provider");
|
||||||
let parameters = Some(Opt::parse_args()).unwrap();
|
let parameters = Some(Opt::parse_args()).unwrap();
|
||||||
@@ -47,59 +47,49 @@ pub fn run() {
|
|||||||
extraparams: ec_config,
|
extraparams: ec_config,
|
||||||
};
|
};
|
||||||
|
|
||||||
let log_level = cfg.log_level.clone();
|
let grade = cfg.proxy_tls_grade.clone().unwrap_or("medium".to_string());
|
||||||
unsafe {
|
info!("TLS grade set to: [ {} ]", grade);
|
||||||
match log_level.as_str() {
|
|
||||||
"info" => env::set_var("RUST_LOG", "info"),
|
|
||||||
"error" => env::set_var("RUST_LOG", "error"),
|
|
||||||
"warn" => env::set_var("RUST_LOG", "warn"),
|
|
||||||
"debug" => env::set_var("RUST_LOG", "debug"),
|
|
||||||
"trace" => env::set_var("RUST_LOG", "trace"),
|
|
||||||
"off" => env::set_var("RUST_LOG", "off"),
|
|
||||||
_ => {
|
|
||||||
println!("Error reading log level, defaulting to: INFO");
|
|
||||||
env::set_var("RUST_LOG", "info")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
env_logger::builder().init();
|
|
||||||
|
|
||||||
let bg_srvc = background_service("bgsrvc", lb.clone());
|
let bg_srvc = background_service("bgsrvc", lb.clone());
|
||||||
let mut proxy = pingora_proxy::http_proxy_service(&server.configuration, lb.clone());
|
let mut proxy = pingora_proxy::http_proxy_service(&server.configuration, lb.clone());
|
||||||
let bind_address_http = cfg.proxy_address_http.clone();
|
let bind_address_http = cfg.proxy_address_http.clone();
|
||||||
|
|
||||||
let bind_address_tls = cfg.proxy_address_tls.clone();
|
let bind_address_tls = cfg.proxy_address_tls.clone();
|
||||||
|
|
||||||
|
check_priv(bind_address_http.as_str());
|
||||||
|
|
||||||
match bind_address_tls {
|
match bind_address_tls {
|
||||||
Some(bind_address_tls) => {
|
Some(bind_address_tls) => {
|
||||||
|
check_priv(bind_address_tls.as_str());
|
||||||
let (tx, rx): (Sender<Vec<CertificateConfig>>, Receiver<Vec<CertificateConfig>>) = channel();
|
let (tx, rx): (Sender<Vec<CertificateConfig>>, Receiver<Vec<CertificateConfig>>) = channel();
|
||||||
let certs_path = cfg.proxy_certificates.clone().unwrap();
|
let certs_path = cfg.proxy_certificates.clone().unwrap();
|
||||||
thread::spawn(move || {
|
thread::spawn(move || {
|
||||||
watch_folder(certs_path, tx).unwrap();
|
watch_folder(certs_path, tx).unwrap();
|
||||||
});
|
});
|
||||||
let certificate_configs = rx.recv().unwrap();
|
let certificate_configs = rx.recv().unwrap();
|
||||||
let first_set = tls::Certificates::new(&certificate_configs).unwrap_or_else(|| panic!("Unable to load initial certificate info"));
|
let first_set = tls::Certificates::new(&certificate_configs, grade.as_str()).unwrap_or_else(|| panic!("Unable to load initial certificate info"));
|
||||||
let certificates = Arc::new(ArcSwap::from_pointee(first_set));
|
let certificates = Arc::new(ArcSwap::from_pointee(first_set));
|
||||||
let certs_for_callback = certificates.clone();
|
let certs_for_callback = certificates.clone();
|
||||||
|
|
||||||
let certs_for_watcher = certificates.clone();
|
let certs_for_watcher = certificates.clone();
|
||||||
let new_certs = tls::Certificates::new(&certificate_configs);
|
let new_certs = tls::Certificates::new(&certificate_configs, grade.as_str());
|
||||||
certs_for_watcher.store(Arc::new(new_certs.unwrap()));
|
certs_for_watcher.store(Arc::new(new_certs.unwrap()));
|
||||||
|
|
||||||
let mut tls_settings =
|
let mut tls_settings =
|
||||||
TlsSettings::intermediate(&certs_for_callback.load().default_cert_path, &certs_for_callback.load().default_key_path).expect("unable to load or parse cert/key");
|
TlsSettings::intermediate(&certs_for_callback.load().default_cert_path, &certs_for_callback.load().default_key_path).expect("unable to load or parse cert/key");
|
||||||
|
|
||||||
|
tls::set_tsl_grade(&mut tls_settings, grade.as_str());
|
||||||
tls_settings.set_servername_callback(move |ssl_ref: &mut SslRef, ssl_alert: &mut SslAlert| certs_for_callback.load().server_name_callback(ssl_ref, ssl_alert));
|
tls_settings.set_servername_callback(move |ssl_ref: &mut SslRef, ssl_alert: &mut SslAlert| certs_for_callback.load().server_name_callback(ssl_ref, ssl_alert));
|
||||||
tls_settings.set_alpn_select_callback(tls::prefer_h2);
|
tls_settings.set_alpn_select_callback(tls::prefer_h2);
|
||||||
|
|
||||||
proxy.add_tls_with_settings(&bind_address_tls, None, tls_settings);
|
proxy.add_tls_with_settings(&bind_address_tls, None, tls_settings);
|
||||||
|
|
||||||
let certs_for_watcher = certificates.clone();
|
let certs_for_watcher = certificates.clone();
|
||||||
thread::spawn(move || {
|
thread::spawn(move || {
|
||||||
while let Ok(new_configs) = rx.recv() {
|
while let Ok(new_configs) = rx.recv() {
|
||||||
let new_certs = tls::Certificates::new(&new_configs);
|
let new_certs = tls::Certificates::new(&new_configs, grade.as_str());
|
||||||
match new_certs {
|
match new_certs {
|
||||||
Some(new_certs) => {
|
Some(new_certs) => {
|
||||||
certs_for_watcher.store(Arc::new(new_certs));
|
certs_for_watcher.store(Arc::new(new_certs));
|
||||||
info!("Reload TLS certificates from {}", cfg.proxy_certificates.clone().unwrap())
|
|
||||||
}
|
}
|
||||||
None => {}
|
None => {}
|
||||||
};
|
};
|
||||||
@@ -112,5 +102,15 @@ pub fn run() {
|
|||||||
proxy.add_tcp(bind_address_http.as_str());
|
proxy.add_tcp(bind_address_http.as_str());
|
||||||
server.add_service(proxy);
|
server.add_service(proxy);
|
||||||
server.add_service(bg_srvc);
|
server.add_service(bg_srvc);
|
||||||
server.run_forever();
|
|
||||||
|
thread::spawn(move || server.run_forever());
|
||||||
|
|
||||||
|
if let (Some(user), Some(group)) = (cfg.rungroup.clone(), cfg.runuser.clone()) {
|
||||||
|
drop_priv(user, group, cfg.proxy_address_http.clone(), cfg.proxy_address_tls.clone());
|
||||||
|
}
|
||||||
|
|
||||||
|
let (tx, rx) = channel();
|
||||||
|
ctrlc::set_handler(move || tx.send(()).expect("Could not send signal on channel.")).expect("Error setting Ctrl-C handler");
|
||||||
|
rx.recv().expect("Could not receive from channel.");
|
||||||
|
info!("Signal received ! Exiting...");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -92,7 +92,7 @@ async fn conf(State(mut st): State<AppState>, Query(params): Query<HashMap<Strin
|
|||||||
|
|
||||||
if let Some(s) = params.get("key") {
|
if let Some(s) = params.get("key") {
|
||||||
if s.to_owned() == st.master_key {
|
if s.to_owned() == st.master_key {
|
||||||
if let Some(serverlist) = crate::utils::parceyaml::load_configuration(content.as_str(), "content") {
|
if let Some(serverlist) = crate::utils::parceyaml::load_configuration(content.as_str(), "content").await {
|
||||||
st.config_sender.send(serverlist).await.unwrap();
|
st.config_sender.send(serverlist).await.unwrap();
|
||||||
return Response::builder().status(StatusCode::OK).body(Body::from("Config, conf file, updated !\n")).unwrap();
|
return Response::builder().status(StatusCode::OK).body(Body::from("Config, conf file, updated !\n")).unwrap();
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user