Merge pull request 'Update Rust crate clap to 4.5.48' (#44) from renovate/clap-4.x into master

Reviewed-on: #5

.drone.yml

@@ -0,0 +1,15 @@
+---
+kind: pipeline
+type: docker
+name: default
+
+steps:
+- name: cargo_check
+  image: rust
+  commands:
+  - rustup component add clippy
+  - cargo clippy -- -D warnings
+  - cargo test
+
+
+

Cargo.toml

@@ -1,18 +1,18 @@
 [package]
 name = "pages_server"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 license = "GPL-3.0-only"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-clap = { version = "3.1.8", features = ["derive", "env"] }
+clap = { version = "4.5.48", features = ["derive", "env"] }
-actix-web = "4"
+actix-web = "4.11.0"
-actix-files = "0.6"
+actix-files = "0.6.8"
-actix-multipart = "0.4"
+actix-multipart = "0.7.2"
-env_logger = "0.9.0"
+env_logger = "0.11.8"
-log = "0.4"
+log = "0.4.28"
-bytes = "1.1.0"
+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"

renovate.json

@@ -1,3 +1,3 @@
 {
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json"
+  "extends": ["local>renovate/presets"]
 }

src/main.rs

@@ -3,10 +3,10 @@ use std::path::{Path, PathBuf};
 
 use actix_files::{Files, NamedFile};
 use actix_multipart::Multipart;
-use actix_web::dev::{fn_service, ServiceRequest, ServiceResponse};
+use actix_web::dev::{ServiceRequest, ServiceResponse, fn_service};
 use actix_web::error::{ErrorBadRequest, ErrorInternalServerError, ErrorUnauthorized};
 use actix_web::middleware::Logger;
-use actix_web::{web, App, Error, HttpRequest, HttpResponse, HttpServer};
+use actix_web::{App, Error, HttpRequest, HttpResponse, HttpServer, web};
 use bytes::BufMut;
 use clap::Parser;
 use futures_util::TryStreamExt;
@@ -84,13 +84,12 @@ fn get_remote_ip(req: &HttpRequest, args: &Args) -> String {
     let mut ip = req.peer_addr().unwrap().ip().to_string();
 
     // 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
                     .to_str()
                     .unwrap()
-                    .to_string()
                     .split(',')
                     .map(|f| f.to_string())
                     .collect();
@@ -99,8 +98,6 @@ fn get_remote_ip(req: &HttpRequest, args: &Args) -> String {
                     ip = header[0].to_string();
                 }
             }
-        }
-    }
 
     ip
 }
@@ -286,3 +283,13 @@ async fn main() -> std::io::Result<()> {
     .run()
     .await
 }
+
+#[cfg(test)]
+mod test {
+    use crate::Args;
+    #[test]
+    fn verify_cli() {
+        use clap::CommandFactory;
+        Args::command().debug_assert()
+    }
+}