merge: Merge pull request #203 from arunaengine/fix/cors

Fix/cors

Author: lfbrehm

Cargo.lock

@@ -20,8 +20,8 @@ async-trait = "0.1.88"
 aws-config = "1.6.2"
 aws-sdk-s3 = "1.83.0"
 base64 = "0.22.1"
-cel-interpreter = "0.9.0"
-cel-parser = "0.8.0"
+cel-interpreter = "0.9.1"
+cel-parser = "0.8.1"
 chrono = "0.4.38"
 dashmap = {version = "6.1.0", features = ["serde"]}
 deadpool-postgres = "0.14.1"
@@ -35,7 +35,7 @@ lazy_static = "1.5.0"
 postgres-from-row = "=0.5.2"
 postgres-types = { version = "0.2.9", features = ["derive"] }
 prost-wkt-types = "0.5.1"
-rand = "0.8.5"
+rand = "0.9.2"
 reqsign = { version = "0.16.3"}
 reqwest = { version = "0.12.15", features = ["stream", "json"] }
 serde = { version = "1.0.219", features = ["derive"] }
@@ -46,5 +46,5 @@ tokio = { version = "1.44.2", features = ["full", "tracing"] }
 tokio-postgres = { version = "0.7.13", features = ["with-uuid-1", "with-serde_json-1", "with-chrono-0_4"] }
 tokio-stream = { version = "0.1.17", features = ["net"] }
 tonic = { version = "0.11.0", features = ["tls", "tls-roots"] }
-tower = { version = "0.4.13", features = ["retry"] }
+tower = { version = "0.5.2", features = ["retry"] }
 url = "2.5.4"

Cargo.toml

@@ -14,11 +14,11 @@ ahash = { workspace = true }
 anyhow = { workspace = true }
 aruna-rust-api = { workspace = true }
 async-channel = { workspace = true }
-async-stream = "0.3.5"
+async-stream = "0.3.6"
 async-trait = { workspace = true }
 aws-config = { workspace = true }
 aws-sdk-s3 = { workspace = true }
-aws-smithy-http = "0.62.1"
+aws-smithy-http = "0.62.3"
 base64 = { workspace = true }
 byteorder = "1.5.0"
 bytes = "1.10.1"
@@ -33,11 +33,11 @@ deadpool-postgres = { workspace = true }
 diesel-ulid = { workspace = true }
 digest = "0.10.7"
 dotenvy = { workspace = true }
-ed25519-dalek = { version = "2.1.1", features = ["pem"] }
+ed25519-dalek = { version = "2.2.0", features = ["pem"] }
 futures = { workspace = true }
-futures-channel = "0.3.30"
-futures-core = "0.3.30"
-futures-util = "0.3.30"
+futures-channel = "0.3.31"
+futures-core = "0.3.31"
+futures-util = "0.3.31"
 hex = { workspace = true }
 hmac = { workspace = true }
 http = "1.3.1"
@@ -46,37 +46,37 @@ jsonwebtoken = { workspace = true }
 lazy_static = { workspace = true }
 md-5 = "0.10.6"
 mime_guess = "2.0.5"
-nom = "7.1.3"
+nom = "8.0.0"
 pithos_lib = "0.6.2"
 postgres-from-row = { workspace = true }
 postgres-types = { workspace = true }
 postgres_array = "0.11.1"
 prost-wkt-types = { workspace = true }
 rand = { workspace = true }
-regex = "1.11.0"
-reqsign = "0.16.0"
+regex = "1.11.1"
+reqsign = "0.16.5"
 reqwest = { workspace = true }
-s3s = "0.10.0"
+s3s = "0.11.0"
 serde = { workspace = true }
 serde_json = { workspace = true }
 sha2 = { workspace = true }
 time = { workspace = true }
 tokio = { workspace = true }
 tokio-postgres = { workspace = true }
 tokio-stream = { workspace = true }
-toml = "0.8.22"
+toml = "0.9.5"
 tonic = { workspace = true }
 tower = { workspace = true }
-tower-http = { version = "0.5.2", features = ["cors"] }
+tower-http = { version = "0.6.6", features = ["cors"] }
 tracing = "0.1.41"
 tracing-subscriber = { version = "0.3.19", features = ["env-filter", "time"] }
 url = { workspace = true }
-zstd = "0.13.2"
-hyper-util = { version = "0.1.11", features = [
+zstd = "0.13.3"
+hyper-util = { version = "0.1.16", features = [
     "server",
     "http1",
     "http2",
     "tokio",
     "service",
 ] }
-http-body-util = "0.1.2"
+http-body-util = "0.1.3"

components/data_proxy/Cargo.toml

@@ -22,7 +22,7 @@ use crossbeam_skiplist::SkipMap;
 use dashmap::DashMap;
 use diesel_ulid::DieselUlid;
 use jsonwebtoken::DecodingKey;
-use rand::{distributions::Alphanumeric, thread_rng, Rng};
+use rand::{distr::Alphanumeric, rng as thread_rng, Rng};
 use s3s::auth::SecretKey;
 use s3s::dto::Part;
 use std::collections::{HashMap, VecDeque};

components/data_proxy/src/caching/cache.rs

@@ -536,9 +536,8 @@ impl GrpcQueryHandler {
         let cors = match obj
             .key_values
             .iter()
-            .filter(|e| e.key == "app.aruna-storage.org/cors")
+            .find(|e| e.key == "app.aruna-storage.org/cors")
             .cloned()
-            .next()
         {
             Some(cors) => cors,
             None => KeyValue {

components/data_proxy/src/caching/grpc_query_handler.rs

@@ -7,7 +7,7 @@ use diesel_ulid::DieselUlid;
 use digest::Digest;
 use futures_util::StreamExt;
 use md5::Md5;
-use rand::{distributions::Alphanumeric, thread_rng, Rng};
+use rand::{distr::Alphanumeric, rng as thread_rng, Rng};
 use std::path::Path;
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use tokio::pin;

components/data_proxy/src/data_backends/filesystem_backend.rs

@@ -10,8 +10,8 @@ use nom::{
     sequence::{preceded, terminated},
     IResult, Parser,
 };
-use rand::distributions::Alphanumeric;
-use rand::thread_rng;
+use rand::distr::Alphanumeric;
+use rand::rng as thread_rng;
 use rand::Rng;
 
 use crate::CONFIG;
@@ -139,7 +139,7 @@ impl CompiledVariant {
     }
 
     pub fn compile(input: &str) -> IResult<&str, Self> {
-        alt((Self::compile_s3, Self::compile_filesystem))(input)
+        alt((Self::compile_s3, Self::compile_filesystem)).parse(input)
     }
 
     pub fn compile_s3(scheme: &str) -> IResult<&str, Self> {
@@ -228,10 +228,13 @@ impl CompiledVariant {
             tag("/").map(|_| Arguments::Slash),
             take_while(|c| c != '{' && c != '}' && c != '/')
                 .map(|x: &str| Arguments::Text(x.to_string())),
-        ))(input)
+        ))
+        .parse(input)
     }
 
     pub fn compile_tags(input: &str) -> IResult<&str, Vec<Arguments>> {
-        many_till(Self::compile_tag, eof)(input).map(|(x, (y, _))| (x, y))
+        many_till(Self::compile_tag, eof)
+            .parse(input)
+            .map(|(x, (y, _))| (x, y))
     }
 }

components/data_proxy/src/data_backends/location_handler.rs

@@ -402,7 +402,7 @@ impl StorageBackend for S3Backend {
         self.check_and_create_bucket(target.bucket.clone()).await?;
         self.s3_client
             .copy_object()
-            .copy_source(&[source.bucket, source.key].join("/"))
+            .copy_source([source.bucket, source.key].join("/"))
             .bucket(target.bucket)
             .key(target.key)
             .send()

components/data_proxy/src/data_backends/s3_backend.rs

@@ -2,7 +2,7 @@ use std::collections::HashSet;
 
 use anyhow::Result;
 use http::Method;
-use rand::distributions::DistString;
+use rand::distr::SampleString as DistString;
 use reqsign::{AwsCredential, AwsV4Signer};
 use url::Url;
 
@@ -139,8 +139,8 @@ pub fn is_method_read(method: &Method) -> bool {
 }
 
 pub fn random_string(len: usize) -> String {
-    use rand::distributions::Alphanumeric;
-    use rand::thread_rng;
+    use rand::distr::Alphanumeric;
+    use rand::rng as thread_rng;
     Alphanumeric
         .sample_string(&mut thread_rng(), len)
         .to_ascii_lowercase()

components/data_proxy/src/helpers.rs

@@ -1,12 +1,14 @@
 use crate::caching::cache::Cache;
 use s3s::{
-    auth::{S3Auth, S3AuthContext, SecretKey},
+    access::{S3Access, S3AccessContext},
+    auth::{S3Auth, SecretKey},
     s3_error, S3Result,
 };
 use std::sync::Arc;
 use tracing::debug;
 
 /// Aruna authprovider
+#[derive(Clone)]
 pub struct AuthProvider {
     cache: Arc<Cache>,
 }
@@ -30,9 +32,12 @@ impl S3Auth for AuthProvider {
             .map_err(|_| s3_error!(AccessDenied, "Invalid access key"))?;
         Ok(secret)
     }
+}
 
+#[async_trait::async_trait]
+impl S3Access for AuthProvider {
     #[tracing::instrument(level = "trace", skip(self, cx))]
-    async fn check_access(&self, cx: &mut S3AuthContext<'_>) -> S3Result<()> {
+    async fn check(&self, cx: &mut S3AccessContext<'_>) -> S3Result<()> {
         debug!(path = ?cx.s3_path());
 
         match self.cache.auth.read().await.as_ref() {