Merge branch 'master' into ref/metrics-mri

* master:
  fix: Apply clippy 1.60 lints (#1220)
  build: Update symbolic to 8.7.0 (#1216)

Author: jan-auer

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+**Bug Fixes**:
+
+- Prevent potential OOM panics when handling corrupt Unreal Engine crashes. ([#1216](https://github.com/getsentry/relay/pull/1216))
+
 **Internal**:
 
 - Remove unused item types. ([#1211](https://github.com/getsentry/relay/pull/1211))

Cargo.lock

@@ -76,6 +76,7 @@ fn normalize_url(request: &mut Request) {
     };
 }
 
+#[allow(clippy::ptr_arg)] // normalize_method must be &mut String for `apply`.
 fn normalize_method(method: &mut String, meta: &mut Meta) -> ProcessingResult {
     method.make_ascii_uppercase();
 
@@ -86,6 +87,7 @@ fn normalize_method(method: &mut String, meta: &mut Meta) -> ProcessingResult {
 
     Ok(())
 }
+
 /// Decodes an urlencoded body.
 fn urlencoded_from_str(raw: &str) -> Option<Value> {
     // Binary strings would be decoded, but we know url-encoded bodies are ASCII.

relay-general/src/store/normalize/request.rs

@@ -85,7 +85,7 @@ where
 }
 
 fn verify_value_characters(
-    value: &mut String,
+    value: &mut str,
     meta: &mut Meta,
     state: &ProcessingState<'_>,
 ) -> ProcessingResult {

relay-general/src/store/schema.rs

@@ -66,7 +66,7 @@ serde = { version = "1.0.114", features = ["derive"] }
 serde_json = "1.0.55"
 serde_urlencoded = "0.7.0"
 smallvec = { version = "1.4.0", features = ["serde"] }
-symbolic = { version = "8.5.0", optional = true, default-features=false, features=["unreal-serde"] }
+symbolic = { version = "8.7.0", optional = true, default-features=false, features=["unreal-serde"] }
 take_mut = "0.2.2"
 tokio = { version = "1.0", features = ["rt-multi-thread"] } # in sync with reqwest
 tokio-timer = "0.2.13"

relay-server/Cargo.toml

@@ -365,7 +365,7 @@ where
         let mut enforcement = Enforcement::default();
 
         if let Some(category) = summary.event_category {
-            let event_limits = (&mut self.check)(scoping.item(category), 1)?;
+            let event_limits = (self.check)(scoping.item(category), 1)?;
             let longest = event_limits.longest();
             enforcement.event = CategoryLimit::new(category, 1, longest);
 
@@ -381,7 +381,7 @@ where
 
         if !enforcement.event.is_active() && summary.attachment_quantity > 0 {
             let item_scoping = scoping.item(DataCategory::Attachment);
-            let attachment_limits = (&mut self.check)(item_scoping, summary.attachment_quantity)?;
+            let attachment_limits = (self.check)(item_scoping, summary.attachment_quantity)?;
             enforcement.attachments = CategoryLimit::new(
                 DataCategory::Attachment,
                 summary.attachment_quantity,
@@ -398,7 +398,7 @@ where
 
         if summary.session_quantity > 0 {
             let item_scoping = scoping.item(DataCategory::Session);
-            let session_limits = (&mut self.check)(item_scoping, summary.session_quantity)?;
+            let session_limits = (self.check)(item_scoping, summary.session_quantity)?;
             enforcement.sessions = CategoryLimit::new(
                 DataCategory::Session,
                 summary.session_quantity,

relay-server/src/utils/rate_limits.rs

@@ -1,8 +1,9 @@
-use relay_config::Config;
+use chrono::{TimeZone, Utc};
 use symbolic::unreal::{
     Unreal4Context, Unreal4Crash, Unreal4Error, Unreal4ErrorKind, Unreal4FileType, Unreal4LogEntry,
 };
 
+use relay_config::Config;
 use relay_general::protocol::{
     AsPair, Breadcrumb, ClientSdkInfo, Context, Contexts, DeviceContext, Event, EventId,
     GpuContext, LenientString, LogEntry, Message, OsContext, TagEntry, Tags, Timestamp, User,
@@ -133,8 +134,12 @@ fn merge_unreal_logs(event: &mut Event, data: &[u8]) -> Result<(), Unreal4Error>
         .get_or_insert_with(Array::default);
 
     for log in logs {
+        let timestamp = log
+            .timestamp
+            .map(|ts| Timestamp(Utc.timestamp(ts.unix_timestamp(), ts.nanosecond())));
+
         breadcrumbs.push(Annotated::new(Breadcrumb {
-            timestamp: Annotated::from(log.timestamp.map(Timestamp)),
+            timestamp: Annotated::from(timestamp),
             category: Annotated::from(log.component),
             message: Annotated::new(log.message),
             ..Breadcrumb::default()