Merge pull request #6065 from getsentry/ref/data-collection-narrow-catches

fix(core): [Data Collection 24] Narrow utility exception handling

Author: adinauer

sentry/src/main/java/io/sentry/util/GraphqlUtils.java

@@ -4,6 +4,7 @@
 import io.sentry.JsonObjectReader;
 import io.sentry.SentryLevel;
 import io.sentry.SentryOptions;
+import java.io.IOException;
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.util.ArrayList;
@@ -56,7 +57,7 @@ private GraphqlUtils() {}
       final @NotNull StringWriter writer = new StringWriter();
       options.getSerializer().serialize(filtered, writer);
       return writer.toString();
-    } catch (Throwable e) {
+    } catch (IOException | NumberFormatException e) {
       options.getLogger().log(SentryLevel.ERROR, "Failed to filter GraphQL request body.", e);
       return null;
     }

sentry/src/main/java/io/sentry/util/HttpUtils.java

@@ -4,6 +4,7 @@
 
 import io.sentry.HttpStatusCodeRange;
 import io.sentry.KeyValueCollectionBehavior;
+import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
@@ -127,7 +128,7 @@ public static boolean containsSensitiveHeader(final @NotNull String header) {
   private static @NotNull String decodeQueryParamName(final @NotNull String name) {
     try {
       return URLDecoder.decode(name, "UTF-8");
-    } catch (Throwable ignored) {
+    } catch (IllegalArgumentException | UnsupportedEncodingException ignored) {
       return name;
     }
   }

sentry/src/test/java/io/sentry/util/GraphqlUtilsTest.kt

@@ -82,6 +82,15 @@ class GraphqlUtilsTest {
     assertThat(result).isNull()
   }
 
+  @Test
+  fun `returns null for a GraphQL request body containing a malformed unicode escape`() {
+    val options = SentryOptions().also { it.dataCollection.graphql.setDocument(false) }
+
+    val result = GraphqlUtils.filterRequestBody("""{"query":"\u12G4"}""", options)
+
+    assertThat(result).isNull()
+  }
+
   private companion object {
     const val REQUEST_BODY =
       """{"operationName":"GetUser","variables":{"id":"123"},"query":"query { viewer { name } }"}"""