Update fragile to 2.0.0 (#1533)

This updates fragile to 2.0.0 as 1.2.x has a soundness issue: mitsuhiko/fragile#26 Co-authored-by: Oleksandr Kylymnychenko <oleksandr@sentry.io>
getsentry · Nov 3, 2022 · 2f65203 · 2f65203
1 parent 07eff5a
commit 2f65203
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/relay-server/Cargo.toml b/relay-server/Cargo.toml
@@ -35,7 +35,7 @@ chrono = { version = "0.4.11", features = ["serde"] }
 clap = "2.33.1"
 failure = "0.1.8"
 flate2 = "1.0.19"
-fragile = { version = "1.2.1", features = ["slab"] } # used for vendoring sentry-actix
+fragile = { version = "2.0.0", features = ["slab"] } # used for vendoring sentry-actix
 futures = { version = "0.3", package = "futures", features = ["compat"] }
 futures01 = { version = "0.1.28", package = "futures" }
 hashbrown = "0.12.3"

diff --git a/relay-server/src/middlewares.rs b/relay-server/src/middlewares.rs
@@ -199,12 +199,14 @@ impl<S: 'static> Middleware<S> for SentryMiddleware {
         let root_scope = hub.push_scope();
         hub.configure_scope(move |scope| {
             scope.add_event_processor(move |mut event| {
+                fragile::stack_token!(tok);
+
                 let mut cached_data = cached_data.lock().unwrap();
                 if cached_data.is_none() && req.is_valid() {
                     let with_pii = client
                         .as_ref()
                         .map_or(false, |x| x.options().send_default_pii);
-                    *cached_data = Some(extract_request(req.get(), with_pii));
+                    *cached_data = Some(extract_request(req.get(tok), with_pii));
                 }
 
                 if let Some((ref transaction, ref req)) = *cached_data {