From 4d5d048b2489d4eace3908d27a28ef51a559c9b5 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Tue, 6 Feb 2024 13:20:57 +0100 Subject: [PATCH 1/8] Remove unused dependencies --- bridge/Cargo.lock | 29 ---------------------- bridge/svix-bridge-plugin-queue/Cargo.toml | 3 +-- bridge/svix-bridge/Cargo.toml | 3 --- server/Cargo.lock | 3 --- server/svix-server/Cargo.toml | 2 -- server/svix-server_derive/Cargo.toml | 1 - 6 files changed, 1 insertion(+), 40 deletions(-) diff --git a/bridge/Cargo.lock b/bridge/Cargo.lock index 90b5c08e0..366a1c57f 100644 --- a/bridge/Cargo.lock +++ b/bridge/Cargo.lock @@ -2981,12 +2981,6 @@ dependencies = [ "http", ] -[[package]] -name = "http-range-header" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" - [[package]] name = "http-types" version = "2.12.0" @@ -5654,10 +5648,8 @@ dependencies = [ "deno_runtime", "enum_dispatch", "http", - "hyper 0.14.27", "once_cell", "opentelemetry", - "opentelemetry-http", "opentelemetry-otlp", "serde", "serde_json", @@ -5670,7 +5662,6 @@ dependencies = [ "tikv-jemallocator", "tokio", "tower", - "tower-http", "tracing", "tracing-opentelemetry", "tracing-subscriber", @@ -5683,7 +5674,6 @@ dependencies = [ "aws-config", "aws-sdk-sqs", "fastrand 1.9.0", - "futures-lite", "google-cloud-googleapis", "google-cloud-pubsub", "lapin", @@ -6539,25 +6529,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "tower-http" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" -dependencies = [ - "bitflags 1.3.2", - "bytes", - "futures-core", - "futures-util", - "http", - "http-body 0.4.5", - "http-range-header", - "pin-project-lite", - "tower-layer", - "tower-service", - "tracing", -] - [[package]] name = "tower-layer" version = "0.3.2" diff --git a/bridge/svix-bridge-plugin-queue/Cargo.toml b/bridge/svix-bridge-plugin-queue/Cargo.toml index fcf03917b..25afb583e 100644 --- a/bridge/svix-bridge-plugin-queue/Cargo.toml +++ b/bridge/svix-bridge-plugin-queue/Cargo.toml @@ -6,7 +6,6 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -futures-lite = "1.12.0" omniqueue = { git = "https://github.com/svix/omniqueue-rs", rev = "247904053bcf90cf693df4429092923bf97770eb" } serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } @@ -25,4 +24,4 @@ google-cloud-pubsub = "0.18.0" lapin = "2" redis = { version = "0.21", features = ["tokio-comp", "streams"] } tracing-subscriber = "0.3" -wiremock = "0.5.18" \ No newline at end of file +wiremock = "0.5.18" diff --git a/bridge/svix-bridge/Cargo.toml b/bridge/svix-bridge/Cargo.toml index 1655d1a8e..172b4f908 100644 --- a/bridge/svix-bridge/Cargo.toml +++ b/bridge/svix-bridge/Cargo.toml @@ -11,10 +11,8 @@ clap = { version = "4.2.4", features = ["env", "derive"] } axum = { version = "0.6", features = ["macros"] } enum_dispatch = "0.3" http = "0.2" -hyper = { version = "0.14", features = ["full"] } once_cell = "1.18.0" opentelemetry = { version = "0.18.0", features = ["rt-tokio"] } -opentelemetry-http = "0.7.0" opentelemetry-otlp = { version = "0.11.0", features = ["metrics", "grpc-tonic", "http-proto", "reqwest-client"] } serde = { version = "1", features = ["derive"] } serde_json = "1" @@ -23,7 +21,6 @@ svix-ksuid = "0.7.0" svix-bridge-plugin-queue = { optional=true, path = "../svix-bridge-plugin-queue" } svix-bridge-types = { path = "../svix-bridge-types" } tokio = { version = "1", features = ["full"] } -tower-http = { version = "0.3", features = ["trace"] } tracing = "0.1" tracing-opentelemetry = "0.18.0" tracing-subscriber = { version="0.3", features=["env-filter", "fmt", "json"] } diff --git a/server/Cargo.lock b/server/Cargo.lock index 1eb922c3e..5fcf7f304 100644 --- a/server/Cargo.lock +++ b/server/Cargo.lock @@ -4300,8 +4300,6 @@ dependencies = [ "serde", "serde_json", "serde_path_to_error", - "serde_urlencoded", - "sha2", "sqlx", "strum 0.24.1", "strum_macros", @@ -4327,7 +4325,6 @@ dependencies = [ name = "svix-server_derive" version = "0.1.0" dependencies = [ - "proc-macro2", "quote", "syn 1.0.109", ] diff --git a/server/svix-server/Cargo.toml b/server/svix-server/Cargo.toml index 2f2cd7e3f..1128dd83e 100644 --- a/server/svix-server/Cargo.toml +++ b/server/svix-server/Cargo.toml @@ -17,7 +17,6 @@ svix-server_derive = { path = "../svix-server_derive" } svix = "0.60" svix-ksuid = "^0.5.1" dotenv = "0.15.0" -sha2 = "0.10.2" hmac-sha256 = "1" clap = { version = "4.1.8", features = ["derive"] } axum = { version = "0.6.1", features = ["headers"] } @@ -30,7 +29,6 @@ tower = "0.4.11" tower-http = { version = "0.4.0", features = ["trace", "cors", "request-id"] } serde = { version = "1.0.184", features = ["derive"] } serde_json = { version = "1.0.74", features = ["arbitrary_precision", "raw_value"] } -serde_urlencoded = "0.7.1" serde_path_to_error = "0.1.7" num_enum = "0.5.6" enum_dispatch = "0.3.8" diff --git a/server/svix-server_derive/Cargo.toml b/server/svix-server_derive/Cargo.toml index 82d5fbf49..be68c3af5 100644 --- a/server/svix-server_derive/Cargo.toml +++ b/server/svix-server_derive/Cargo.toml @@ -9,6 +9,5 @@ license = "MIT" proc-macro = true [dependencies] -proc-macro2 = "1.0.36" quote = "1.0.15" syn = "1.0.86" From 50dd8d9df5ad8e1a47fa75015f7c28be27c99cc4 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Tue, 6 Feb 2024 12:55:47 +0100 Subject: [PATCH 2/8] server: Remove strum dependency It was only used in one place, where its use was trivially replaced. --- server/Cargo.lock | 28 ++-------------------------- server/svix-server/Cargo.toml | 2 -- server/svix-server/src/queue/mod.rs | 14 ++++++++++++-- server/svix-server/src/worker.rs | 6 +++++- 4 files changed, 19 insertions(+), 31 deletions(-) diff --git a/server/Cargo.lock b/server/Cargo.lock index 5fcf7f304..6de0aed0e 100644 --- a/server/Cargo.lock +++ b/server/Cargo.lock @@ -1793,7 +1793,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2 0.5.5", "tokio", "tower-service", "tracing", @@ -3531,7 +3531,7 @@ dependencies = [ "serde", "serde_json", "sqlx", - "strum 0.25.0", + "strum", "thiserror", "time", "tracing", @@ -4189,34 +4189,12 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" -[[package]] -name = "strum" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" -dependencies = [ - "strum_macros", -] - [[package]] name = "strum" version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" -[[package]] -name = "strum_macros" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "rustversion", - "syn 1.0.109", -] - [[package]] name = "subtle" version = "2.4.1" @@ -4301,8 +4279,6 @@ dependencies = [ "serde_json", "serde_path_to_error", "sqlx", - "strum 0.24.1", - "strum_macros", "svix", "svix-ksuid", "svix-server_derive", diff --git a/server/svix-server/Cargo.toml b/server/svix-server/Cargo.toml index 1128dd83e..51c847c4c 100644 --- a/server/svix-server/Cargo.toml +++ b/server/svix-server/Cargo.toml @@ -68,8 +68,6 @@ indexmap = "1.9.2" trust-dns-resolver = "0.22.0" ipnet = { version = "2.5", features = ["serde"] } urlencoding = "2.1.2" -strum_macros = "0.24" -strum = { version = "0.24", features = ["derive"] } form_urlencoded = "1.1.0" lapin = "2.1.1" sentry = { version = "0.31.5", features = ["tracing"] } diff --git a/server/svix-server/src/queue/mod.rs b/server/svix-server/src/queue/mod.rs index c10edbd53..db6d00124 100644 --- a/server/svix-server/src/queue/mod.rs +++ b/server/svix-server/src/queue/mod.rs @@ -4,7 +4,6 @@ use axum::async_trait; use chrono::{DateTime, Utc}; use lapin::options::{BasicAckOptions, BasicNackOptions}; use serde::{Deserialize, Serialize}; -use strum::Display; use svix_ksuid::*; use crate::error::Traceable; @@ -114,7 +113,7 @@ impl MessageTaskBatch { } } -#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Display)] +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] #[serde(rename_all = "camelCase")] #[serde(tag = "type")] pub enum QueueTask { @@ -123,6 +122,17 @@ pub enum QueueTask { MessageBatch(MessageTaskBatch), } +impl QueueTask { + /// Returns a type string, for logging. + pub fn task_type(&self) -> &'static str { + match self { + QueueTask::HealthCheck => "HealthCheck", + QueueTask::MessageV1(_) => "MessageV1", + QueueTask::MessageBatch(_) => "MessageBatch", + } + } +} + #[derive(Clone)] pub enum TaskQueueProducer { Memory(MemoryQueueProducer), diff --git a/server/svix-server/src/worker.rs b/server/svix-server/src/worker.rs index 8ee64910f..5baf9717f 100644 --- a/server/svix-server/src/worker.rs +++ b/server/svix-server/src/worker.rs @@ -690,7 +690,11 @@ fn bytes_to_string(bytes: bytes::Bytes) -> String { } /// Manages preparation and execution of a QueueTask type -#[tracing::instrument(skip_all, level = "error", fields(msg_id, app_id, org_id, instance_id, task_type=queue_task.to_string()))] +#[tracing::instrument( + skip_all, + level = "error", + fields(msg_id, app_id, org_id, instance_id, task_type = queue_task.task_type()) +)] async fn process_queue_task( worker_context: WorkerContext<'_>, queue_task: QueueTask, From 852cc7ee4ee26f45efd0611f80759edeb8f7e714 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Tue, 6 Feb 2024 13:00:14 +0100 Subject: [PATCH 3/8] server: Upgrade jsonschema dependency --- server/Cargo.lock | 23 +++++++++++++---------- server/svix-server/Cargo.toml | 2 +- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/server/Cargo.lock b/server/Cargo.lock index 6de0aed0e..4c46e7882 100644 --- a/server/Cargo.lock +++ b/server/Cargo.lock @@ -1274,9 +1274,9 @@ dependencies = [ [[package]] name = "fancy-regex" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0678ab2d46fa5195aaf59ad034c083d351377d4af57f3e073c074d0da3e3c766" +checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2" dependencies = [ "bit-set", "regex", @@ -1402,9 +1402,9 @@ dependencies = [ [[package]] name = "fraction" -version = "0.12.2" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aa5de57a62c2440ece64342ea59efb7171aa7d016faf8dfcb8795066a17146b" +checksum = "3027ae1df8d41b4bed2241c8fdad4acc1e7af60c8e17743534b545e77182d678" dependencies = [ "lazy_static", "num", @@ -1556,8 +1556,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi", + "wasm-bindgen", ] [[package]] @@ -2014,9 +2016,9 @@ dependencies = [ [[package]] name = "iso8601" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "296af15e112ec6dc38c9fd3ae027b5337a75466e8eed757bd7d5cf742ea85eb6" +checksum = "924e5d73ea28f59011fec52a0d12185d496a9b075d360657aed2a5707f701153" dependencies = [ "nom", ] @@ -2056,22 +2058,23 @@ dependencies = [ [[package]] name = "jsonschema" -version = "0.16.1" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ca9e2b45609132ae2214d50482c03aeee78826cd6fd53a8940915b81acedf16" +checksum = "2a071f4f7efc9a9118dfb627a0a94ef247986e1ab8606a4c806ae2b3aa3b6978" dependencies = [ "ahash", "anyhow", - "base64 0.13.1", + "base64 0.21.5", "bytecount", "clap", "fancy-regex", "fraction", + "getrandom", "iso8601", "itoa", - "lazy_static", "memchr", "num-cmp", + "once_cell", "parking_lot", "percent-encoding", "regex", diff --git a/server/svix-server/Cargo.toml b/server/svix-server/Cargo.toml index 51c847c4c..84758cb9d 100644 --- a/server/svix-server/Cargo.toml +++ b/server/svix-server/Cargo.toml @@ -61,7 +61,7 @@ time = { version = "0.3.9", features = [ "std" ]} futures = "0.3" url = { version = "2.2.2", features = ["serde"] } rand = "0.8.5" -jsonschema = "0.16.1" +jsonschema = "0.17.1" aide = { version = "0.12.0", features = ["axum", "redoc", "macros", "axum-headers"] } schemars = { version = "0.8.11", features = ["chrono", "url", "preserve_order"] } indexmap = "1.9.2" From 289383b612b9b282d52959587b43ad9f0e6e8b23 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Tue, 6 Feb 2024 13:01:53 +0100 Subject: [PATCH 4/8] server: Upgrade sentry dependency --- server/Cargo.lock | 32 ++++++++++++++++---------------- server/svix-server/Cargo.toml | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/server/Cargo.lock b/server/Cargo.lock index 4c46e7882..ee9a89535 100644 --- a/server/Cargo.lock +++ b/server/Cargo.lock @@ -3626,9 +3626,9 @@ checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "sentry" -version = "0.31.8" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce4b57f1b521f674df7a1d200be8ff5d74e3712020ee25b553146657b5377d5" +checksum = "766448f12e44d68e675d5789a261515c46ac6ccd240abdd451a9c46c84a49523" dependencies = [ "httpdate", "native-tls", @@ -3645,9 +3645,9 @@ dependencies = [ [[package]] name = "sentry-backtrace" -version = "0.31.8" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58cc8d4e04a73de8f718dc703943666d03f25d3e9e4d0fb271ca0b8c76dfa00e" +checksum = "32701cad8b3c78101e1cd33039303154791b0ff22e7802ed8cc23212ef478b45" dependencies = [ "backtrace", "once_cell", @@ -3657,9 +3657,9 @@ dependencies = [ [[package]] name = "sentry-contexts" -version = "0.31.8" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6436c1bad22cdeb02179ea8ef116ffc217797c028927def303bc593d9320c0d1" +checksum = "17ddd2a91a13805bd8dab4ebf47323426f758c35f7bf24eacc1aded9668f3824" dependencies = [ "hostname", "libc", @@ -3671,9 +3671,9 @@ dependencies = [ [[package]] name = "sentry-core" -version = "0.31.8" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "901f761681f97db3db836ef9e094acdd8756c40215326c194201941947164ef1" +checksum = "b1189f68d7e7e102ef7171adf75f83a59607fafd1a5eecc9dc06c026ff3bdec4" dependencies = [ "once_cell", "rand", @@ -3684,9 +3684,9 @@ dependencies = [ [[package]] name = "sentry-debug-images" -version = "0.31.8" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afdb263e73d22f39946f6022ed455b7561b22ff5553aca9be3c6a047fa39c328" +checksum = "7b4d0a615e5eeca5699030620c119a094e04c14cf6b486ea1030460a544111a7" dependencies = [ "findshlibs", "once_cell", @@ -3695,9 +3695,9 @@ dependencies = [ [[package]] name = "sentry-panic" -version = "0.31.8" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74fbf1c163f8b6a9d05912e1b272afa27c652e8b47ea60cb9a57ad5e481eea99" +checksum = "d1c18d0b5fba195a4950f2f4c31023725c76f00aabb5840b7950479ece21b5ca" dependencies = [ "sentry-backtrace", "sentry-core", @@ -3705,9 +3705,9 @@ dependencies = [ [[package]] name = "sentry-tracing" -version = "0.31.8" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82eabcab0a047040befd44599a1da73d3adb228ff53b5ed9795ae04535577704" +checksum = "3012699a9957d7f97047fd75d116e22d120668327db6e7c59824582e16e791b2" dependencies = [ "sentry-backtrace", "sentry-core", @@ -3717,9 +3717,9 @@ dependencies = [ [[package]] name = "sentry-types" -version = "0.31.8" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da956cca56e0101998c8688bc65ce1a96f00673a0e58e663664023d4c7911e82" +checksum = "c7173fd594569091f68a7c37a886e202f4d0c1db1e1fa1d18a051ba695b2e2ec" dependencies = [ "debugid", "hex", diff --git a/server/svix-server/Cargo.toml b/server/svix-server/Cargo.toml index 84758cb9d..d346ecf33 100644 --- a/server/svix-server/Cargo.toml +++ b/server/svix-server/Cargo.toml @@ -70,7 +70,7 @@ ipnet = { version = "2.5", features = ["serde"] } urlencoding = "2.1.2" form_urlencoded = "1.1.0" lapin = "2.1.1" -sentry = { version = "0.31.5", features = ["tracing"] } +sentry = { version = "0.32.2", features = ["tracing"] } [target.'cfg(not(target_env = "msvc"))'.dependencies] tikv-jemallocator = { version = "0.5", optional = true } From e8bc144daf2a9340bcad1b47fbbfa4e22f6a7d19 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Tue, 6 Feb 2024 13:04:34 +0100 Subject: [PATCH 5/8] server: Upgrade chacha20poly1305 dependency --- server/Cargo.lock | 47 +++++++++------------ server/svix-server/Cargo.toml | 2 +- server/svix-server/src/core/cryptography.rs | 2 +- 3 files changed, 22 insertions(+), 29 deletions(-) diff --git a/server/Cargo.lock b/server/Cargo.lock index ee9a89535..dff8c7a2f 100644 --- a/server/Cargo.lock +++ b/server/Cargo.lock @@ -19,10 +19,11 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aead" -version = "0.4.3" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" dependencies = [ + "crypto-common", "generic-array", ] @@ -669,7 +670,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" dependencies = [ - "cipher 0.4.4", + "cipher", ] [[package]] @@ -689,25 +690,24 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chacha20" -version = "0.8.2" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6" +checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" dependencies = [ "cfg-if", - "cipher 0.3.0", + "cipher", "cpufeatures", - "zeroize", ] [[package]] name = "chacha20poly1305" -version = "0.9.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" +checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" dependencies = [ "aead", "chacha20", - "cipher 0.3.0", + "cipher", "poly1305", "zeroize", ] @@ -727,15 +727,6 @@ dependencies = [ "windows-targets 0.48.5", ] -[[package]] -name = "cipher" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" -dependencies = [ - "generic-array", -] - [[package]] name = "cipher" version = "0.4.4" @@ -744,6 +735,7 @@ checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ "crypto-common", "inout", + "zeroize", ] [[package]] @@ -939,6 +931,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", + "rand_core", "typenum", ] @@ -1061,7 +1054,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffdd80ce8ce993de27e9f063a444a4d53ce8e8db4c1f00cc03af5ad5a9867a1e" dependencies = [ - "cipher 0.4.4", + "cipher", ] [[package]] @@ -2676,7 +2669,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4873306de53fe82e7e484df31e1e947d61514b6ea2ed6cd7b45d63006fd9224" dependencies = [ "cbc", - "cipher 0.4.4", + "cipher", "des", "getrandom", "hmac", @@ -2938,9 +2931,9 @@ dependencies = [ [[package]] name = "poly1305" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede" +checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" dependencies = [ "cpufeatures", "opaque-debug", @@ -3128,7 +3121,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62c64daa8e9438b84aaae55010a93f396f8e60e3911590fcba770d04643fc1dd" dependencies = [ - "cipher 0.4.4", + "cipher", ] [[package]] @@ -5021,11 +5014,11 @@ checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" [[package]] name = "universal-hash" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" dependencies = [ - "generic-array", + "crypto-common", "subtle", ] diff --git a/server/svix-server/Cargo.toml b/server/svix-server/Cargo.toml index d346ecf33..9c1903387 100644 --- a/server/svix-server/Cargo.toml +++ b/server/svix-server/Cargo.toml @@ -52,7 +52,7 @@ redis = { version = "0.23.3", features = ["tokio-comp", "tokio-native-tls-comp", thiserror = "1.0.30" bytes = "1.1.0" blake2 = "0.10.4" -chacha20poly1305 = "0.9.0" +chacha20poly1305 = "0.10.1" # sea orm sea-orm = { version = "0.12.2", features = [ "sqlx-postgres", "runtime-tokio-rustls", "macros", "with-chrono", "with-json" ], default-features = false } sqlx = { version = "0.7.1", features = [ "runtime-tokio-rustls", "postgres", "migrate" ] } diff --git a/server/svix-server/src/core/cryptography.rs b/server/svix-server/src/core/cryptography.rs index 667908691..e37f51223 100644 --- a/server/svix-server/src/core/cryptography.rs +++ b/server/svix-server/src/core/cryptography.rs @@ -3,7 +3,7 @@ use std::fmt::Debug; -use chacha20poly1305::aead::{Aead, NewAead}; +use chacha20poly1305::aead::{Aead, KeyInit}; use chacha20poly1305::{Key, XChaCha20Poly1305, XNonce}; use ed25519_compact::*; use rand::Rng; From 12988f697582a3fff11604f6c9c8e602fda0b639 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Tue, 6 Feb 2024 13:06:03 +0100 Subject: [PATCH 6/8] server: Upgrade redis, bb8-redis dependencies --- server/Cargo.lock | 8 ++++---- server/svix-server/Cargo.toml | 4 ++-- server/svix-server/src/redis/mod.rs | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/server/Cargo.lock b/server/Cargo.lock index dff8c7a2f..cceeae49f 100644 --- a/server/Cargo.lock +++ b/server/Cargo.lock @@ -546,9 +546,9 @@ dependencies = [ [[package]] name = "bb8-redis" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd456361ba8e4e7f5fe58e1697ce078a149c85ebce13bf9c6b483d3f566fc9c3" +checksum = "4094bc17b933090cfded54315a86db01d67ec999583d4bab894c520f8c097d1f" dependencies = [ "async-trait", "bb8", @@ -3137,9 +3137,9 @@ dependencies = [ [[package]] name = "redis" -version = "0.23.3" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f49cdc0bb3f412bf8e7d1bd90fe1d9eb10bc5c399ba90973c14662a27b3f8ba" +checksum = "c580d9cbbe1d1b479e8d67cf9daf6a62c957e6846048408b80b43ac3f6af84cd" dependencies = [ "async-trait", "bytes", diff --git a/server/svix-server/Cargo.toml b/server/svix-server/Cargo.toml index 9c1903387..f14656aa4 100644 --- a/server/svix-server/Cargo.toml +++ b/server/svix-server/Cargo.toml @@ -47,8 +47,8 @@ ed25519-compact = "1.0.11" chrono = { version="0.4.26", features = ["serde"] } reqwest = { version = "0.11.9", features = ["json", "rustls-tls", "trust-dns"], default-features = false } bb8 = "0.8" -bb8-redis = "0.13.1" -redis = { version = "0.23.3", features = ["tokio-comp", "tokio-native-tls-comp", "streams", "cluster-async"] } +bb8-redis = "0.14.0" +redis = { version = "0.24.0", features = ["tokio-comp", "tokio-native-tls-comp", "streams", "cluster-async"] } thiserror = "1.0.30" bytes = "1.1.0" blake2 = "0.10.4" diff --git a/server/svix-server/src/redis/mod.rs b/server/svix-server/src/redis/mod.rs index 18bbd0a3d..c5f118f62 100644 --- a/server/svix-server/src/redis/mod.rs +++ b/server/svix-server/src/redis/mod.rs @@ -78,7 +78,7 @@ pub trait PooledConnectionLike { &mut self, key: K, value: V, - milliseconds: usize, + milliseconds: u64, ) -> RedisResult { self.query_async(redis::Cmd::pset_ex(key, value, milliseconds)) .await From 003d39449a58265509290cfb8839fd2aacac61b2 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Tue, 6 Feb 2024 13:07:20 +0100 Subject: [PATCH 7/8] server: Upgrade num_enum dependency --- server/Cargo.lock | 10 +++++----- server/svix-server/Cargo.toml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/Cargo.lock b/server/Cargo.lock index cceeae49f..f4476a473 100644 --- a/server/Cargo.lock +++ b/server/Cargo.lock @@ -2477,23 +2477,23 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.5.11" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.5.11" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.39", ] [[package]] diff --git a/server/svix-server/Cargo.toml b/server/svix-server/Cargo.toml index f14656aa4..10d4833c9 100644 --- a/server/svix-server/Cargo.toml +++ b/server/svix-server/Cargo.toml @@ -30,7 +30,7 @@ tower-http = { version = "0.4.0", features = ["trace", "cors", "request-id"] } serde = { version = "1.0.184", features = ["derive"] } serde_json = { version = "1.0.74", features = ["arbitrary_precision", "raw_value"] } serde_path_to_error = "0.1.7" -num_enum = "0.5.6" +num_enum = "0.7.2" enum_dispatch = "0.3.8" regex = "1.5.5" once_cell = "1.18.0" From 5977e8ba532f4795f7d741b803ea9f8244fbc18e Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Mon, 5 Feb 2024 16:20:46 +0100 Subject: [PATCH 8/8] server: Fix clippy warnings --- bridge/svix-bridge/src/main.rs | 2 +- server/svix-server/src/main.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bridge/svix-bridge/src/main.rs b/bridge/svix-bridge/src/main.rs index a5708950f..09fa608d1 100644 --- a/bridge/svix-bridge/src/main.rs +++ b/bridge/svix-bridge/src/main.rs @@ -55,7 +55,7 @@ fn setup_tracing(cfg: &Config) { if std::env::var_os("RUST_LOG").is_none() { const CRATE_NAME: &str = env!("CARGO_CRATE_NAME"); let level = cfg.log_level.to_string(); - let var = vec![ + let var = [ format!("{CRATE_NAME}={level}"), // XXX: Assuming this applies to the Producer side (aka `og-ingester`) when we fold it back in. format!("tower_http={level}"), diff --git a/server/svix-server/src/main.rs b/server/svix-server/src/main.rs index 5327d5d40..ff0b9efe1 100644 --- a/server/svix-server/src/main.rs +++ b/server/svix-server/src/main.rs @@ -180,7 +180,7 @@ async fn main() { let mut openapi = svix_server::openapi::initialize_openapi(); let router = svix_server::v1::router(); - aide::axum::ApiRouter::new() + _ = aide::axum::ApiRouter::new() .nest("/api/v1", router) .finish_api(&mut openapi);