Merge branch 'main' into dependabot/github_actions/actions/checkout-6

Author: romtsn

.github/CODEOWNERS

@@ -1 +1 @@
-*       @adinauer @romtsn @stefanosiano @markushi @lcian
+*       @adinauer @romtsn @markushi @lcian

.github/workflows/codeql-analysis.yml

@@ -36,7 +36,7 @@ jobs:
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@0499de31b99561a6d14a36a5f662c2a54f91beee # pin@v2
+        uses: github/codeql-action/init@fdbfb4d2750291e159f0156def62b853c2798ca2 # pin@v2
         with:
           languages: 'java'
 
@@ -45,4 +45,4 @@ jobs:
           ./gradlew buildForCodeQL --no-build-cache
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@0499de31b99561a6d14a36a5f662c2a54f91beee # pin@v2
+        uses: github/codeql-action/analyze@fdbfb4d2750291e159f0156def62b853c2798ca2 # pin@v2

CHANGELOG.md

@@ -59,6 +59,7 @@ SentryAndroid.init(
 ### Fixes 
 
 - Fix missing thread stacks for ANRv1 events ([#4918](https://github.com/getsentry/sentry-java/pull/4918))
+- Fix handling of unparseable mime-type on request filter ([#4939](https://github.com/getsentry/sentry-java/pull/4939))
 
 ### Internal
 

sentry-spring-7/src/main/java/io/sentry/spring7/SentrySpringFilter.java

@@ -26,6 +26,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.springframework.http.MediaType;
+import org.springframework.util.InvalidMimeTypeException;
 import org.springframework.util.MimeType;
 import org.springframework.web.filter.OncePerRequestFilter;
 import org.springframework.web.util.ContentCachingRequestWrapper;
@@ -131,8 +132,12 @@ && shouldCacheMimeType(contentType)
   }
 
   private static boolean shouldCacheMimeType(String contentType) {
-    return MimeType.valueOf(contentType).isCompatibleWith(MediaType.APPLICATION_JSON)
-        || MimeType.valueOf(contentType).isCompatibleWith(MediaType.APPLICATION_FORM_URLENCODED);
+    try {
+      return MimeType.valueOf(contentType).isCompatibleWith(MediaType.APPLICATION_JSON)
+          || MimeType.valueOf(contentType).isCompatibleWith(MediaType.APPLICATION_FORM_URLENCODED);
+    } catch (InvalidMimeTypeException e) {
+      return false;
+    }
   }
 
   static final class RequestBodyExtractingEventProcessor implements EventProcessor {

sentry-spring-7/src/test/kotlin/io/sentry/spring7/SentrySpringFilterTest.kt

@@ -266,6 +266,12 @@ class SentrySpringFilterTest {
           body = "x".repeat(10001),
           expectedToBeCached = false,
         ),
+        TestParams(
+          maxRequestBodySize = MEDIUM,
+          body = "xxx",
+          expectedToBeCached = false,
+          contentType = "invalid",
+        ),
         TestParams(
           maxRequestBodySize = ALWAYS,
           body = "x".repeat(10001),

sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/SentrySpringFilter.java

@@ -26,6 +26,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.springframework.http.MediaType;
+import org.springframework.util.InvalidMimeTypeException;
 import org.springframework.util.MimeType;
 import org.springframework.web.filter.OncePerRequestFilter;
 import org.springframework.web.util.ContentCachingRequestWrapper;
@@ -131,8 +132,12 @@ && shouldCacheMimeType(contentType)
   }
 
   private static boolean shouldCacheMimeType(String contentType) {
-    return MimeType.valueOf(contentType).isCompatibleWith(MediaType.APPLICATION_JSON)
-        || MimeType.valueOf(contentType).isCompatibleWith(MediaType.APPLICATION_FORM_URLENCODED);
+    try {
+      return MimeType.valueOf(contentType).isCompatibleWith(MediaType.APPLICATION_JSON)
+          || MimeType.valueOf(contentType).isCompatibleWith(MediaType.APPLICATION_FORM_URLENCODED);
+    } catch (InvalidMimeTypeException e) {
+      return false;
+    }
   }
 
   static final class RequestBodyExtractingEventProcessor implements EventProcessor {

sentry-spring-jakarta/src/test/kotlin/io/sentry/spring/jakarta/SentrySpringFilterTest.kt

@@ -266,6 +266,12 @@ class SentrySpringFilterTest {
           body = "x".repeat(10001),
           expectedToBeCached = false,
         ),
+        TestParams(
+          maxRequestBodySize = MEDIUM,
+          body = "xxx",
+          expectedToBeCached = false,
+          contentType = "invalid",
+        ),
         TestParams(
           maxRequestBodySize = ALWAYS,
           body = "x".repeat(10001),

sentry-spring/src/main/java/io/sentry/spring/SentrySpringFilter.java

@@ -26,6 +26,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.springframework.http.MediaType;
+import org.springframework.util.InvalidMimeTypeException;
 import org.springframework.util.MimeType;
 import org.springframework.web.filter.OncePerRequestFilter;
 import org.springframework.web.util.ContentCachingRequestWrapper;
@@ -131,8 +132,12 @@ && shouldCacheMimeType(contentType)
   }
 
   private static boolean shouldCacheMimeType(String contentType) {
-    return MimeType.valueOf(contentType).isCompatibleWith(MediaType.APPLICATION_JSON)
-        || MimeType.valueOf(contentType).isCompatibleWith(MediaType.APPLICATION_FORM_URLENCODED);
+    try {
+      return MimeType.valueOf(contentType).isCompatibleWith(MediaType.APPLICATION_JSON)
+          || MimeType.valueOf(contentType).isCompatibleWith(MediaType.APPLICATION_FORM_URLENCODED);
+    } catch (InvalidMimeTypeException e) {
+      return false;
+    }
   }
 
   static final class RequestBodyExtractingEventProcessor implements EventProcessor {

sentry-spring/src/test/kotlin/io/sentry/spring/SentrySpringFilterTest.kt

@@ -266,6 +266,12 @@ class SentrySpringFilterTest {
           body = "x".repeat(10001),
           expectedToBeCached = false,
         ),
+        TestParams(
+          maxRequestBodySize = MEDIUM,
+          body = "xxx",
+          expectedToBeCached = false,
+          contentType = "invalid",
+        ),
         TestParams(
           maxRequestBodySize = ALWAYS,
           body = "x".repeat(10001),