fix: SentryFilemanager will create folder depending on dsn (#229)

* fix: SentryFilemanager will create folder depending on dsn Fixes #216 * ci: Update to new xcode9.2 image * meta: Remove unused code
getsentry · Dec 8, 2017 · f4595e7 · f4595e7
1 parent e9a4f28
commit f4595e7
Show file tree

Hide file tree

Showing 13 changed files with 49 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode8.3
+osx_image: xcode9.2
 
 cache:
   - bundler

diff --git a/Sources/Sentry/SentryClient.m b/Sources/Sentry/SentryClient.m
@@ -92,7 +92,7 @@ - (_Nullable instancetype)initWithDsn:(NSString *)dsn
         self.dsn = [[SentryDsn alloc] initWithString:dsn didFailWithError:error];
         self.requestManager = requestManager;
         NSLog(@"Sentry Started -- Version: %@", self.class.versionString);
-        self.fileManager = [[SentryFileManager alloc] initWithError:error];
+        self.fileManager = [[SentryFileManager alloc] initWithDsn:self.dsn didFailWithError:error];
         self.breadcrumbs = [[SentryBreadcrumbStore alloc] initWithFileManager:self.fileManager];
         if (nil != error && nil != *error) {
             [SentryLog logWithMessage:(*error).localizedDescription andLevel:kSentryLogLevelError];

diff --git a/Sources/Sentry/SentryDsn.m b/Sources/Sentry/SentryDsn.m
@@ -6,6 +6,8 @@
 //  Copyright © 2017 Sentry. All rights reserved.
 //
 
+#import <CommonCrypto/CommonDigest.h>
+
 #if __has_include(<Sentry/Sentry.h>)
 
 #import <Sentry/SentryDsn.h>
@@ -37,6 +39,17 @@ - (_Nullable instancetype)initWithString:(NSString *)dsnString didFailWithError:
     return self;
 }
 
+- (NSString *)getHash {
+    NSData *data = [[self.url absoluteString] dataUsingEncoding:NSUTF8StringEncoding];
+    uint8_t digest[CC_SHA1_DIGEST_LENGTH];
+    CC_SHA1(data.bytes, (CC_LONG)data.length, digest);
+    NSMutableString *output = [NSMutableString stringWithCapacity:CC_SHA1_DIGEST_LENGTH * 2];
+    for (int i = 0; i < CC_SHA1_DIGEST_LENGTH; i++) {
+        [output appendFormat:@"%02x", digest[i]];
+    }
+    return output;
+}
+
 - (NSURL *_Nullable)convertDsnString:(NSString *)dsnString didFailWithError:(NSError *_Nullable *_Nullable)error {
     NSString *trimmedDsnString = [dsnString stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
     NSSet *allowedSchemes = [NSSet setWithObjects:@"http", @"https", nil];

diff --git a/Sources/Sentry/SentryFileManager.m b/Sources/Sentry/SentryFileManager.m
@@ -13,13 +13,15 @@
 #import <Sentry/SentryLog.h>
 #import <Sentry/SentryEvent.h>
 #import <Sentry/SentryBreadcrumb.h>
+#import <Sentry/SentryDsn.h>
 
 #else
 #import "SentryFileManager.h"
 #import "SentryError.h"
 #import "SentryLog.h"
 #import "SentryEvent.h"
 #import "SentryBreadcrumb.h"
+#import "SentryDsn.h"
 #endif
 
 NS_ASSUME_NONNULL_BEGIN
@@ -35,12 +37,15 @@ @interface SentryFileManager ()
 
 @implementation SentryFileManager
 
-- (_Nullable instancetype)initWithError:(NSError **)error {
+- (_Nullable instancetype)initWithDsn:(SentryDsn *)dsn didFailWithError:(NSError **)error {
     self = [super init];
     if (self) {
         NSFileManager *fileManager = [NSFileManager defaultManager];
         NSString *cachePath = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES).firstObject;
+
         self.sentryPath = [cachePath stringByAppendingPathComponent:@"io.sentry"];
+        self.sentryPath = [self.sentryPath stringByAppendingPathComponent:[dsn getHash]];
+
         if (![fileManager fileExistsAtPath:self.sentryPath]) {
             [self.class createDirectoryAtPath:self.sentryPath withError:error];
         }

diff --git a/Sources/Sentry/include/SentryDsn.h b/Sources/Sentry/include/SentryDsn.h
@@ -16,6 +16,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (_Nullable instancetype)initWithString:(NSString *)dsnString didFailWithError:(NSError *_Nullable *_Nullable)error;
 
+- (NSString *)getHash;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/Sources/Sentry/include/SentryFileManager.h b/Sources/Sentry/include/SentryFileManager.h
@@ -16,12 +16,12 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@class SentryEvent, SentryBreadcrumb;
+@class SentryEvent, SentryBreadcrumb, SentryDsn;
 
 @interface SentryFileManager : NSObject
 SENTRY_NO_INIT
 
-- (_Nullable instancetype)initWithError:(NSError **)error;
+- (_Nullable instancetype)initWithDsn:(SentryDsn *)dsn didFailWithError:(NSError **)error;
 
 - (NSString *)storeEvent:(SentryEvent *)event;
 

diff --git a/Tests/SentryTests/SentryBreadcrumbTests.m b/Tests/SentryTests/SentryBreadcrumbTests.m
@@ -11,6 +11,7 @@
 #import "SentryBreadcrumbStore.h"
 #import "SentryFileManager.h"
 #import "NSDate+Extras.h"
+#import "SentryDsn.h"
 
 @interface SentryBreadcrumbTests : XCTestCase
 
@@ -23,7 +24,7 @@ @implementation SentryBreadcrumbTests
 - (void)setUp {
     [super setUp];
     NSError *error = nil;
-    self.fileManager = [[SentryFileManager alloc] initWithError:&error];
+    self.fileManager = [[SentryFileManager alloc] initWithDsn:[[SentryDsn alloc] initWithString:@"https://username:[email protected]/12345" didFailWithError:nil] didFailWithError:&error];
     XCTAssertNil(error);
 }
 

diff --git a/Tests/SentryTests/SentryFileManagerTests.m b/Tests/SentryTests/SentryFileManagerTests.m
@@ -9,6 +9,7 @@
 #import <XCTest/XCTest.h>
 #import <Sentry/Sentry.h>
 #import "SentryFileManager.h"
+#import "SentryDsn.h"
 
 @interface SentryFileManagerTests : XCTestCase
 
@@ -22,7 +23,7 @@ - (void)setUp {
     [super setUp];
     SentryClient.logLevel = kSentryLogLevelDebug;
     NSError *error = nil;
-    self.fileManager = [[SentryFileManager alloc] initWithError:&error];
+    self.fileManager = [[SentryFileManager alloc] initWithDsn:[[SentryDsn alloc] initWithString:@"https://username:[email protected]/12345" didFailWithError:nil] didFailWithError:&error];
     XCTAssertNil(error);
 }
 

diff --git a/Tests/SentryTests/SentryInterfacesTests.m b/Tests/SentryTests/SentryInterfacesTests.m
@@ -274,7 +274,7 @@ - (void)testBreadcrumb {
 }
 
 - (void)testBreadcrumbStore {
-    SentryBreadcrumbStore *store = [[SentryBreadcrumbStore alloc] initWithFileManager:[[SentryFileManager alloc] initWithError:nil]];
+    SentryBreadcrumbStore *store = [[SentryBreadcrumbStore alloc] initWithFileManager:[[SentryFileManager alloc] initWithDsn:[[SentryDsn alloc] initWithString:@"https://username:[email protected]/12345" didFailWithError:nil] didFailWithError:nil]];
     SentryBreadcrumb *crumb = [[SentryBreadcrumb alloc] initWithLevel:kSentrySeverityInfo category:@"http"];
     [store addBreadcrumb:crumb];
     NSDate *date = [NSDate date];

diff --git a/Tests/SentryTests/SentryJavaScriptBridgeHelperTests.m b/Tests/SentryTests/SentryJavaScriptBridgeHelperTests.m
@@ -10,6 +10,8 @@
 #import "SentryJavaScriptBridgeHelper.h"
 #import <Sentry/Sentry.h>
 
+NSString *rnReportPath = @"";
+
 @interface SentryJavaScriptBridgeHelper()
 
 + (NSArray *)parseJavaScriptStacktrace:(NSString *)stacktrace;
@@ -109,14 +111,22 @@ - (void)testCreateBreadcrumb {
     XCTAssertTrue([crumb2.timestamp compare:date]);
 }
 
+- (NSDictionary *)getCrashReport {
+    NSString *jsonPath = [[NSBundle bundleForClass:self.class] pathForResource:rnReportPath ofType:@"json"];
+    NSData *jsonData = [NSData dataWithContentsOfURL:[NSURL fileURLWithPath:jsonPath]];
+    return [NSJSONSerialization JSONObjectWithData:jsonData options:0 error:nil];
+}
+
 - (void)testCreateEvent {
-    SentryEvent *sentryEvent1 = [SentryJavaScriptBridgeHelper createSentryEventFromJavaScriptEvent:[NSJSONSerialization JSONObjectWithData:[NSData dataWithContentsOfURL:[NSURL fileURLWithPath:[[NSBundle bundleForClass:self.class] pathForResource:@"raven-sendMessage" ofType:@"json"]]] options:0 error:nil]];
+    rnReportPath = @"Resources/raven-sendMessage";
+    SentryEvent *sentryEvent1 = [SentryJavaScriptBridgeHelper createSentryEventFromJavaScriptEvent:[self getCrashReport]];
     XCTAssertEqualObjects(sentryEvent1.message, @"TEST message");
     XCTAssertNotNil(sentryEvent1.extra);
     XCTAssertNotNil(sentryEvent1.tags);
     XCTAssertNotNil(sentryEvent1.user);
 
-    SentryEvent *sentryEvent2 = [SentryJavaScriptBridgeHelper createSentryEventFromJavaScriptEvent:[NSJSONSerialization JSONObjectWithData:[NSData dataWithContentsOfURL:[NSURL fileURLWithPath:[[NSBundle bundleForClass:self.class] pathForResource:@"raven-rejectedpromise" ofType:@"json"]]] options:0 error:nil]];
+    rnReportPath = @"Resources/raven-rejectedpromise";
+    SentryEvent *sentryEvent2 = [SentryJavaScriptBridgeHelper createSentryEventFromJavaScriptEvent:[self getCrashReport]];
     XCTAssertEqualObjects(sentryEvent2.message, @"Boom promise");
     XCTAssertEqualObjects(sentryEvent2.platform, @"cocoa");
     XCTAssertEqualObjects(sentryEvent2.exceptions.firstObject.type, @"Unhandled Promise Rejection");
@@ -127,7 +137,8 @@ - (void)testCreateEvent {
     XCTAssertNotNil(sentryEvent2.tags);
     XCTAssertNotNil(sentryEvent2.user);
 
-    SentryEvent *sentryEvent3 = [SentryJavaScriptBridgeHelper createSentryEventFromJavaScriptEvent:[NSJSONSerialization JSONObjectWithData:[NSData dataWithContentsOfURL:[NSURL fileURLWithPath:[[NSBundle bundleForClass:self.class] pathForResource:@"raven-throwerror" ofType:@"json"]]] options:0 error:nil]];
+    rnReportPath = @"Resources/raven-throwerror";
+    SentryEvent *sentryEvent3 = [SentryJavaScriptBridgeHelper createSentryEventFromJavaScriptEvent:[self getCrashReport]];
     XCTAssertEqualObjects(sentryEvent3.exceptions.firstObject.value, @"Sentry: Test throw error");
     XCTAssertEqualObjects(sentryEvent3.exceptions.firstObject.type, @"Error");
     XCTAssertEqual(sentryEvent3.exceptions.firstObject.thread.stacktrace.frames.count, (NSUInteger)30);

diff --git a/Tests/SentryTests/SentryRequestTests.m b/Tests/SentryTests/SentryRequestTests.m
@@ -156,7 +156,7 @@ @implementation SentryRequestTests
 
 - (void)clearAllFiles {
     NSError *error = nil;
-    SentryFileManager *fileManager = [[SentryFileManager alloc] initWithError:&error];
+    SentryFileManager *fileManager = [[SentryFileManager alloc] initWithDsn:[[SentryDsn alloc] initWithString:@"https://username:[email protected]/12345" didFailWithError:nil] didFailWithError:&error];
     [fileManager deleteAllStoredEvents];
     [fileManager deleteAllStoredBreadcrumbs];
     [fileManager deleteAllFolders];

diff --git a/Tests/SentryTests/SentrySwiftTests.swift b/Tests/SentryTests/SentrySwiftTests.swift
@@ -13,7 +13,7 @@ class SentrySwiftTests: XCTestCase {
 
     override func setUp() {
         super.setUp()
-        let fileManager = try! SentryFileManager(error: ())
+        let fileManager = try! SentryFileManager(dsn: SentryDsn(string: "https://username:[email protected]/12345"))
         fileManager.deleteAllStoredEvents()
         fileManager.deleteAllStoredBreadcrumbs()
         fileManager.deleteAllFolders()

diff --git a/Tests/SentryTests/SentryTests.m b/Tests/SentryTests/SentryTests.m
@@ -54,13 +54,15 @@ - (void)testCrashedLastLaunch {
 
 - (void)testBreadCrumbTracking {
     NSError *error = nil;
-    SentryClient *client = [[SentryClient alloc] initWithDsn:@"https://username:[email protected]/12345" didFailWithError:&error];
+    SentryClient *client = [[SentryClient alloc] initWithDsn:@"https://username:[email protected]/123456" didFailWithError:&error];
+    [client.breadcrumbs clear];
     [client enableAutomaticBreadcrumbTracking];
     XCTAssertEqual(client.breadcrumbs.count, (unsigned long)0);
     [SentryClient setSharedClient:client];
     [SentryClient.sharedClient enableAutomaticBreadcrumbTracking];
     XCTAssertEqual(SentryClient.sharedClient.breadcrumbs.count, (unsigned long)1);
     [SentryClient setSharedClient:nil];
+    [client.breadcrumbs clear];
 }
 
 - (void)testInstallation {