Experimental SSL support
This commit is contained in:
@@ -7,6 +7,7 @@
|
||||
//
|
||||
|
||||
#import "MBIMBridge.h"
|
||||
#import "MBIMBridge_Private.h"
|
||||
#import "MBIMBridgeOperation.h"
|
||||
#import "MBIMConcurrentHTTPServer.h"
|
||||
#import "MBIMHTTPConnection.h"
|
||||
@@ -21,9 +22,14 @@
|
||||
#import <IMFoundation/IMFoundation.h>
|
||||
#import <IMFoundation/IMFoundation_Private.h>
|
||||
|
||||
static const UInt16 kDefaultPort = 5738;
|
||||
|
||||
static NSString *const MBIMBridgeToken = @"net.buzzert.kordophone";
|
||||
|
||||
@interface MBIMBridge (/* INTERNAL */)
|
||||
@interface MBIMBridge (/* INTERNAL */) {
|
||||
__strong NSArray *_sslCertificateAndIdentity;
|
||||
}
|
||||
|
||||
@property (nonatomic, strong) MBIMConcurrentHTTPServer *httpServer;
|
||||
@property (nonatomic, strong) NSOperationQueue *operationQueue;
|
||||
|
||||
@@ -47,11 +53,7 @@ static NSString *const MBIMBridgeToken = @"net.buzzert.kordophone";
|
||||
{
|
||||
self = [super init];
|
||||
if (self) {
|
||||
[self registerForNotifications];
|
||||
[self startWebServer];
|
||||
|
||||
[sDaemonController setDelegate:self];
|
||||
[sDaemonListener addHandler:self];
|
||||
self.port = kDefaultPort;
|
||||
|
||||
_operationQueue = [[NSOperationQueue alloc] init];
|
||||
_operationQueue.maxConcurrentOperationCount = 5;
|
||||
@@ -63,7 +65,58 @@ static NSString *const MBIMBridgeToken = @"net.buzzert.kordophone";
|
||||
- (void)_terminate
|
||||
{
|
||||
// *shrug*
|
||||
exit(0);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
- (NSArray *)sslCertificateAndIdentity
|
||||
{
|
||||
if (!_sslCertificateAndIdentity && self.sslCertPath) {
|
||||
// Get the p12
|
||||
NSError *error = nil;
|
||||
NSData *certData = [NSData dataWithContentsOfFile:self.sslCertPath options:0 error:&error];
|
||||
if (!certData || error) {
|
||||
MBIMLogError(@"Unable to load SSL certificate from file: %@", [error localizedDescription]);
|
||||
return nil;
|
||||
}
|
||||
|
||||
CFArrayRef items = nil;
|
||||
OSStatus status = SecPKCS12Import(
|
||||
(__bridge CFDataRef)certData,
|
||||
(__bridge CFDictionaryRef) @{
|
||||
(__bridge id)kSecImportExportPassphrase : @"xNAq3vn)^PNu}[&gyQ4MZeV?J"
|
||||
},
|
||||
&items
|
||||
);
|
||||
|
||||
if (status != noErr) {
|
||||
MBIMLogError(@"Error importing PKCS12: SecPKCS12Import status: %d", status);
|
||||
return nil;
|
||||
}
|
||||
|
||||
CFDictionaryRef certDict = CFArrayGetValueAtIndex(items, 0);
|
||||
if (!certDict) {
|
||||
MBIMLogError(@"Error parsing the SSL certificate");
|
||||
return nil;
|
||||
}
|
||||
|
||||
SecIdentityRef identity = (SecIdentityRef)CFDictionaryGetValue(certDict, kSecImportItemIdentity);
|
||||
_sslCertificateAndIdentity = @[ (__bridge id)identity ];
|
||||
}
|
||||
|
||||
return _sslCertificateAndIdentity;
|
||||
}
|
||||
|
||||
- (void)checkSSLCertificate
|
||||
{
|
||||
if (self.usesSSL) {
|
||||
NSArray *certAndIdentity = [self sslCertificateAndIdentity];
|
||||
if ([certAndIdentity count]) {
|
||||
MBIMLogInfo(@"SSL Certificate looks okay");
|
||||
} else {
|
||||
MBIMLogFatal(@"Wasn't able to load SSL certificate. Bailing...");
|
||||
[self _terminate];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#pragma mark -
|
||||
@@ -76,18 +129,26 @@ static NSString *const MBIMBridgeToken = @"net.buzzert.kordophone";
|
||||
BOOL hooked = HookIMAgent(self.dylibPath, &errorString);
|
||||
if (!hooked) {
|
||||
NSString *errorNSString = [NSString stringWithUTF8String:errorString];
|
||||
NSLog(@"Error hooking imagent: %@", errorNSString);
|
||||
MBIMLogInfo(@"Error hooking imagent: %@", errorNSString);
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
||||
if (![sDaemonController hasListenerForID: MBIMBridgeToken]) {
|
||||
[self registerForNotifications];
|
||||
|
||||
[sDaemonController setDelegate:self];
|
||||
[sDaemonListener addHandler:self];
|
||||
|
||||
if (![sDaemonController hasListenerForID:MBIMBridgeToken]) {
|
||||
if (![sDaemonController addListenerID:MBIMBridgeToken capabilities:(kFZListenerCapFileTransfers | kFZListenerCapManageStatus | kFZListenerCapChats | kFZListenerCapMessageHistory | kFZListenerCapIDQueries | kFZListenerCapSendMessages)]) {
|
||||
NSLog(@"Failed to connect to imagent");
|
||||
MBIMLogFatal(@"Failed to connect to imagent");
|
||||
|
||||
[self _terminate];
|
||||
}
|
||||
}
|
||||
|
||||
[self checkSSLCertificate];
|
||||
[self startWebServer];
|
||||
}
|
||||
|
||||
- (void)disconnect
|
||||
@@ -116,7 +177,7 @@ static NSString *const MBIMBridgeToken = @"net.buzzert.kordophone";
|
||||
|
||||
- (void)_messageReceived:(NSNotification *)notification
|
||||
{
|
||||
NSLog(@"Received message from chat with GUID: %@", [[notification object] guid]);
|
||||
MBIMLogInfo(@"Received message from chat with GUID: %@", [[notification object] guid]);
|
||||
|
||||
IMChat *chat = [notification object];
|
||||
IMMessage *message = [[notification userInfo] objectForKey:IMChatValueKey];
|
||||
@@ -135,14 +196,14 @@ static NSString *const MBIMBridgeToken = @"net.buzzert.kordophone";
|
||||
|
||||
- (void)_chatRegistryDidLoad:(NSNotification *)notification
|
||||
{
|
||||
NSLog(@"Loaded chat registry. %lu existing chats", (unsigned long)[sChatRegistry numberOfExistingChats]);
|
||||
MBIMLogInfo(@"Loaded chat registry. %lu existing chats", (unsigned long)[sChatRegistry numberOfExistingChats]);
|
||||
}
|
||||
|
||||
- (void)_chatItemsDidChange:(NSNotification *)notification
|
||||
{
|
||||
IMChat *chat = [notification object];
|
||||
if (chat) {
|
||||
NSLog(@"Chat items change for GUID: %@", [chat guid]);
|
||||
MBIMLogInfo(@"Chat items change for GUID: %@", [chat guid]);
|
||||
|
||||
MBIMUpdateItem *updateItem = [[MBIMUpdateItem alloc] init];
|
||||
updateItem.changedChat = chat;
|
||||
@@ -157,11 +218,13 @@ static NSString *const MBIMBridgeToken = @"net.buzzert.kordophone";
|
||||
{
|
||||
self.httpServer = [[MBIMConcurrentHTTPServer alloc] init];
|
||||
[self.httpServer setConnectionClass:[MBIMHTTPConnection class]];
|
||||
[self.httpServer setPort:8080];
|
||||
[self.httpServer setPort:self.port];
|
||||
|
||||
NSError *error = nil;
|
||||
if (![self.httpServer start:&error]) {
|
||||
NSLog(@"Error starting HTTP server: %@", [error localizedDescription]);
|
||||
MBIMLogError(@"Error starting HTTP server: %@", [error localizedDescription]);
|
||||
} else {
|
||||
MBIMLogNotify(@"Started Kordophone HTTP server on port %u", self.port);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -170,31 +233,31 @@ static NSString *const MBIMBridgeToken = @"net.buzzert.kordophone";
|
||||
|
||||
- (void)daemonControllerWillConnect
|
||||
{
|
||||
NSLog(@"Connecting to imagent...");
|
||||
MBIMLogInfo(@"Connecting to imagent...");
|
||||
}
|
||||
|
||||
- (void)daemonControllerDidConnect
|
||||
{
|
||||
NSLog(@"imagent responded.");
|
||||
MBIMLogInfo(@"imagent responded.");
|
||||
|
||||
IMAccount *iMessageAccount = [[IMAccountController sharedInstance] bestAccountForService:[IMServiceImpl iMessageService]];
|
||||
if (iMessageAccount) {
|
||||
NSLog(@"Successfully got accounts from imagent");
|
||||
NSLog(@"iMessage account connected: %@", iMessageAccount);
|
||||
MBIMLogInfo(@"Successfully got accounts from imagent");
|
||||
MBIMLogInfo(@"iMessage account connected: %@", iMessageAccount);
|
||||
} else {
|
||||
NSLog(@"imagent returned no accounts (not entitled?)");
|
||||
MBIMLogFatal(@"ERROR: imagent returned no accounts (not entitled? speak with Agent Hook)");
|
||||
[self _terminate];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)daemonControllerDidDisconnect
|
||||
{
|
||||
NSLog(@"Disconnected from imagent");
|
||||
MBIMLogInfo(@"Disconnected from imagent");
|
||||
}
|
||||
|
||||
- (void)daemonConnectionLost
|
||||
{
|
||||
NSLog(@"Connection lost to imagent");
|
||||
MBIMLogError(@"Connection lost to imagent");
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
Reference in New Issue
Block a user