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

virtweb_backend/Cargo.lock

@@ -811,9 +811,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.40"
+version = "4.5.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40b6887a1d8685cebccf115538db5c0efe625ccac9696ad45c409d96566e910f"
+checksum = "be92d32e80243a54711e5d7ce823c35c41c9d929dc4ab58e1276f625841aadf9"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -821,9 +821,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.40"
+version = "4.5.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0c66c08ce9f0c698cbce5c0279d0bb6ac936d8674174fe48f736533b964f59e"
+checksum = "707eab41e9622f9139419d573eca0900137718000c517d47da73045f54331c3d"
 dependencies = [
  "anstream",
  "anstyle",
@@ -833,9 +833,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.40"
+version = "4.5.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2c7947ae4cc3d851207c1adb5b5e260ff0cca11446b1d6d1423788e442257ce"
+checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -2938,9 +2938,9 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "reqwest"
-version = "0.12.20"
+version = "0.12.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eabf4c97d9130e2bf606614eb937e86edac8292eaa6f422f995d7e8de1eb1813"
+checksum = "cbc931937e6ca3a06e3b6c0aa7841849b160a90351d6ab467a8b9b9959767531"
 dependencies = [
  "base64 0.22.1",
  "bytes",

virtweb_backend/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2024"
 [dependencies]
 log = "0.4.27"
 env_logger = "0.11.8"
-clap = { version = "4.5.40", features = ["derive", "env"] }
+clap = { version = "4.5.41", features = ["derive", "env"] }
 light-openid = { version = "1.0.4", features = ["crypto-wrapper"] }
 lazy_static = "1.5.0"
 actix = "0.13.5"
@@ -28,7 +28,7 @@ futures-util = "0.3.31"
 anyhow = "1.0.98"
 actix-multipart = "0.7.2"
 tempfile = "3.20.0"
-reqwest = { version = "0.12.20", features = ["stream"] }
+reqwest = { version = "0.12.22", features = ["stream"] }
 url = "2.5.4"
 virt = "0.4.2"
 sysinfo = { version = "0.35.2", features = ["serde"] }

virtweb_backend/src/actors/libvirt_actor.rs

@@ -27,10 +27,7 @@ impl LibVirtActor {
     /// Connect to hypervisor
     pub async fn connect() -> anyhow::Result<Self> {
         let hypervisor_uri = AppConfig::get().hypervisor_uri.as_deref().unwrap_or("");
-        log::info!(
+        log::info!("Will connect to hypvervisor at address '{hypervisor_uri}'",);
-            "Will connect to hypvervisor at address '{}'",
-            hypervisor_uri
-        );
         let conn = Connect::open(Some(hypervisor_uri))?;
 
         Ok(Self { m: conn })
@@ -102,7 +99,7 @@ impl Handler<GetDomainXMLReq> for LibVirtActor {
         log::debug!("Get domain XML:\n{}", msg.0.as_string());
         let domain = Domain::lookup_by_uuid_string(&self.m, &msg.0.as_string())?;
         let xml = domain.get_xml_desc(VIR_DOMAIN_XML_SECURE)?;
-        log::debug!("XML = {}", xml);
+        log::debug!("XML = {xml}");
         DomainXML::parse_xml(&xml)
     }
 }
@@ -131,7 +128,7 @@ impl Handler<DefineDomainReq> for LibVirtActor {
     fn handle(&mut self, mut msg: DefineDomainReq, _ctx: &mut Self::Context) -> Self::Result {
         let xml = msg.1.as_xml()?;
 
-        log::debug!("Define domain:\n{}", xml);
+        log::debug!("Define domain:\n{xml}");
         let domain = Domain::define_xml(&self.m, &xml)?;
         let uuid = XMLUuid::parse_from_str(&domain.get_uuid_string()?)?;
 
@@ -446,7 +443,7 @@ impl Handler<GetNetworkXMLReq> for LibVirtActor {
         log::debug!("Get network XML:\n{}", msg.0.as_string());
         let network = Network::lookup_by_uuid_string(&self.m, &msg.0.as_string())?;
         let xml = network.get_xml_desc(0)?;
-        log::debug!("XML = {}", xml);
+        log::debug!("XML = {xml}");
         NetworkXML::parse_xml(&xml)
     }
 }
@@ -602,7 +599,7 @@ impl Handler<GetNWFilterXMLReq> for LibVirtActor {
         log::debug!("Get network filter XML:\n{}", msg.0.as_string());
         let filter = NWFilter::lookup_by_uuid_string(&self.m, &msg.0.as_string())?;
         let xml = filter.get_xml_desc(0)?;
-        log::debug!("XML = {}", xml);
+        log::debug!("XML = {xml}");
         NetworkFilterXML::parse_xml(xml)
     }
 }
@@ -617,7 +614,7 @@ impl Handler<DefineNWFilterReq> for LibVirtActor {
     fn handle(&mut self, mut msg: DefineNWFilterReq, _ctx: &mut Self::Context) -> Self::Result {
         let xml = msg.1.into_xml()?;
 
-        log::debug!("Define network filter:\n{}", xml);
+        log::debug!("Define network filter:\n{xml}");
         let filter = NWFilter::define_xml(&self.m, &xml)?;
         let uuid = XMLUuid::parse_from_str(&filter.get_uuid_string()?)?;
 

virtweb_backend/src/app_config.rs

@@ -280,7 +280,7 @@ impl AppConfig {
 
     /// Get VM vnc sockets path for domain
     pub fn vnc_socket_for_domain(&self, name: &str) -> PathBuf {
-        self.vnc_sockets_path().join(format!("vnc-{}", name))
+        self.vnc_sockets_path().join(format!("vnc-{name}"))
     }
 
     /// Get VM root disks storage directory

virtweb_backend/src/controllers/disk_images_controller.rs

@@ -34,8 +34,7 @@ pub async fn upload(MultipartForm(mut form): MultipartForm<UploadDiskImageForm>)
     if let Some(mime_type) = file.content_type {
         if !constants::ALLOWED_DISK_IMAGES_MIME_TYPES.contains(&mime_type.as_ref()) {
             return Ok(HttpResponse::BadRequest().json(format!(
-                "Unsupported file type for disk upload: {}",
+                "Unsupported file type for disk upload: {mime_type}"
-                mime_type
             )));
         }
     }

virtweb_backend/src/controllers/iso_controller.rs

@@ -52,7 +52,7 @@ pub async fn upload_file(MultipartForm(mut form): MultipartForm<UploadIsoForm>)
     }
 
     let dest_file = AppConfig::get().iso_storage_path().join(file_name);
-    log::info!("Will save ISO file {:?}", dest_file);
+    log::info!("Will save ISO file {dest_file:?}");
 
     if dest_file.exists() {
         log::error!("Conflict with uploaded iso file name!");

virtweb_backend/src/controllers/mod.rs

@@ -43,7 +43,7 @@ impl actix_web::error::ResponseError for HttpErr {
         }
     }
     fn error_response(&self) -> HttpResponse<BoxBody> {
-        log::error!("Error while processing request! {}", self);
+        log::error!("Error while processing request! {self}");
 
         HttpResponse::InternalServerError().body("Failed to execute request!")
     }

virtweb_backend/src/libvirt_rest_structures/nw_filter.rs

@@ -109,7 +109,7 @@ fn extract_ip_mask<const V: usize>(n: Option<u8>) -> anyhow::Result<Option<u8>>
 fn extract_nw_filter_comment(n: &Option<String>) -> anyhow::Result<Option<String>> {
     if let Some(comment) = n {
         if comment.len() > 256 || comment.contains('\"') || comment.contains('\n') {
-            return Err(NetworkFilterExtraction(format!("Invalid comment! {}", comment)).into());
+            return Err(NetworkFilterExtraction(format!("Invalid comment! {comment}")).into());
         }
     }
 

virtweb_backend/src/middlewares/auth_middleware.rs

@@ -69,8 +69,7 @@ where
 
             if !AppConfig::get().is_allowed_ip(remote_ip.0) {
                 log::error!(
-                    "An attempt to access VirtWeb from an unauthorized network has been intercepted! {:?}",
+                    "An attempt to access VirtWeb from an unauthorized network has been intercepted! {remote_ip:?}"
-                    remote_ip
                 );
                 return Ok(req
                     .into_response(

virtweb_backend/src/utils/cloud_init_utils.rs

@@ -81,10 +81,10 @@ impl CloudInitConfig {
         // Process metadata
         let mut metadatas = vec![];
         if let Some(inst_id) = &self.instance_id {
-            metadatas.push(format!("instance-id: {}", inst_id));
+            metadatas.push(format!("instance-id: {inst_id}"));
         }
         if let Some(local_hostname) = &self.local_hostname {
-            metadatas.push(format!("local-hostname: {}", local_hostname));
+            metadatas.push(format!("local-hostname: {local_hostname}"));
         }
         if let Some(dsmode) = &self.dsmode {
             metadatas.push(format!(

virtweb_frontend/package.json

@@ -11,15 +11,15 @@
   },
   "dependencies": {
     "@emotion/react": "^11.14.0",
-    "@emotion/styled": "^11.14.0",
+    "@emotion/styled": "^11.14.1",
     "@fontsource/roboto": "^5.2.6",
     "@mdi/js": "^7.4.47",
     "@mdi/react": "^1.6.1",
     "@monaco-editor/react": "^4.7.0",
-    "@mui/icons-material": "^7.1.1",
+    "@mui/icons-material": "^7.1.2",
-    "@mui/material": "^7.1.1",
+    "@mui/material": "^7.1.2",
-    "@mui/x-charts": "^8.5.3",
+    "@mui/x-charts": "^8.3.1",
-    "@mui/x-data-grid": "^8.3.1",
+    "@mui/x-data-grid": "^8.7.0",
     "date-and-time": "^3.6.0",
     "filesize": "^10.1.6",
     "humanize-duration": "^3.32.2",
@@ -27,7 +27,7 @@
     "monaco-yaml": "^5.4.0",
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
-    "react-router-dom": "^7.6.2",
+    "react-router-dom": "^7.6.3",
     "react-syntax-highlighter": "^15.6.1",
     "react-vnc": "^3.1.0",
     "uuid": "^11.1.0",
@@ -42,13 +42,13 @@
     "@types/react-dom": "^19.1.6",
     "@types/react-syntax-highlighter": "^15.5.13",
     "@types/uuid": "^10.0.0",
-    "@vitejs/plugin-react": "^4.4.1",
+    "@vitejs/plugin-react": "^4.6.0",
-    "eslint": "^9.27.0",
+    "eslint": "^9.30.1",
-    "eslint-plugin-react-dom": "^1.49.0",
+    "eslint-plugin-react-dom": "^1.52.2",
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-react-refresh": "^0.4.20",
-    "eslint-plugin-react-x": "^1.49.0",
+    "eslint-plugin-react-x": "^1.52.2",
-    "globals": "^16.1.0",
+    "globals": "^16.3.0",
     "typescript": "^5.8.3",
     "typescript-eslint": "^8.32.1",
     "vite": "^6.3.5"

virtweb_frontend/src/routes/SysInfoRoute.tsx

@@ -319,7 +319,7 @@ function DiskDetailsTable(p: { disks: DiskInfo[] }): React.ReactElement {
           {p.disks.map((e, c) => (
             <TableRow hover key={c}>
               <TableCell>{e.name}</TableCell>
-              <TableCell>{e.DiskKind}</TableCell>
+              <TableCell>{String(e.DiskKind)}</TableCell>
               <TableCell>{e.mount_point}</TableCell>
               <TableCell>{filesize(e.total_space)}</TableCell>
               <TableCell>{filesize(e.available_space)}</TableCell>