pierre/PagesServer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

..

28 Commits
4b7db1f0ab ... master

Author SHA1 Message Date
Renovate Bot
28581909a4 Merge pull request 'Update Rust crate actix-files to 0.6.8' () from renovate/actix-files-0.x into master 2025-09-17 00:39:29 +00:00
Renovate Bot
1fbf518b8a Update Rust crate actix-files to 0.6.8 2025-09-16 00:39:31 +00:00
Renovate Bot
ebd043f020 Merge pull request 'Update Rust crate log to 0.4.28' () from renovate/log-0.x into master 2025-09-05 00:24:58 +00:00
Renovate Bot
71811665c8 Update Rust crate log to 0.4.28 2025-09-04 00:32:29 +00:00
Renovate Bot
f70607f818 Merge pull request 'Update Rust crate clap to 4.5.47' () from renovate/clap-4.x into master 2025-09-04 00:32:26 +00:00
Renovate Bot
4e0f4d4521 Update Rust crate clap to 4.5.47 2025-09-03 00:31:06 +00:00
Renovate Bot
a1eedcbeb7 Merge pull request 'Update Rust crate actix-files to 0.6.7' () from renovate/actix-files-0.x into master 2025-08-31 00:30:09 +00:00
Renovate Bot
373f54e06e Update Rust crate actix-files to 0.6.7 2025-08-30 00:29:50 +00:00
Pierre HUBERT
52cca797da Fix cargo clippy issue 2025-08-28 08:09:58 +02:00
Renovate Bot
a75ef10f3c Merge pull request 'Update Rust crate clap to 4.5.46' () from renovate/clap-4.x into master 2025-08-28 00:31:34 +00:00
Renovate Bot
17598abdf4 Update Rust crate clap to 4.5.46 2025-08-27 00:31:19 +00:00
Renovate Bot
a9c0768ab4 Merge pull request 'Update Rust crate clap to 4.5.45' () from renovate/clap-4.x into master 2025-08-14 00:30:44 +00:00
Renovate Bot
13946ed35f Update Rust crate clap to 4.5.45 2025-08-13 00:31:14 +00:00
Renovate Bot
c92a337c60 Merge pull request 'Update Rust crate clap to 4.5.43' () from renovate/clap-4.x into master 2025-08-08 00:18:18 +00:00
Renovate Bot
2d4c3af291 Update Rust crate clap to 4.5.43 2025-08-07 00:18:45 +00:00
Renovate Bot
113c414f31 Merge pull request 'Update Rust crate clap to 4.5.41' () from renovate/clap-4.x into master 2025-07-31 00:17:53 +00:00
Renovate Bot
2a20aad6e1 Update Rust crate clap to 4.5.42 2025-07-31 00:17:50 +00:00
Renovate Bot
3fa2c3c530 Update Rust crate clap to 4.5.40 2025-06-10 00:24:08 +00:00
Renovate Bot
3b87d66a36 Update Rust crate clap to 4.5.39 2025-05-28 00:09:50 +00:00
Renovate Bot
8dca766f8e Update Rust crate futures-util to 0.3.31 2025-05-19 00:08:43 +00:00
Renovate Bot
7b74250c86 Update Rust crate actix-web to 4.11.0 2025-05-13 00:18:49 +00:00
Renovate Bot
2037576627 Update Rust crate clap to 4.5.38 2025-05-12 00:18:03 +00:00
Renovate Bot
46a40ef66a Update Rust crate clap to 4.5.37 2025-04-19 00:29:07 +00:00
Renovate Bot
b6dd41c4cc Update Rust crate clap to 4.5.36 2025-04-12 00:28:39 +00:00
Renovate Bot
48f9a79b05 Update Rust crate env_logger to 0.11.8 2025-04-03 00:36:28 +00:00
Renovate Bot
c25396d62a Update Rust crate clap to 4.5.35 2025-04-02 00:36:49 +00:00
Renovate Bot
431816900c Update Rust crate tar to 0.4.44 2025-03-31 20:52:17 +00:00
Renovate Bot
b07d8ae520 Update Rust crate log to 0.4.27 2025-03-31 00:36:23 +00:00
3 changed files with 35 additions and 37 deletions

50
Cargo.lock generated

@@ -21,9 +21,9 @@ dependencies = [
[[package]] [[package]]
name = "actix-files" name = "actix-files"
version = "0.6.6" version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0773d59061dedb49a8aed04c67291b9d8cf2fe0b60130a381aab53c6dd86e9be" checksum = "6c0d87f10d70e2948ad40e8edea79c8e77c6c66e0250a4c1f09b690465199576"
dependencies = [ dependencies = [
"actix-http", "actix-http",
"actix-service", "actix-service",
@@ -31,7 +31,7 @@ dependencies = [
"actix-web", "actix-web",
"bitflags", "bitflags",
"bytes", "bytes",
"derive_more 0.99.19", "derive_more 2.0.1",
"futures-core", "futures-core",
"http-range", "http-range",
"log", "log",
@@ -44,9 +44,9 @@ dependencies = [
[[package]] [[package]]
name = "actix-http" name = "actix-http"
version = "3.10.0" version = "3.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fa882656b67966045e4152c634051e70346939fced7117d5f0b52146a7c74c9" checksum = "44dfe5c9e0004c623edc65391dfd51daa201e7e30ebd9c9bedf873048ec32bc2"
dependencies = [ dependencies = [
"actix-codec", "actix-codec",
"actix-rt", "actix-rt",
@@ -156,9 +156,9 @@ dependencies = [
[[package]] [[package]]
name = "actix-server" name = "actix-server"
version = "2.5.1" version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6398974fd4284f4768af07965701efbbb5fdc0616bff20cade1bb14b77675e24" checksum = "a65064ea4a457eaf07f2fba30b4c695bf43b721790e9530d26cb6f9019ff7502"
dependencies = [ dependencies = [
"actix-rt", "actix-rt",
"actix-service", "actix-service",
@@ -193,9 +193,9 @@ dependencies = [
[[package]] [[package]]
name = "actix-web" name = "actix-web"
version = "4.10.2" version = "4.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2e3b15b3dc6c6ed996e4032389e9849d4ab002b1e92fbfe85b5f307d1479b4d" checksum = "a597b77b5c6d6a1e1097fddde329a83665e25c5437c696a3a9a4aa514a614dea"
dependencies = [ dependencies = [
"actix-codec", "actix-codec",
"actix-http", "actix-http",
@@ -379,9 +379,9 @@ dependencies = [
[[package]] [[package]]
name = "brotli" name = "brotli"
version = "7.0.0" version = "8.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd" checksum = "9991eea70ea4f293524138648e41ee89b0b2b12ddef3b255effa43c8056e0e0d"
dependencies = [ dependencies = [
"alloc-no-stdlib", "alloc-no-stdlib",
"alloc-stdlib", "alloc-stdlib",
@@ -390,9 +390,9 @@ dependencies = [
[[package]] [[package]]
name = "brotli-decompressor" name = "brotli-decompressor"
version = "4.0.2" version = "5.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74fa05ad7d803d413eb8380983b092cbbaf9a85f151b871360e7b00cd7060b37" checksum = "874bb8112abecc98cbd6d81ea4fa7e94fb9449648c93cc89aa40c81c24d7de03"
dependencies = [ dependencies = [
"alloc-no-stdlib", "alloc-no-stdlib",
"alloc-stdlib", "alloc-stdlib",
@@ -432,9 +432,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]] [[package]]
name = "clap" name = "clap"
version = "4.5.34" version = "4.5.47"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e958897981290da2a852763fe9cdb89cd36977a5d729023127095fa94d95e2ff" checksum = "7eac00902d9d136acd712710d71823fb8ac8004ca445a89e73a41d45aa712931"
dependencies = [ dependencies = [
"clap_builder", "clap_builder",
"clap_derive", "clap_derive",
@@ -442,9 +442,9 @@ dependencies = [
[[package]] [[package]]
name = "clap_builder" name = "clap_builder"
version = "4.5.34" version = "4.5.47"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83b0f35019843db2160b5bb19ae09b4e6411ac33fc6a712003c33e03090e2489" checksum = "2ad9bbf750e73b5884fb8a211a9424a1906c1e156724260fdae972f31d70e1d6"
dependencies = [ dependencies = [
"anstream", "anstream",
"anstyle", "anstyle",
@@ -454,9 +454,9 @@ dependencies = [
[[package]] [[package]]
name = "clap_derive" name = "clap_derive"
version = "4.5.32" version = "4.5.47"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7" checksum = "bbfd7eae0b0f1a6e63d4b13c9c478de77c2eb546fba158ad50b4203dc24b9f9c"
dependencies = [ dependencies = [
"heck", "heck",
"proc-macro2", "proc-macro2",
@@ -641,9 +641,9 @@ dependencies = [
[[package]] [[package]]
name = "env_logger" name = "env_logger"
version = "0.11.7" version = "0.11.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3716d7a920fb4fac5d84e9d4bce8ceb321e9414b4409da61b07b75c1e3d0697" checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f"
dependencies = [ dependencies = [
"anstream", "anstream",
"anstyle", "anstyle",
@@ -1117,9 +1117,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 = "memchr" name = "memchr"
@@ -1662,9 +1662,9 @@ dependencies = [
[[package]] [[package]]
name = "tokio" name = "tokio"
version = "1.44.1" version = "1.45.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f382da615b842244d4b8738c82ed1275e6c5dd90c459a30941cd07080b06c91a" checksum = "2513ca694ef9ede0fb23fe71a4ee4107cb102b9dc1930f6d0fd77aae068ae165"
dependencies = [ dependencies = [
"backtrace", "backtrace",
"bytes", "bytes",

14
Cargo.toml

@@ -7,12 +7,12 @@ license = "GPL-3.0-only"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
clap = { version = "4.5.34", features = ["derive", "env"] } clap = { version = "4.5.47", features = ["derive", "env"] }
actix-web = "4.10.2" actix-web = "4.11.0"
actix-files = "0.6.6" actix-files = "0.6.8"
actix-multipart = "0.7.2" actix-multipart = "0.7.2"
env_logger = "0.11.7" env_logger = "0.11.8"
log = "0.4" log = "0.4.28"
bytes = "1.10.1" bytes = "1.10.1"
futures-util = { version = "0.3.21", default-features = false, features = ["std"] } futures-util = { version = "0.3.31", default-features = false, features = ["std"] }
tar = "0.4.38" tar = "0.4.44"

8
src/main.rs

@@ -84,9 +84,9 @@ fn get_remote_ip(req: &HttpRequest, args: &Args) -> String {
let mut ip = req.peer_addr().unwrap().ip().to_string(); let mut ip = req.peer_addr().unwrap().ip().to_string();
// We check if the request comes from a trusted reverse proxy // We check if the request comes from a trusted reverse proxy
if let Some(proxy) = args.proxy_ip.as_ref() { if let Some(proxy) = args.proxy_ip.as_ref()
if match_ip(proxy, &ip) { && match_ip(proxy, &ip)
if let Some(header) = req.headers().get("X-Forwarded-For") { && let Some(header) = req.headers().get("X-Forwarded-For") {
let header: Vec<String> = header let header: Vec<String> = header
.to_str() .to_str()
.unwrap() .unwrap()
@@ -98,8 +98,6 @@ fn get_remote_ip(req: &HttpRequest, args: &Args) -> String {
ip = header[0].to_string(); ip = header[0].to_string();
} }
} }
}
}
ip ip
} }