Hack the SDKSymbolExtractor into the obfuscation flow to stop Cocoa s…

…ymbols from being obfuscated
usertesting · Oct 12, 2015 · 20cf87b · 20cf87b
1 parent 00047f2
commit 20cf87b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/Source/CDSymbolsGeneratorVisitor.h b/Source/CDSymbolsGeneratorVisitor.h
@@ -7,5 +7,7 @@
 @property (nonatomic, readonly) NSString *resultString;
 @property (nonatomic, readonly) NSDictionary *symbols;
 @property(nonatomic, copy) NSString *symbolsFilePath;
+
 - (void)addSymbolsPadding;
+- (void)addSymbolsToBlacklist:(NSArray *)symbols;
 @end
diff --git a/Source/CDSymbolsGeneratorVisitor.m b/Source/CDSymbolsGeneratorVisitor.m
@@ -78,6 +78,13 @@ - (void)addForbiddenSymbols {
     ]];
 }
 
+- (void)addSymbolsToBlacklist:(NSArray *)symbols {
+    if (!_forbiddenNames) {
+        _forbiddenNames = [NSMutableSet new];
+    }
+    [_forbiddenNames addObjectsFromArray:symbols];
+}
+
 - (void)willBeginVisiting {
     _protocolNames = [NSMutableSet new];
     _classNames = [NSMutableSet new];
@@ -87,7 +94,9 @@ - (void)willBeginVisiting {
     _ivarNames = [NSMutableSet new];
     _symbols = [NSMutableDictionary new];
     _uniqueSymbols = [NSMutableSet new];
-    _forbiddenNames = [NSMutableSet new];
+    if (!_forbiddenNames) {
+        _forbiddenNames = [NSMutableSet new];
+    }
     _symbolLength = 3;
     _external = NO;
     _ignored = NO;

diff --git a/class-dump.m b/class-dump.m
@@ -20,6 +20,7 @@
 #import "CDSymbolMapper.h"
 #import "CDSystemProtocolsProcessor.h"
 #import "CDdSYMProcessor.h"
+#import "SDKSymbolExtractor.h"
 
 NSString *defaultSymbolMappingPath = @"symbols.json";
 
@@ -411,12 +412,20 @@ int main(int argc, char *argv[])
                             print_usage();
                             exit(3);
                         }
-
+
+                        SDKSymbolExtractor *extractor = [[SDKSymbolExtractor alloc] init];
+                        extractor.searchPathState.executablePath = [executablePath stringByDeletingLastPathComponent];
+                        extractor.sdkRoot = classDump.sdkRoot;
+                        extractor.targetArch = targetArch;
+                        [extractor loadFile:file error:&error depth:0];
+                        [extractor collectSymbols];
+
                         CDSymbolsGeneratorVisitor *visitor = [CDSymbolsGeneratorVisitor new];
                         visitor.classDump = classDump;
                         visitor.classFilter = classFilter;
                         visitor.ignoreSymbols = ignoreSymbols;
                         visitor.symbolsFilePath = symbolsPath;
+                        [visitor addSymbolsToBlacklist:extractor.symbols.allObjects];
                         [classDump recursivelyVisit:visitor];
 
                         CDXibStoryBoardProcessor *processor = [[CDXibStoryBoardProcessor alloc] init];