SendMessage: allows creation of new conversations in addition to replying to guids

Dumped Classes/IMCore_ClassDump.h

@@ -4081,6 +4081,38 @@ __attribute__((visibility("default"))) @interface IMService : NSObject { }
 
 @end
 
+// Monterey
+#if 0
+@interface IMChatRegistry ()
+- (IMChat *)chatWithHandle:(IMHandle *)handle;
+- (IMChat *)chatWithHandle:(IMHandle *)handle lastAddressedHandle:(NSString *)lastAddressedHandle lastAddressedSIMID:(NSString *)lastAddressedSIMID;
+- (IMChat *)chatWithHandles:(NSArray<IMHandle *> *)handles;
+- (IMChat *)chatWithHandles:(NSArray<IMHandle *> *)handles lastAddressedHandle:(NSString *)lastAddressedHandle lastAddressedSIMID:(NSString *)lastAddressedSIMID;
+- (IMChat *)chatWithHandles:(NSArray<IMHandle *> *)handles displayName:(NSString *)displayName joinedChatsOnly:(BOOL)joinedChatsOnly;
+- (IMChat *)chatWithHandles:(NSArray<IMHandle *> *)handles displayName:(NSString *)displayName joinedChatsOnly:(BOOL)joinedChatsOnly lastAddressedHandle:(NSString *)lastAddressedHandle lastAddressedSIMID:(NSString *)lastAddressedSIMID;
+- (NSArray<NSString *> *)allGUIDsForChat:(IMChat *)chat;
+
+- (IMChat *)existingChatWithHandle:(IMHandle *)handle;
+- (IMChat *)existingChatWithHandle:(IMHandle *)handle allowAlternativeService:(BOOL)allowAlternativeService;
+- (IMChat *)existingChatWithHandles:(NSArray<IMHandle *> *)handles;
+- (IMChat *)existingChatWithHandles:(NSArray<IMHandle *> *)handles allowAlternativeService:(BOOL)allowAlternativeService;
+
+- (IMChat *)existingChatWithHandles:(NSArray<IMHandle *> *)handles allowAlternativeService:(BOOL)allowAlternativeService groupID:(NSString *)groupID;
+
+- (IMChat *)existingChatWithHandles:(NSArray *)handles allowAlternativeService:(BOOL)allowAlternativeService groupID:(NSString *)groupID displayName:(NSString *)displayName joinedChatsOnly:(BOOL)joinedChatsOnly;
+
+- (IMChat *)existingChatWithPinningIdentifier:(NSString *)pinningIdentifier;
+- (IMChat *)existingChatWithDeviceIndependentID:(NSString *)deviceIndependentID;
+
+- (IMChat *)existingChatWithPersonID:(NSString *)personID;
+- (IMChat *)existingChatWithDisplayName:(NSString *)displayName;
+- (IMChat *)existingChatWithAddresses:(NSArray<NSString *> *)addresses allowAlternativeService:(BOOL)allowAlternativeService bestHandles:(NSArray<IMHandle *> **)outBestHandles;
+- (IMChat *)existingChatWithContacts:(NSSet *)contacts bestHandles:(NSArray<IMHandle *> **)outBestHandles;
+
+@end
+#endif
+
+
 @interface IMSimulatedChat : IMChat // <IMSimulatedChatDelegate, IMSimulatedDaemonListener>
 {
 //    id <IMSimulatedChatDelegate> _delegate;

Dumped Classes/IMFoundation_ClassDump.h

@@ -1898,3 +1898,29 @@ typedef void (^CDUnknownBlockType)(void); // return type and parameters are unkn
 - (void)differencesFromArray:(id)arg1 removedIndexes:(id *)arg2 insertedIndexes:(id *)arg3;
 @end
 
+extern BOOL IMStringIsEmail (NSString *string);
+
+extern NSString* IMStripFormattingFromAddress (NSString *address);
+
+typedef void(^IMChatCalculateServiceForSendingCompletionBlock) (BOOL          allAddressesiMessageCapable,
+                                                                NSDictionary *availabilityPerRecipient,
+                                                                BOOL          checkedServer,
+                                                                NSError      *error);
+
+extern void IMChatCalculateServiceForSendingNewComposeMaybeForce (NSArray   *addresses,
+                                                                  NSString  *senderLastAddressedHandle,
+                                                                  NSString  *senderLastAddressedSIMID,
+                                                                  BOOL       forceMMS,
+                                                                  BOOL       hasEmailRecipients,
+                                                                  BOOL       lastSentMessageWasNotDelivered,
+                                                                  BOOL       conversationWasDowngraded,
+                                                                  BOOL       hasConversationHistory,
+                                                                  IMService *previousService,
+                                                                  IMChatCalculateServiceForSendingCompletionBlock completion);
+
+
+// IDS
+
+extern NSString *IDSCopyIDForPhoneNumber(NSString *phoneNumber);
+extern NSString *IDSCopyIDForEmailAddress(NSString *emailAddress);
+

Dumped Classes/IMSharedUtilities_ClassDump.h

@@ -745,19 +745,6 @@ struct __va_list_tag {
 
 @end
 
-@interface IMImageUtilities : NSObject
-{
-}
-
-+ (struct CGImage *)newThumbnailForTargetSize:(struct CGSize)arg1 imageSize:(struct CGSize)arg2 imageSource:(struct CGImageSource *)arg3 atIndex:(unsigned long long)arg4 mode:(long long)arg5 scale:(double)arg6;
-+ (struct CGImage *)newThumbnailForTargetSize:(struct CGSize)arg1 imageSize:(struct CGSize)arg2 imageSource:(struct CGImageSource *)arg3 mode:(long long)arg4 scale:(double)arg5;
-+ (BOOL)persistCPBitmapWithImage:(struct CGImage *)arg1 url:(id)arg2;
-+ (void)sampleImageEdges:(char *)arg1 usingRect:(struct CGRect)arg2 forMostlyWhitePixels:(unsigned long long *)arg3 otherPixels:(unsigned long long *)arg4 bytesPerRow:(long long)arg5;
-+ (struct CGSize)imageRefPxSize:(struct CGImage *)arg1;
-+ (struct CGSize)imageSourcePxSize:(struct CGImageSource *)arg1;
-
-@end
-
 @interface IMOneTimeCodeUtilities : NSObject
 {
 }
@@ -1426,17 +1413,6 @@ struct __va_list_tag {
 
 @end
 
-@interface IMImagePreviewGenerator : IMPreviewGenerator <IMPreviewGeneratorProtocol, IMUTITypeInformation>
-{
-}
-
-+ (struct CGImage *)newThumbnailFillToSize:(struct CGSize)arg1 imagePxSize:(struct CGSize)arg2 imageSource:(struct CGImageSource *)arg3 scale:(double)arg4;
-+ (struct CGImage *)newPreviewFromSourceURL:(id)arg1 withPreviewConstraints:(struct IMPreviewConstraints)arg2 error:(id *)arg3;
-+ (id)UTITypes;
-+ (id)fetchUTITypes;
-
-@end
-
 
 @interface IMAKAppleIDAuthenticationController : NSObject
 {

MessagesBridge.xcodeproj/project.pbxproj

@@ -81,6 +81,8 @@
 		CD602062219B68950024D9C5 /* MBIMSendMessageOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = CD602061219B68950024D9C5 /* MBIMSendMessageOperation.m */; };
 		CD83E156219BE10A00F4CCEA /* hooking.m in Sources */ = {isa = PBXBuildFile; fileRef = CD83E155219BE10A00F4CCEA /* hooking.m */; };
 		CD83E166219BE91600F4CCEA /* agentHook.m in Sources */ = {isa = PBXBuildFile; fileRef = CD83E165219BE91600F4CCEA /* agentHook.m */; };
+		CDD8C98426977D2A00551AE5 /* MBIMAliasValidationOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = CDD8C98326977D2A00551AE5 /* MBIMAliasValidationOperation.m */; };
+		CDD8C9862697996800551AE5 /* IDS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CDD8C9852697996700551AE5 /* IDS.framework */; };
 		CDE4556421A3578A0041F5DD /* IMChat+Encoded.m in Sources */ = {isa = PBXBuildFile; fileRef = CDE4556321A3578A0041F5DD /* IMChat+Encoded.m */; };
 		CDE455A121A365AD0041F5DD /* MBIMMarkOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = CDE455A021A365AD0041F5DD /* MBIMMarkOperation.m */; };
 		CDE455A421A5308D0041F5DD /* MBIMFetchAttachmentOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = CDE455A321A5308D0041F5DD /* MBIMFetchAttachmentOperation.m */; };
@@ -236,6 +238,9 @@
 		CD83E161219BE91500F4CCEA /* libagentHook.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libagentHook.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
 		CD83E165219BE91600F4CCEA /* agentHook.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = agentHook.m; sourceTree = "<group>"; };
 		CD83E1B5219BF78E00F4CCEA /* hookAgent.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = hookAgent.sh; sourceTree = "<group>"; };
+		CDD8C98226977D2A00551AE5 /* MBIMAliasValidationOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MBIMAliasValidationOperation.h; sourceTree = "<group>"; };
+		CDD8C98326977D2A00551AE5 /* MBIMAliasValidationOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MBIMAliasValidationOperation.m; sourceTree = "<group>"; };
+		CDD8C9852697996700551AE5 /* IDS.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IDS.framework; path = System/Library/PrivateFrameworks/IDS.framework; sourceTree = SDKROOT; };
 		CDE4556221A3578A0041F5DD /* IMChat+Encoded.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "IMChat+Encoded.h"; sourceTree = "<group>"; };
 		CDE4556321A3578A0041F5DD /* IMChat+Encoded.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "IMChat+Encoded.m"; sourceTree = "<group>"; };
 		CDE4559F21A365AD0041F5DD /* MBIMMarkOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MBIMMarkOperation.h; sourceTree = "<group>"; };
@@ -274,6 +279,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				CDD8C9862697996800551AE5 /* IDS.framework in Frameworks */,
 				1A257CCB23A8681200A4A2C8 /* Security.framework in Frameworks */,
 				1ACFCFDF219EB31400E2C237 /* CocoaHTTPServer.framework in Frameworks */,
 				1A257CC923A867EF00A4A2C8 /* IMCore.framework in Frameworks */,
@@ -321,6 +327,7 @@
 		1A0C445E219A45B400F2AC00 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				CDD8C9852697996700551AE5 /* IDS.framework */,
 				1A257CCA23A8681200A4A2C8 /* Security.framework */,
 				1A257CC823A867EF00A4A2C8 /* IMCore.framework */,
 			);
@@ -522,6 +529,10 @@
 				1AA43E90219EBB3400EDF1A7 /* Utilities */,
 				CD602054219B5DFD0024D9C5 /* MBIMBridgeOperation.h */,
 				CD602055219B5DFD0024D9C5 /* MBIMBridgeOperation.m */,
+				CDD8C98226977D2A00551AE5 /* MBIMAliasValidationOperation.h */,
+				CDD8C98326977D2A00551AE5 /* MBIMAliasValidationOperation.m */,
+				CD2ECEC0269539100055E302 /* MBIMAuthenticateOperation.h */,
+				CD2ECEC1269539100055E302 /* MBIMAuthenticateOperation.m */,
 				CD60205A219B623F0024D9C5 /* MBIMMessagesListOperation.h */,
 				CD60205B219B623F0024D9C5 /* MBIMMessagesListOperation.m */,
 				CD60205D219B674B0024D9C5 /* MBIMConversationListOperation.h */,
@@ -536,8 +547,6 @@
 				CD14F1A0219FE7D600E7DD22 /* MBIMUpdatePollOperation.m */,
 				1AD8936C21EFD986009B599A /* MBIMUploadAttachmentOperation.h */,
 				1AD8936D21EFD986009B599A /* MBIMUploadAttachmentOperation.m */,
-				CD2ECEC0269539100055E302 /* MBIMAuthenticateOperation.h */,
-				CD2ECEC1269539100055E302 /* MBIMAuthenticateOperation.m */,
 			);
 			path = Operations;
 			sourceTree = "<group>";
@@ -840,6 +849,7 @@
 				CDF6233A219A8A5600690038 /* MBIMBridge.m in Sources */,
 				CDF62335219A895D00690038 /* main.m in Sources */,
 				CD60205C219B623F0024D9C5 /* MBIMMessagesListOperation.m in Sources */,
+				CDD8C98426977D2A00551AE5 /* MBIMAliasValidationOperation.m in Sources */,
 				CD14F1AA219FF3B800E7DD22 /* MBIMUpdateQueue.m in Sources */,
 				CD14F1A4219FF22700E7DD22 /* IMMessageItem+Encoded.m in Sources */,
 				CD602062219B68950024D9C5 /* MBIMSendMessageOperation.m in Sources */,

kordophone/Bridge/Operations/MBIMAliasValidationOperation.h

@@ -0,0 +1,17 @@
+//
+//  MBIMAliasValidationOperation.h
+//  MBIMAliasValidationOperation
+//
+//  Created by James Magahern on 7/8/21.
+//  Copyright © 2021 James Magahern. All rights reserved.
+//
+
+#import "MBIMBridgeOperation.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MBIMAliasValidationOperation : MBIMBridgeOperation
+
+@end
+
+NS_ASSUME_NONNULL_END

kordophone/Bridge/Operations/MBIMAliasValidationOperation.m

@@ -0,0 +1,69 @@
+//
+//  MBIMAliasValidationOperation.m
+//  MBIMAliasValidationOperation
+//
+//  Created by James Magahern on 7/8/21.
+//  Copyright © 2021 James Magahern. All rights reserved.
+//
+
+#import "MBIMAliasValidationOperation.h"
+
+#import "IMCore_ClassDump.h"
+#import "IMFoundation_ClassDump.h"
+
+@implementation MBIMAliasValidationOperation
+
++ (void)load { [super load]; }
+
++ (NSString *)endpointName
+{
+    return @"validate";
+}
+
+- (void)main
+{
+    NSString *address = [self valueForQueryItemWithName:@"address"];
+    if ([address length] == 0) {
+        self.serverCompletionBlock([[HTTPErrorResponse alloc] initWithErrorCode:401]);
+        return;
+    }
+    
+    NSString *unformattedAddress = IMStripFormattingFromAddress(address);
+    BOOL isEmailAddress = IMStringIsEmail(unformattedAddress);
+    
+    NSString *IDSaddress = isEmailAddress ? IDSCopyIDForEmailAddress(unformattedAddress)
+                                          : IDSCopyIDForPhoneNumber(unformattedAddress);
+    
+    if (!IDSaddress) {
+        MBIMLogError(@"Could not get IDS address for: %@", unformattedAddress);
+        self.serverCompletionBlock([[HTTPErrorResponse alloc] initWithErrorCode:401]);
+        return;
+    }
+    
+    __block IMChat *existingChat = nil;
+    dispatch_sync([[self class] sharedIMAccessQueue], ^{
+        IMAccount *iMessageAccount = [[IMAccountController sharedInstance] bestAccountForService:[IMServiceImpl iMessageService]];
+        IMHandle *handle = [iMessageAccount imHandleWithID:unformattedAddress];
+        
+        if (handle) {
+            existingChat = [[IMChatRegistry sharedInstance] existingChatForIMHandle:handle];
+        }
+    });
+    
+    IMChatCalculateServiceForSendingNewComposeMaybeForce(
+        @[ IDSaddress ], nil, nil, NO, isEmailAddress, YES, NO, NO, nil,
+    ^(BOOL allAddressesiMessageCapable, NSDictionary *availabilityPerRecipient, BOOL checkedServer, NSError *error) {
+        NSMutableDictionary *response = [NSMutableDictionary dictionaryWithDictionary:@{
+            @"capable"        : @(allAddressesiMessageCapable),
+            @"idsAddress"    : IDSaddress,
+        }];
+        
+        if ([existingChat guid]) {
+            [response setObject:[existingChat guid] forKey:@"existingGuid"];
+        }
+        
+        self.serverCompletionBlock([MBIMJSONDataResponse responseWithJSONObject:response]);
+    });
+}
+
+@end

kordophone/Bridge/Operations/MBIMSendMessageOperation.m

@@ -19,40 +19,95 @@
     return @"sendMessage";
 }
 
+- (BOOL)_sendMessage:(NSString *)messageBody toHandles:(NSArray<NSString *> *)handleIDs attachmentGUIDs:(NSArray<NSString *> *)guids
+{
+    __block BOOL result = YES;
+    dispatch_sync([[self class] sharedIMAccessQueue], ^{
+        IMAccount *iMessageAccount = [[IMAccountController sharedInstance] bestAccountForService:[IMServiceImpl iMessageService]];
+        
+        NSMutableArray<IMHandle *> *handles = [NSMutableArray array];
+        for (NSString *handleID in handleIDs) {
+            IMHandle *handle = [iMessageAccount imHandleWithID:handleID];
+            if (handle) {
+                [handles addObject:handle];
+            } else {
+                MBIMLogError(@"MBIMSendMessageOperation: Invalid handle ID: %@", handleID);
+            }
+        }
+        
+        IMChat *chat = nil;
+        if (handles.count == 1) {
+            // Single recipient
+            IMHandle *handle = [handles firstObject];
+            chat = [[IMChatRegistry sharedInstance] existingChatForIMHandle:handle];
+            if (chat == nil) {
+                MBIMLogInfo(@"MBIMSendMessageOperation: Creating chat with handle: %@", handle);
+                chat = [[IMChatRegistry sharedInstance] chatForIMHandle:handle];
+            }
+        } else if (handles.count > 1) {
+            // Group chat
+            chat = [[IMChatRegistry sharedInstance] existingChatForIMHandles:handles allowRetargeting:NO groupID:nil displayName:nil joinedChatsOnly:YES];
+            if (chat == nil) {
+                MBIMLogInfo(@"MBIMSendMessageOperation: Creating group chat with handles: %@", handles);
+                chat = [[IMChatRegistry sharedInstance] chatForIMHandles:handles];
+            }
+        } else {
+            // No handles?
+            result = NO;
+        }
+        
+        if (chat) {
+            result = [self _sendMessage:messageBody toChat:chat attachmentGUIDs:guids];
+        } else {
+            result = NO;
+        }
+    });
+    
+    return result;
+}
+
 - (BOOL)_sendMessage:(NSString *)messageBody toChatWithGUID:(NSString *)chatGUID attachmentGUIDs:(NSArray<NSString *> *)guids
 {
     __block BOOL result = YES;
-    
     dispatch_sync([[self class] sharedIMAccessQueue], ^{
         IMChat *chat = [[IMChatRegistry sharedInstance] existingChatWithGUID:chatGUID];
-        
-        // TODO: chat might not be an iMessage chat!
-        IMAccount *iMessageAccount = [[IMAccountController sharedInstance] bestAccountForService:[IMServiceImpl iMessageService]];
-        IMHandle *senderHandle = [iMessageAccount loginIMHandle];
-        
-        NSAttributedString *replyAttrString = [[NSAttributedString alloc] initWithString:messageBody];
-        NSAttributedString *attrStringWithFileTransfers = IMCreateSuperFormatStringWithAppendedFileTransfers(replyAttrString, guids);
-        
-        IMMessage *reply = [IMMessage fromMeIMHandle:senderHandle
-                                            withText:attrStringWithFileTransfers
-                                   fileTransferGUIDs:guids
-                                               flags:(kIMMessageFinished | kIMMessageIsFromMe)];
-        
-        for (NSString *guid in [reply fileTransferGUIDs]) {
-            [[IMFileTransferCenter sharedInstance] assignTransfer:guid toHandle:chat.recipient];
-        }
-        
         if (!chat) {
             MBIMLogInfo(@"Chat does not exist: %@", chatGUID);
             result = NO;
         } else {
-            [chat sendMessage:reply];
+            result = [self _sendMessage:messageBody toChat:chat attachmentGUIDs:guids];
         }
     });
     
     return result;
 }
 
+- (BOOL)_sendMessage:(NSString *)messageBody toChat:(IMChat *)chat attachmentGUIDs:(NSArray<NSString *> *)guids
+{
+    dispatch_assert_queue([[self class] sharedIMAccessQueue]);
+    
+    BOOL result = YES;
+    
+    // TODO: chat might not be an iMessage chat!
+    IMAccount *iMessageAccount = [[IMAccountController sharedInstance] bestAccountForService:[IMServiceImpl iMessageService]];
+    IMHandle *senderHandle = [iMessageAccount loginIMHandle];
+    
+    NSAttributedString *replyAttrString = [[NSAttributedString alloc] initWithString:messageBody];
+    NSAttributedString *attrStringWithFileTransfers = IMCreateSuperFormatStringWithAppendedFileTransfers(replyAttrString, guids);
+    
+    IMMessage *reply = [IMMessage fromMeIMHandle:senderHandle
+                                        withText:attrStringWithFileTransfers
+                               fileTransferGUIDs:guids
+                                           flags:(kIMMessageFinished | kIMMessageIsFromMe)];
+    
+    for (NSString *guid in [reply fileTransferGUIDs]) {
+        [[IMFileTransferCenter sharedInstance] assignTransfer:guid toHandle:chat.recipient];
+    }
+    
+    [chat sendMessage:reply];
+    return result;
+}
+
 - (void)main
 {
     NSObject<HTTPResponse> *response = [[HTTPErrorResponse alloc] initWithErrorCode:500];
@@ -64,9 +119,8 @@
         return;
     }
     
-    NSString *guid = [args objectForKey:@"guid"];
     NSString *messageBody = [args objectForKey:@"body"];
-    if (!guid || !messageBody) {
+    if (!messageBody) {
         self.serverCompletionBlock(response);
         return;
     }
@@ -76,7 +130,15 @@
         transferGUIDs = @[];
     }
     
-    BOOL result = [self _sendMessage:messageBody toChatWithGUID:guid attachmentGUIDs:transferGUIDs];
+    BOOL result = NO;
+    NSString *guid = [args objectForKey:@"guid"];
+    NSArray<NSString *> *handles = [args objectForKey:@"handles"];
+    if (guid) {
+        result = [self _sendMessage:messageBody toChatWithGUID:guid attachmentGUIDs:transferGUIDs];
+    } else if ([handles count] > 0) {
+        result = [self _sendMessage:messageBody toHandles:handles attachmentGUIDs:transferGUIDs];
+    }
+    
     if (result) {
         response = [[HTTPErrorResponse alloc] initWithErrorCode:200];
     }

kordophone/main.m

@@ -10,7 +10,7 @@
 
 #import "MBIMBridge.h"
 
-void printUsage()
+static void printUsage(void)
 {
     fprintf(stderr, "Usage: kordophoned [-h] [-s | -c (certificate.p12)] [-a (access control file)\n");
     fprintf(stderr, "\t-h \t Show this help message\n");