-
Notifications
You must be signed in to change notification settings - Fork 194
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #146 from amplitude/replace-deprecated-methods
Replace deprecated methods
- Loading branch information
Showing
15 changed files
with
210 additions
and
75 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| #if AMPLITUDE_SSL_PINNING | ||
| // | ||
| // AMPURLSession.h | ||
| // Amplitude | ||
| // | ||
| // Created by Daniel Jih on 9/14/17. | ||
| // Copyright (c) 2017 Amplitude. All rights reserved. | ||
| // | ||
|
|
||
| #import <Foundation/Foundation.h> | ||
| #import "ISPPinnedNSURLSessionDelegate.h" | ||
|
|
||
| @interface AMPURLSession : ISPPinnedNSURLSessionDelegate <NSURLSessionDelegate, NSURLSessionTaskDelegate, NSURLSessionDataDelegate> | ||
|
|
||
| + (AMPURLSession *)sharedSession; | ||
| - (NSURLSessionDataTask *)dataTaskWithRequest:(NSURLRequest *)request completionHandler:(void (^)(NSData *data, NSURLResponse *response, NSError *error))completionHandler; | ||
|
|
||
| @end | ||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| #if AMPLITUDE_SSL_PINNING | ||
| // | ||
| // AMPURLSession.m | ||
| // Amplitude | ||
| // | ||
| // Created by Daniel Jih on 9/14/17. | ||
| // Copyright (c) 2017 Amplitude. All rights reserved. | ||
| // | ||
|
|
||
| #import "AMPURLSession.h" | ||
| #import "AMPARCMacros.h" | ||
| #import "AMPConstants.h" | ||
| #import "ISPCertificatePinning.h" | ||
| #import "ISPPinnedNSURLSessionDelegate.h" | ||
|
|
||
| @interface AMPURLSession () | ||
|
|
||
| @end | ||
|
|
||
| @implementation AMPURLSession { | ||
| NSURLSession *_sharedSession; | ||
| } | ||
|
|
||
| + (AMPURLSession *)sharedSession { | ||
| static AMPURLSession *_instance = nil; | ||
| static dispatch_once_t onceToken; | ||
| dispatch_once(&onceToken, ^{ | ||
| _instance = [[AMPURLSession alloc] init]; | ||
| }); | ||
| return _instance; | ||
| } | ||
|
|
||
| - (id)init | ||
| { | ||
| if ((self = [super init])) { | ||
| [AMPURLSession pinSSLCertificate:@[@"ComodoRsaCA", @"ComodoRsaDomainValidationCA"]]; | ||
| NSURLSessionConfiguration *configuration = [NSURLSessionConfiguration defaultSessionConfiguration]; | ||
| _sharedSession = [NSURLSession sessionWithConfiguration:configuration delegate:self delegateQueue:nil]; | ||
| } | ||
| return self; | ||
| } | ||
|
|
||
| + (void)pinSSLCertificate:(NSArray *)certFilenames | ||
| { | ||
| // We pin the anchor/CA certificates | ||
| NSMutableArray *certs = [NSMutableArray array]; | ||
| for (NSString *certFilename in certFilenames) { | ||
| NSString *certPath = [[NSBundle bundleForClass:[self class]] pathForResource:certFilename ofType:@"der"]; | ||
| NSData *certData = SAFE_ARC_AUTORELEASE([[NSData alloc] initWithContentsOfFile:certPath]); | ||
| if (certData == nil) { | ||
| NSLog(@"Failed to load a certificate"); | ||
| return; | ||
| } | ||
| [certs addObject:certData]; | ||
| } | ||
|
|
||
| NSMutableDictionary *pins = [[NSMutableDictionary alloc] init]; | ||
| [pins setObject:certs forKey:kAMPEventLogDomain]; | ||
|
|
||
| if (pins == nil) { | ||
| NSLog(@"Failed to pin a certificate"); | ||
| return; | ||
| } | ||
|
|
||
| // Save the SSL pins so that our connection delegates automatically use them | ||
| if ([ISPCertificatePinning setupSSLPinsUsingDictionnary:pins] != YES) { | ||
| NSLog(@"Failed to pin the certificates"); | ||
| SAFE_ARC_RELEASE(pins); | ||
| return; | ||
| } | ||
| SAFE_ARC_RELEASE(pins); | ||
| } | ||
|
|
||
| - (void)dealloc | ||
| { | ||
| [_sharedSession finishTasksAndInvalidate]; | ||
| SAFE_ARC_RELEASE(_sharedSession); | ||
| SAFE_ARC_SUPER_DEALLOC(); | ||
| } | ||
|
|
||
| - (NSURLSessionDataTask *)dataTaskWithRequest:(NSURLRequest *)request | ||
| completionHandler:(void (^)(NSData *data, NSURLResponse *response, NSError *error))completionHandler { | ||
| return [_sharedSession dataTaskWithRequest:request completionHandler:completionHandler]; | ||
| } | ||
|
|
||
| @end | ||
| #endif |
Oops, something went wrong.