Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix crash in OneSignalAttachmentHandler trimURLSpacing #1411

Merged
merged 3 commits into from
Apr 29, 2024
Merged

Fix crash in OneSignalAttachmentHandler trimURLSpacing #1411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
72c1437
Consolidate helper method into one place
nan-li Apr 18, 2024
b5d1542
Add unit test for trimURLSpacing
nan-li Apr 18, 2024
d570649
Fix trimURLSpacing to handle NSNull
nan-li Apr 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
3C14E39F2AFAE39B006ED053 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 3C14E39E2AFAE39B006ED053 /* PrivacyInfo.xcprivacy */; };
3C14E3A12AFAE461006ED053 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 3C14E3A02AFAE461006ED053 /* PrivacyInfo.xcprivacy */; };
3C14E3A42AFAE54C006ED053 /* OneSignalSwiftInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEC08AFF2947D4E900C81DA3 /* OneSignalSwiftInterface.swift */; };
3C24B0EC2BD09D7A0052E771 /* OneSignalCoreObjCTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C24B0EB2BD09D7A0052E771 /* OneSignalCoreObjCTests.m */; };
3C2C7DC8288F3C020020F9AE /* OSSubscriptionModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C2C7DC7288F3C020020F9AE /* OSSubscriptionModel.swift */; };
3C2D8A5928B4C4E300BE41F6 /* OSDelta.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C2D8A5828B4C4E300BE41F6 /* OSDelta.swift */; };
3C44673E296D099D0039A49E /* OneSignalMobileProvision.m in Sources */ = {isa = PBXBuildFile; fileRef = 912411FD1E73342200E41FD7 /* OneSignalMobileProvision.m */; };
Expand Down Expand Up @@ -956,6 +957,8 @@
3C11518C289AF5E800565C41 /* OSModelChangedHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSModelChangedHandler.swift; sourceTree = "<group>"; };
3C14E39E2AFAE39B006ED053 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
3C14E3A02AFAE461006ED053 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
3C24B0EA2BD09D790052E771 /* OneSignalCoreTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "OneSignalCoreTests-Bridging-Header.h"; sourceTree = "<group>"; };
3C24B0EB2BD09D7A0052E771 /* OneSignalCoreObjCTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OneSignalCoreObjCTests.m; sourceTree = "<group>"; };
3C2C7DC2288E007E0020F9AE /* UnitTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UnitTests-Bridging-Header.h"; sourceTree = "<group>"; };
3C2C7DC7288F3C020020F9AE /* OSSubscriptionModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSSubscriptionModel.swift; sourceTree = "<group>"; };
3C2D8A5828B4C4E300BE41F6 /* OSDelta.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSDelta.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1720,6 +1723,8 @@
isa = PBXGroup;
children = (
3CC063A62B6D7A8E002BB07F /* OneSignalCoreTests.swift */,
3C24B0EB2BD09D7A0052E771 /* OneSignalCoreObjCTests.m */,
3C24B0EA2BD09D790052E771 /* OneSignalCoreTests-Bridging-Header.h */,
);
path = OneSignalCoreTests;
sourceTree = "<group>";
Expand Down Expand Up @@ -3015,6 +3020,7 @@
3CC063A02B6D7A8D002BB07F = {
CreatedOnToolsVersion = 15.2;
DevelopmentTeam = 99SW8E36CT;
LastSwiftMigration = 1520;
ProvisioningStyle = Automatic;
TestTargetID = DEF5CCF02539321A0003E9CC;
};
Expand Down Expand Up @@ -3358,6 +3364,7 @@
buildActionMask = 2147483647;
files = (
3CC063A72B6D7A8E002BB07F /* OneSignalCoreTests.swift in Sources */,
3C24B0EC2BD09D7A0052E771 /* OneSignalCoreObjCTests.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -4245,6 +4252,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_OBJC_BRIDGING_HEADER = "OneSignalCoreTests/OneSignalCoreTests-Bridging-Header.h";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/UnitTestApp.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/UnitTestApp";
Expand Down Expand Up @@ -4299,6 +4307,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_OBJC_BRIDGING_HEADER = "OneSignalCoreTests/OneSignalCoreTests-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down Expand Up @@ -4348,6 +4357,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_OBJC_BRIDGING_HEADER = "OneSignalCoreTests/OneSignalCoreTests-Bridging-Header.h";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/UnitTestApp.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/UnitTestApp";
Expand Down
7 changes: 4 additions & 3 deletions iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalCoreHelper.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,9 +279,10 @@ + (NSString*)hashUsingMD5:(NSString*)string {
}

+ (NSString*)trimURLSpacing:(NSString*)url {
if (!url)
return url;

if (!url || [url isEqual:[NSNull null]]) {
return nil;
}

return [url stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
}

Expand Down
55 changes: 55 additions & 0 deletions iOS_SDK/OneSignalSDK/OneSignalCoreTests/OneSignalCoreObjCTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
/*
Modified MIT License

Copyright 2024 OneSignal

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

1. The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

2. All copies of substantial portions of the Software may only be used in connection

with services provided by OneSignal.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

#import <XCTest/XCTest.h>
#import <OneSignalCore/OneSignalCore.h>

@interface OneSignalCoreObjCTests : XCTestCase

@end

@implementation OneSignalCoreObjCTests

- (void)setUp {
}

- (void)tearDown {
}

// See https://github.com/OneSignal/OneSignal-iOS-SDK/issues/1400
- (void)testOneSignalCoreHelper_trimURLSpacing_handlesNullishValues {
NSString *nsNullResult = [OneSignalCoreHelper trimURLSpacing:[NSNull null]];
XCTAssertNil(nsNullResult);

NSString *nilResult = [OneSignalCoreHelper trimURLSpacing:nil];
XCTAssertNil(nilResult);

NSString *stringResult = [OneSignalCoreHelper trimURLSpacing:@" test "];
XCTAssertEqualObjects(@"test", stringResult);
}

@end
4 changes: 4 additions & 0 deletions iOS_SDK/OneSignalSDK/OneSignalCoreTests/OneSignalCoreTests-Bridging-Header.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
//
// Use this file to import your target's public headers that you would like to expose to Swift.
//

10 changes: 1 addition & 9 deletions iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalAttachmentHandler.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ + (void)addAttachments:(OSNotification*)notification
let unAttachments = [NSMutableArray new];

for(NSString* key in notification.attachments) {
let URI = [OneSignalAttachmentHandler trimURLSpacing:[notification.attachments valueForKey:key]];
let URI = [OneSignalCoreHelper trimURLSpacing:[notification.attachments valueForKey:key]];

let nsURL = [NSURL URLWithString:URI];

Expand Down Expand Up @@ -306,14 +306,6 @@ + (UNNotificationAction *)createActionForButton:(NSDictionary *)button {
}
}

+ (NSString*)trimURLSpacing:(NSString*)url {
if (!url)
return url;

return [url stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
}


/*
Synchroneously downloads an attachment
On success returns bundle resource name, otherwise returns nil
Expand Down
Loading