Show stiktool capabilities before first run. Fix instproxy get apps issue.

Author: hugeBlack

StikJIT/MiniToolSupport/JSSupport/IDeviceJSBridge.m

@@ -12,21 +12,34 @@ @implementation IDeviceHandle
 @end
 
 
-NSDictionary *dictionaryFromPlistData(NSData *plistData, NSError **error) {
-    if (!plistData) {
+NSDictionary *dictionaryFromPlist(plist_t plist, NSError **error) {
+    if (!plist) {
         if (error) {
             *error = [NSError errorWithDomain:@"PlistConversionErrorDomain"
                                          code:1001
-                                     userInfo:@{NSLocalizedDescriptionKey: @"Input plist data is nil."}];
+                                     userInfo:@{NSLocalizedDescriptionKey: @"Input plist is nil."}];
         }
         return nil;
     }
+    char* buf = 0;
+    uint32_t plistlen = 0;
+    // try bin plist first, if failed, we try xml plist
+    plist_to_bin(plist, &buf, &plistlen);
 
     NSPropertyListFormat format;
-    NSDictionary *result = [NSPropertyListSerialization propertyListWithData:plistData
-                                                                      options:NSPropertyListImmutable
-                                                                       format:&format
-                                                                        error:error];
+    NSDictionary *result = [NSPropertyListSerialization propertyListWithData:[NSData dataWithBytes:buf length:plistlen]
+                                                                      options:NSPropertyListImmutable format:&format error:error];
+    plist_mem_free(buf);
+    if (![result isKindOfClass:[NSDictionary class]]) {
+        plist_to_xml(plist, &buf, &plistlen);
+        if (error) {
+            *error = nil;
+        }
+        result = [NSPropertyListSerialization propertyListWithData:[NSData dataWithBytes:buf length:plistlen]
+                                                                          options:NSPropertyListImmutable format:&format error:error];
+        plist_free(buf);
+    }
+    
     if (![result isKindOfClass:[NSDictionary class]]) {
         if (error && !*error) {
             *error = [NSError errorWithDomain:@"PlistConversionErrorDomain"
@@ -78,11 +91,12 @@ @implementation IDeviceJSBridge {
     int maxDataId;
 }
 
-- (instancetype)initWithContext:(JSContext*)context {
+- (instancetype)initWithContext:(JSContext*)context allowedFunctions:(NSArray<NSString*>*)allowedFunctions {
     maxHandleId = 0;
     maxDataId = 0;
     handles = [[NSMutableDictionary alloc] init];
     dataPool = [[NSMutableDictionary alloc] init];
+    self->allowedFunctions = allowedFunctions;
     self->context = context;
     return self;
 }
@@ -150,6 +164,11 @@ - (void)didReceiveScriptMessage:(nonnull NSDictionary *)message resolve:(JSValue
         return;
     }
 
+    if(![self->allowedFunctions containsObject:message[@"command"]]) {
+        [rejectFunc callWithArguments:@[[NSString stringWithFormat:@"calling %@ is not allowed! Declare it in toolInfo.json", message[@"command"]]]];
+        return;
+    }
+    
     NSString* handlerSelectorStr = [NSString stringWithFormat:@"%@WithBody:replyHandler:", message[@"command"]];
     if(![self respondsToSelector:NSSelectorFromString(handlerSelectorStr)]) {
         [rejectFunc callWithArguments:@[@"Invalid idevice function!"]];

StikJIT/MiniToolSupport/JSSupport/IDeviceJSBridgeInstallationProxy.m

@@ -69,23 +69,24 @@ - (void)installation_proxy_get_appsWithBody:(NSDictionary *)body replyHandler:(n
     }
 
     plist_t *app_list = (plist_t *)apps;
-    NSMutableArray* ans = [[NSMutableArray alloc] init];
-    for(int i = 0; i < apps_len; ++i) {
-        char* buf = 0;
-        uint32_t plistlen = 0;
-        plist_to_bin(app_list[i], &buf, &plistlen);
-        NSError* err2 = 0;
-        NSDictionary* appDict = dictionaryFromPlistData([NSData dataWithBytes:buf length:plistlen], &err2);
-        plist_mem_free(buf);
-        if(err2) {
-            replyHandler(nil, @"failed to parse plist data");
-            return;
+    do {
+        NSMutableArray* ans = [[NSMutableArray alloc] init];
+        for(int i = 0; i < apps_len; ++i) {
+            NSError* err2 = 0;
+            NSDictionary* appDict = dictionaryFromPlist(app_list[i], &err2);
+
+            if(err2) {
+                replyHandler(nil, @"failed to parse plist data");
+                break;
+            }
+            [ans addObject:appDict];
         }
-        [ans addObject:appDict];
+        replyHandler(ans, nil);
+    } while(0);
+
+    for(int i = 0; i < apps_len; ++i) {
+        plist_free(app_list[i]);
     }
-    replyHandler(ans, nil);
-    
-    
 }
 
 - (void)installation_proxy_installWithBody:(NSDictionary *)body replyHandler:(nonnull void (^)(id _Nullable, NSString * _Nullable))replyHandler {
@@ -266,33 +267,33 @@ - (void)installation_proxy_browseWithBody:(NSDictionary *)body replyHandler:(non
         plist_from_memory((void*)[optionsNSData bytes], (uint32_t)[optionsNSData length], &optionsPlist, 0);
     }
 
-    plist_t *apps = NULL;
+    plist_t *app_list = NULL;
     size_t apps_len = 0;
-    IdeviceFfiError* err = installation_proxy_browse(client, optionsPlist, &apps, &apps_len);
+    IdeviceFfiError* err = installation_proxy_browse(client, optionsPlist, &app_list, &apps_len);
 
     if (err) {
         replyHandler(nil, [self errFreeFromIdeviceFfiError:err]);
         return;
     }
 
-    NSMutableArray* ans = [[NSMutableArray alloc] init];
-    for(int i = 0; i < apps_len; ++i) {
-        char* buf = 0;
-        uint32_t plistlen = 0;
-        plist_to_bin(apps[i], &buf, &plistlen);
-        NSError* err2 = 0;
-        NSDictionary* appDict = dictionaryFromPlistData([NSData dataWithBytes:buf length:plistlen], &err2);
-        plist_mem_free(buf);
-        if(err2) {
-            replyHandler(nil, @"failed to parse plist data");
-            return;
-        }
-        [ans addObject:appDict];
-        if([ans count] >= 100) {
-            break;
+    do {
+        NSMutableArray* ans = [[NSMutableArray alloc] init];
+        for(int i = 0; i < apps_len; ++i) {
+            NSError* err2 = 0;
+            NSDictionary* appDict = dictionaryFromPlist(app_list[i], &err2);
+
+            if(err2) {
+                replyHandler(nil, @"failed to parse plist data");
+                break;
+            }
+            [ans addObject:appDict];
         }
+        replyHandler(ans, nil);
+    } while(0);
+
+    for(int i = 0; i < apps_len; ++i) {
+        plist_free(app_list[i]);
     }
-    replyHandler(ans, nil);
 
 
 }

StikJIT/MiniToolSupport/JSSupport/JSSupport.h

@@ -23,9 +23,10 @@
 @interface IDeviceJSBridge : NSObject {
     NSMutableDictionary<NSNumber*, IDeviceHandle*>* handles;
     NSMutableDictionary<NSNumber*, NSData*>* dataPool;
+    NSArray<NSString*>* allowedFunctions;
     JSContext* context;
 }
-- (instancetype)initWithContext:(JSContext*)context;
+- (instancetype)initWithContext:(JSContext*)context allowedFunctions:(NSArray<NSString*>*)allowedFunctions;
 - (void)didReceiveScriptMessage:(NSDictionary *)message resolve:(JSValue*)resolveFunc reject:(JSValue*)rejectFunc;
 - (void)cleanUp;
 - (NSString*)errFreeFromIdeviceFfiError:(IdeviceFfiError*)err;
@@ -36,6 +37,6 @@
 @end
 
 
-NSDictionary *dictionaryFromPlistData(NSData *plistData, NSError **error);
+NSDictionary *dictionaryFromPlist(plist_t plist, NSError **error);
 NSData *plistDataFromDictionary(NSDictionary *dictionary, NSError **error);
 const char** cstrArrFromNSArray(NSArray* arr, int* validCount);