fix: Add null-handling for sentry level parsing (#5803)

Author: philprime

Sentry.xcodeproj/project.pbxproj

@@ -888,6 +888,7 @@
 		D4EDF9842D0B2A210071E7B3 /* Data+SentryTracing.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4EDF9832D0B2A1D0071E7B3 /* Data+SentryTracing.swift */; };
 		D4EE12D22DE9AC3800385BAF /* TestNSNotificationCenterWrapperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4EE12D12DE9AC3300385BAF /* TestNSNotificationCenterWrapperTests.swift */; };
 		D4F2B5352D0C69D500649E42 /* SentryCrashCTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4F2B5342D0C69D100649E42 /* SentryCrashCTests.swift */; };
+		D4F7BD822E4373BF004A2D77 /* SentryLevelMapperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4F7BD7C2E4373BB004A2D77 /* SentryLevelMapperTests.swift */; };
 		D4FC68172DD632E7001B74FF /* SentryDispatchSourceProviderProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = D4FC68162DD632E7001B74FF /* SentryDispatchSourceProviderProtocol.h */; };
 		D4FC681A2DD63465001B74FF /* SentryDispatchQueueWrapperTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D4FC68192DD63465001B74FF /* SentryDispatchQueueWrapperTests.m */; };
 		D8019910286B089000C277F0 /* SentryCrashReportSinkTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D801990F286B089000C277F0 /* SentryCrashReportSinkTests.swift */; };
@@ -2214,6 +2215,7 @@
 		D4EDF9832D0B2A1D0071E7B3 /* Data+SentryTracing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Data+SentryTracing.swift"; sourceTree = "<group>"; };
 		D4EE12D12DE9AC3300385BAF /* TestNSNotificationCenterWrapperTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestNSNotificationCenterWrapperTests.swift; sourceTree = "<group>"; };
 		D4F2B5342D0C69D100649E42 /* SentryCrashCTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryCrashCTests.swift; sourceTree = "<group>"; };
+		D4F7BD7C2E4373BB004A2D77 /* SentryLevelMapperTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryLevelMapperTests.swift; sourceTree = "<group>"; };
 		D4FC68162DD632E7001B74FF /* SentryDispatchSourceProviderProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryDispatchSourceProviderProtocol.h; path = include/SentryDispatchSourceProviderProtocol.h; sourceTree = "<group>"; };
 		D4FC68192DD63465001B74FF /* SentryDispatchQueueWrapperTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryDispatchQueueWrapperTests.m; sourceTree = "<group>"; };
 		D801990F286B089000C277F0 /* SentryCrashReportSinkTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryCrashReportSinkTests.swift; sourceTree = "<group>"; };
@@ -3575,6 +3577,7 @@
 		7BD7299B24654CD500EA3610 /* Helper */ = {
 			isa = PBXGroup;
 			children = (
+				D4F7BD7C2E4373BB004A2D77 /* SentryLevelMapperTests.swift */,
 				D8AE48BE2C578D540092A2A6 /* SentrySDKLog.swift */,
 				849AC3FF29E0C1FF00889C16 /* SentryFormatterTests.swift */,
 				7B88F30324BC8E6500ADF90A /* SentrySerializationTests.swift */,
@@ -6148,6 +6151,7 @@
 				7BB6550D253EEB3900887E87 /* SentryUserFeedbackTests.swift in Sources */,
 				7BBD18B7245180FF00427C76 /* SentryDsnTests.m in Sources */,
 				D8DBE0D22C0EFFC300FAB1FD /* SentryReplayOptionsTests.swift in Sources */,
+				D4F7BD822E4373BF004A2D77 /* SentryLevelMapperTests.swift in Sources */,
 				D4291A6D2DD62ACE00772088 /* SentryDispatchFactoryTests.m in Sources */,
 				62950F1029E7FE0100A42624 /* SentryTransactionContextTests.swift in Sources */,
 				0A2D7BBA29152CBF008727AF /* SentryWatchdogTerminationScopeObserverTests.swift in Sources */,

Sources/Sentry/SentryHub.m

@@ -9,6 +9,7 @@
 #import "SentryHub+Private.h"
 #import "SentryInstallation.h"
 #import "SentryIntegrationProtocol.h"
+#import "SentryInternalDefines.h"
 #import "SentryLevelMapper.h"
 #import "SentryLogC.h"
 #import "SentryNSTimerFactory.h"
@@ -774,11 +775,13 @@ - (BOOL)envelopeContainsEventWithErrorOrHigher:(NSArray<SentryEnvelopeItem *> *)
     for (SentryEnvelopeItem *item in items) {
         if ([item.header.type isEqualToString:SentryEnvelopeItemTypeEvent]) {
             // If there is no level the default is error
-            NSDictionary *_Nullable eventJson =
+            NSDictionary *_Nullable nullableEventJson =
                 [SentrySerialization deserializeDictionaryFromJsonData:item.data];
-            if (eventJson == nil) {
+            if (nullableEventJson == nil) {
                 return NO;
             }
+            NSDictionary *_Nonnull eventJson
+                = SENTRY_UNWRAP_NULLABLE(NSDictionary, nullableEventJson);
 
             SentryLevel level = sentryLevelForString(eventJson[@"level"]);
             if (level >= kSentryLevelError) {

Sources/Sentry/SentryLevelMapper.m

@@ -3,7 +3,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 SentryLevel
-sentryLevelForString(NSString *string)
+sentryLevelForString(NSString *_Nullable string)
 {
     return [SentryLevelHelper levelForName:string];
 }

Sources/Sentry/include/SentryLevelMapper.h

@@ -6,7 +6,7 @@ NS_ASSUME_NONNULL_BEGIN
  * Maps a string to a SentryLevel. If the passed string doesn't match any level this defaults to
  * the 'error' level. See https://develop.sentry.dev/sdk/event-payloads/#optional-attributes
  */
-SentryLevel sentryLevelForString(NSString *string);
+SentryLevel sentryLevelForString(NSString *_Nullable string);
 
 NSString *nameForSentryLevel(SentryLevel level);
 

Sources/Swift/Core/Helper/Log/SentryLevel.swift

@@ -29,8 +29,8 @@ extension SentryLevel: CustomStringConvertible {
         return SentryLevel.levelNames[Int(self.rawValue)]
     }
 
-    static func fromName(_ name: String) -> SentryLevel {
-        guard let index = SentryLevel.levelNames.firstIndex(of: name) else { return .error }
+    static func fromName(_ name: String?) -> SentryLevel {
+        guard let name = name, let index = SentryLevel.levelNames.firstIndex(of: name) else { return .error }
         return SentryLevel(rawValue: UInt(index)) ?? .error
     }
 }
@@ -41,7 +41,7 @@ extension SentryLevel: CustomStringConvertible {
         return level.description
     }
 
-    public static func levelForName(_ name: String) -> SentryLevel {
+    public static func levelForName(_ name: String?) -> SentryLevel {
         .fromName(name)
     }
 }

Tests/SentryTests/Helper/SentryLevelMapperTests.swift

@@ -0,0 +1,25 @@
+@testable import Sentry
+import XCTest
+
+class SentryLevelMapperTests: XCTestCase {
+    func testSentryLevelForString_nilParameter_shouldReturnDefault() {
+        XCTAssertEqual(sentryLevelForString(nil), .error)
+    }
+
+    func testSentryLevelForString_emptyString_shouldReturnDefault() {
+        XCTAssertEqual(sentryLevelForString(""), .error)
+    }
+
+    func testSentryLevelForString_invalidString_shouldReturnDefault() {
+        XCTAssertEqual(sentryLevelForString("invalid"), .error)
+    }
+
+    func testSentryLevelForString_validString_shouldReturnCorrectLevel() {
+        XCTAssertEqual(sentryLevelForString("none"), .none)
+        XCTAssertEqual(sentryLevelForString("debug"), .debug)
+        XCTAssertEqual(sentryLevelForString("info"), .info)
+        XCTAssertEqual(sentryLevelForString("warning"), .warning)
+        XCTAssertEqual(sentryLevelForString("error"), .error)
+        XCTAssertEqual(sentryLevelForString("fatal"), .fatal)
+    }
+}