Update Tokio and ZIP to address RustSec advisories

Author: dlunch

Cargo.lock

@@ -19,7 +19,7 @@ nom = { version = "^8.0", default-features = false, features = ["alloc"] }
 parking_lot = { version = "^0.12", default-features = false }
 tracing = { version = "^0.1", default-features = false, features = ["attributes"] }
 
-tokio = { version = "^1.52", features = ["macros"] }
+tokio = { version = "^1.54.1", features = ["macros"] }
 
 classfile = { path = "classfile", version = "0.3.2" }
 jvm = { path = "jvm", version = "0.3.2" }

Cargo.toml

@@ -20,7 +20,7 @@ chrono = { version = "^0.4", default-features = false }
 encoding_rs = { version = "^0.8", features = ["alloc"], default-features = false }
 tracing-attributes = { version = "<0.1.29" }                                       # Pin this to avoid compile error with no-std https://github.com/tokio-rs/tracing/issues/3388
 url = { version = "^2.5", default-features = false }
-zip = { version = "^8.6", features = ["deflate"], default-features = false }
+zip = { version = "^9.0.5", features = ["deflate"], default-features = false }
 
 jvm = { workspace = true }
 jvm-class-proto = { workspace = true }

rustjava-runtime/Cargo.toml

@@ -125,9 +125,18 @@ impl JarFile {
         if manifest_file.is_null() {
             let name = {
                 let zip = ZipFile::get_zip_archive(jvm, &ClassInstanceRef::from(this.instance.clone())).await?;
-                zip.file_names()
-                    .find(|name| name.eq_ignore_ascii_case("META-INF/MANIFEST.MF"))
-                    .map(ToString::to_string)
+                let mut manifest_name = None;
+                for name in zip.file_names() {
+                    let name = match name {
+                        Ok(name) => name,
+                        Err(err) => return Err(jvm.exception("java/util/zip/ZipException", &err.to_string()).await),
+                    };
+                    if name.eq_ignore_ascii_case("META-INF/MANIFEST.MF") {
+                        manifest_name = Some(name.into_owned());
+                        break;
+                    }
+                }
+                manifest_name
             };
             let Some(name) = name else {
                 return Ok(None.into());

rustjava-runtime/src/classes/java/util/jar/jar_file.rs

@@ -110,7 +110,10 @@ impl ZipFile {
         tracing::debug!("java.util.zip.ZipFile::entries({this:?})");
 
         let zip = Self::get_zip_archive(jvm, &this).await?;
-        let names = zip.file_names().map(|x| x.to_string()).collect::<Vec<_>>();
+        let names = match zip.file_names().collect::<core::result::Result<Vec<_>, _>>() {
+            Ok(names) => names,
+            Err(err) => return Err(jvm.exception("java/util/zip/ZipException", &err.to_string()).await),
+        };
 
         let mut name_array = jvm.instantiate_array("Ljava/lang/String;", names.len() as _).await?;
         for (i, name) in names.iter().enumerate() {