Add testapp as a theos subproject

nabla-c0d3 · nabla-c0d3 · commit ef8a034aefce · 2013-02-24T20:19:53.000-08:00
diff --git a/Makefile b/Makefile
@@ -6,3 +6,5 @@ SSLKillSwitch_FILES = Tweak.xm HookedNSURLConnectionDelegate.m
 
 SSLKillSwitch_FRAMEWORKS = UIKit
 include $(THEOS_MAKE_PATH)/tweak.mk
+SUBPROJECTS += testapp
+include $(THEOS_MAKE_PATH)/aggregate.mk
diff --git a/Tweak.xm b/Tweak.xm
@@ -41,7 +41,7 @@
 
 %ctor {
 	// Should we hook NSURLConnection ?
-    NSString* preferenceFilePath = @PREFERENCEFILE; // Dirty ?
+    NSString* preferenceFilePath = @PREFERENCEFILE;
     BOOL shouldHook = [HookedNSURLConnectionDelegate shouldHookNSURLConnectionFromPreference:preferenceFilePath];
     [preferenceFilePath release];
 
diff --git a/testapp/Makefile b/testapp/Makefile
@@ -0,0 +1,7 @@
+include theos/makefiles/common.mk
+
+APPLICATION_NAME = SSLKillSwitchTestApplication
+SSLKillSwitchTestApplication_FILES = main.m SSLKillSwitchTestApplication.mm RootViewController.mm TestSSLKillSwitch.m
+SSLKillSwitchTestApplication_FRAMEWORKS = UIKit CoreGraphics Security
+
+include $(THEOS_MAKE_PATH)/application.mk
diff --git a/testapp/Resources/Info.plist b/testapp/Resources/Info.plist
@@ -0,0 +1,16 @@
+{
+    CFBundleExecutable = "SSLKillSwitchTestApplication";
+    CFBundleIconFile = icon.png;
+    CFBundleIdentifier = "com.isecpartners.nabla.sslkillswitchtestapp";
+    CFBundleInfoDictionaryVersion = 6.0;
+    CFBundlePackageType = APPL;
+    CFBundleSignature = "????";
+    CFBundleSupportedPlatforms = (
+	iPhoneOS
+    );
+    CFBundleVersion = 1.0;
+    DTPlatformName = iphoneos;
+    DTSDKName = iphoneos3.0;
+    LSRequiresIPhoneOS = 1;
+    MinimumOSVersion = 3.0;
+}
diff --git a/testapp/Resources/VeriSignClass3PublicPrimaryCertificationAuthority-G5.der b/testapp/Resources/VeriSignClass3PublicPrimaryCertificationAuthority-G5.der
diff --git a/testapp/RootViewController.h b/testapp/RootViewController.h
@@ -0,0 +1,3 @@
+@interface RootViewController: UIViewController {
+}
+@end
diff --git a/testapp/RootViewController.mm b/testapp/RootViewController.mm
@@ -0,0 +1,24 @@
+#import "RootViewController.h"
+#import "TestSSLKillSwitch.h"
+
+
+
+@implementation RootViewController
+- (void)loadView {
+	self.view = [[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease];
+	self.view.backgroundColor = [UIColor redColor];
+
+    UIAlertView *alert =
+        [[UIAlertView alloc] initWithTitle: @"iOS SSL Kill Switch"
+                             message: @"iOS SSL Kill Switch Test App Started"
+                             delegate: self
+                             cancelButtonTitle: @"OK"
+                             otherButtonTitles: nil];
+    [alert show];
+    [alert release];
+
+    [TestSSLKillSwitch runAllTests];
+
+}
+@end
+
diff --git a/testapp/SSLKillSwitchTestApplication.mm b/testapp/SSLKillSwitchTestApplication.mm
@@ -0,0 +1,25 @@
+#import "RootViewController.h"
+
+@interface SSLKillSwitchTestApplication: UIApplication <UIApplicationDelegate> {
+	UIWindow *_window;
+	RootViewController *_viewController;
+}
+@property (nonatomic, retain) UIWindow *window;
+@end
+
+@implementation SSLKillSwitchTestApplication
+@synthesize window = _window;
+- (void)applicationDidFinishLaunching:(UIApplication *)application {
+	_window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
+	_viewController = [[RootViewController alloc] init];
+	[_window addSubview:_viewController.view];
+	[_window makeKeyAndVisible];
+}
+
+- (void)dealloc {
+	[_viewController release];
+	[_window release];
+	[super dealloc];
+}
+@end
+
diff --git a/testapp/SSLKillSwitchTestApplicationApplication.mm b/testapp/SSLKillSwitchTestApplicationApplication.mm
@@ -0,0 +1,26 @@
+#import "RootViewController.h"
+
+@interface SSLKillSwitchTestApplicationApplication: UIApplication <UIApplicationDelegate> {
+	UIWindow *_window;
+	RootViewController *_viewController;
+}
+@property (nonatomic, retain) UIWindow *window;
+@end
+
+@implementation SSLKillSwitchTestApplicationApplication
+@synthesize window = _window;
+- (void)applicationDidFinishLaunching:(UIApplication *)application {
+	_window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
+	_viewController = [[RootViewController alloc] init];
+	[_window addSubview:_viewController.view];
+	[_window makeKeyAndVisible];
+}
+
+- (void)dealloc {
+	[_viewController release];
+	[_window release];
+	[super dealloc];
+}
+@end
+
+// vim:ft=objc
diff --git a/testapp/TestSSLKillSwitch.h b/testapp/TestSSLKillSwitch.h
@@ -0,0 +1,20 @@
+@interface TestSSLKillSwitch: NSObject {
+}
+
++ (void)runAllTests;
++ (void)testNSURLConnectionClassMethods;
++ (void)testNSURLConnectionInstanceMethods;
+
+@end
+
+
+@interface SSLPinnedNSURLConnectionDelegate: NSObject {
+}
+
+- (void)connectionDidFinishLoading:(NSURLConnection *)connection;
+- (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error;
+- (NSCachedURLResponse *)connection:(NSURLConnection *)connection willCacheResponse:(NSCachedURLResponse *)cachedResponse;
+- (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response;
+- (NSURLRequest *)connection:(NSURLConnection *)connection willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse;
+- (void)connection:(NSURLConnection *)connection willSendRequestForAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge;
+@end
diff --git a/testapp/TestSSLKillSwitch.m b/testapp/TestSSLKillSwitch.m
@@ -0,0 +1,103 @@
+#import "TestSSLKillSwitch.h"
+
+@implementation TestSSLKillSwitch
+
++ (void)runAllTests {
+    [self testNSURLConnectionInstanceMethods];
+	[self testNSURLConnectionClassMethods];
+}
+
+
++ (void)testNSURLConnectionClassMethods {
+    SSLPinnedNSURLConnectionDelegate* deleg = [[SSLPinnedNSURLConnectionDelegate alloc] init];
+    [NSURLConnection connectionWithRequest: [NSURLRequest requestWithURL:
+		  [NSURL URLWithString:@"https://www.isecpartners.com/?method=connectionWithRequest"]]
+	   delegate:deleg];
+    [deleg release]; // Give ownership to the connection
+}
+
+
++ (void)testNSURLConnectionInstanceMethods {
+	SSLPinnedNSURLConnectionDelegate* deleg = [[SSLPinnedNSURLConnectionDelegate alloc] init];
+	NSURLConnection *conn = [[NSURLConnection alloc] 
+        initWithRequest:[NSURLRequest requestWithURL:
+			[NSURL URLWithString:@"https://www.isecpartners.com/?method=initWithRequest:delegate:"]]
+        delegate:deleg];
+	[conn start];
+
+	NSURLConnection *conn2 = [[NSURLConnection alloc]
+	    initWithRequest:[NSURLRequest requestWithURL:
+			[NSURL URLWithString:@"https://www.isecpartners.com/?method=initWithRequest:delegate:startImmediately:"]]
+        delegate:deleg
+        startImmediately:NO];
+    [conn2 start];
+    [deleg release]; // Give ownership to the connection
+}
+
+
+
+@end
+
+
+
+@implementation SSLPinnedNSURLConnectionDelegate
+- (void)connectionDidFinishLoading:(NSURLConnection *)connection {
+    
+}
+
+- (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error {
+    NSLog(@"SSLPinnedNSURLConnectionDelegate - failed: %@", error);
+}
+
+- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data {
+    NSLog(@"SSLPinnedNSURLConnectionDelegate - received %d bytes", [data length]);
+}
+
+- (NSCachedURLResponse *)connection:(NSURLConnection *)connection willCacheResponse:(NSCachedURLResponse *)cachedResponse {
+    return cachedResponse;
+}
+
+- (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response {
+    NSLog(@"SSLPinnedNSURLConnectionDelegate - success: %@", [[response URL] host]);
+}
+
+- (NSURLRequest *)connection:(NSURLConnection *)connection willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse {
+    return request;
+}
+
+- (void)connection:(NSURLConnection *)connection willSendRequestForAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge {
+    // Pin the wrong CA certificate => connection should only work if SSL Kill Switch is enabled
+    
+    if([challenge.protectionSpace.authenticationMethod isEqualToString:NSURLAuthenticationMethodServerTrust]) {
+        SecTrustRef serverTrust = [[challenge protectionSpace] serverTrust];
+        SecTrustResultType trustResult;
+
+        // Load the anchor certificate
+        NSString *certPath = [[NSString alloc] initWithFormat:@"%@/VeriSignClass3PublicPrimaryCertificationAuthority-G5.der", [[NSBundle mainBundle] bundlePath]];
+        NSData *anchorCertData = [[NSData alloc] initWithContentsOfFile:certPath];
+        if (anchorCertData == nil) {
+            NSLog(@"Failed to load the certificates");
+            [[challenge sender] cancelAuthenticationChallenge: challenge];
+            return;
+        }
+        
+        // Pin the anchor CA and validate the certificate chain
+        SecCertificateRef anchorCertificate = SecCertificateCreateWithData(NULL, (CFDataRef)(anchorCertData));
+        NSArray *anchorArray = [NSArray arrayWithObject:(id)(anchorCertificate)];
+        SecTrustSetAnchorCertificates(serverTrust, (CFArrayRef)(anchorArray));
+        SecTrustEvaluate(serverTrust, &trustResult);
+        CFRelease(anchorCertificate);
+
+        if (trustResult == kSecTrustResultUnspecified) {
+            // Continue connecting
+            [challenge.sender useCredential:[NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust]
+                 forAuthenticationChallenge:challenge];
+        }
+        else {
+            // Certificate chain validation failed; cancel the connection
+            [[challenge sender] cancelAuthenticationChallenge: challenge];
+        }
+    }
+}
+@end
+
diff --git a/testapp/control b/testapp/control
@@ -0,0 +1,9 @@
+Package: com.isecpartners.nabla.sslkillswitchtestapp
+Name: iOS SSL Kill Switch Test Application
+Depends: 
+Version: 0.0.1
+Architecture: iphoneos-arm
+Description: iOS SSL Kill Switch Test Application
+Maintainer: Alban Diquet
+Author: Alban Diquet
+Section: Utilities
diff --git a/testapp/main.m b/testapp/main.m
@@ -0,0 +1,7 @@
+int main(int argc, char **argv) {
+	NSAutoreleasePool *p = [[NSAutoreleasePool alloc] init];
+	int ret = UIApplicationMain(argc, argv, @"SSLKillSwitchTestApplication", @"SSLKillSwitchTestApplication");
+	[p drain];
+	return ret;
+}
+

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+@interface RootViewController: UIViewController {`
	`2`	`+}`
	`3`	`+@end`