Version mismatch http codes (#16)

* chore: Make releases & testing easier

* fix: Check HTTP status codes + version checking

* chore: bump release version

Author: clburlison

README.md

@@ -70,7 +70,7 @@ It is assumed you know your way around a command line. Commands are ran on your
    {
      "api_key": "YOUR_API_KEY",
      "device_configuration_manager_url": "https://YOUR_AWESOME_DCM_URL",
-     "dmon_url": "https://YOUR_URL:PORT/path/", // Url to download update files from
+     "dmon_url": "https://YOUR_URL:PORT/path/", // Url to download update files from. Leave empty if you don't want to use the update function.
      "dmon_username": "username", // Basic Auth username. Leave empty if not used
      "dmon_password": "password" // Basic Auth password. Leave empty if not used
    }

bin/package

@@ -6,5 +6,12 @@ cd ..
 # Ugly hack. This should really be excluded by dm.pl but ¯\_(ツ)_/¯
 /usr/bin/find . -name '.DS_Store' -type f -prune -exec rm -rf '{}' +
 DEB_VERSION=$(grep -i "^Version:" ./src/DEBIAN/control | cut -d' ' -f2 -)
-mkdir releases
+mkdir releases 2>/dev/null
 ./bin/dm.pl src/ releases/com.github.clburlison.dmon-"$DEB_VERSION".deb
+
+# I really hate shell scripts. Should use a real language for this...
+HASH1=$(shasum -a256 "releases/com.github.clburlison.dmon-"$DEB_VERSION".deb" | cut -d " " -f1)
+HASH2=$(md5 "releases/com.github.clburlison.dmon-"$DEB_VERSION".deb" | cut -d " " -f4)
+
+echo "SHA-256: \`$HASH1\`"
+echo "MD5: \`$HASH2\`"

src/DEBIAN/control

@@ -8,4 +8,4 @@ Name: dmon
 Package: com.github.clburlison.dmon
 Section: Tweaks
 Tag: purpose::extension, role::enduser
-Version: 0.0.7
+Version: 0.0.8

src/usr/bin/dmon

@@ -24,3 +24,8 @@ include $(THEOS_MAKE_PATH)/tool.mk
 all::
 	mkdir -p ../src/usr/bin
 	/bin/cp .theos/obj/dmon ../src/usr/bin
+
+upload:: all
+	ssh iphone "rm /usr/bin/dmon" || true
+	sleep 2
+	scp .theos/obj/dmon iphone:/usr/bin/dmon

tools/Makefile

@@ -17,49 +17,70 @@
 }
 
 NSString * installedPogoVersion(void) {
-    NSLog(@"dmon: Finding Pogo version...");
-    char bundlePath[150]; // This should never be longer than 100 but we added a buffer
+    char path[1035];
     FILE *pogo_cmd = popen("find /var/containers/Bundle/Application/ -type d -name 'PokmonGO.app'", "r");
+    NSString *bundlePath = nil;
     if (pogo_cmd == NULL) {
         NSLog(@"dmon: Unable to find PokemonGo on device");
         return nil;
     }
 
-    fgets(bundlePath, sizeof(bundlePath), pogo_cmd);
+    // Read the output from the command
+    if (fgets(path, sizeof(path)-1, pogo_cmd) != NULL) {
+        bundlePath = [NSString stringWithUTF8String:path];
+        bundlePath = [bundlePath stringByTrimmingCharactersInSet:[NSCharacterSet newlineCharacterSet]];
+        bundlePath = [bundlePath stringByAppendingPathComponent: @"Info.plist"];
+    }
+
+    // Close the file
     pclose(pogo_cmd);
-    bundlePath[strcspn(bundlePath, "\n")] = '\0'; // Remove newline character
-    sprintf(bundlePath, "%s/Info.plist", bundlePath);
-
-    NSString *path = [[NSString alloc] initWithUTF8String:bundlePath];
-    NSDictionary *infoDict = [[NSDictionary alloc] initWithContentsOfFile:path];
-    NSString *versionString = [infoDict objectForKey:@"CFBundleShortVersionString"];
-    NSLog(@"dmon: Installed version of Pokemon Go: %@", versionString);
-    return versionString;
+
+    NSFileHandle *fileHandle = [NSFileHandle fileHandleForReadingAtPath:bundlePath];
+
+    if (fileHandle) {
+        // Read the contents of the file
+        NSData *fileData = [fileHandle readDataToEndOfFile];
+        // Close the file handle
+        [fileHandle closeFile];
+        // Convert the file data to a dictionary
+        NSDictionary *infoDict = [NSPropertyListSerialization propertyListWithData:fileData options:NSPropertyListImmutable format:NULL error:NULL];
+        if (infoDict) {
+            NSString *versionString = [infoDict objectForKey:@"CFBundleShortVersionString"];
+            NSLog(@"dmon: Version of Pokemon Go: %@", versionString);
+            return versionString;
+        }
+    }
+    else {
+        NSLog(@"dmon: Failed to open file for reading: %@", bundlePath);
+    }
+
+    return nil;
 }
 
-NSString * installedGCVersion(void) {
-    // Can't use this really clean method since this library isn't versioned. Big Sad!
-    // NSBundle *goCheatsBundle = [NSBundle bundleWithPath:@"/Library/MobileSubstrate/DynamicLibraries/libgocheats.dylib"];
-    // NSLog(@"dmon: bundle info is: %@", goCheatsBundle);
-    // NSString *goCheatsVersion = [goCheatsBundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"];
-    // NSLog(@"dmon: Version: %@", goCheatsVersion);
-    // return goCheatsVersion;
-
-    NSLog(@"dmon: Finding GC version...");
-    FILE *gc_cmd = popen("apt list 2>/dev/null | grep -i gocheats | cut -d ' ' -f 2", "r");
-    if (gc_cmd == NULL) {
-        NSLog(@"dmon: Unable to find GC version");
+NSString *getAptList(NSString *packageName) {
+    FILE *fp;
+    char path[1035];
+    NSString *command = [NSString stringWithFormat:@"dpkg-query --showformat='${Version}' --show %@ 2>/dev/null", packageName];
+    NSString *version = nil;
+
+    // Open the command for reading
+    fp = popen([command UTF8String], "r");
+    if (fp == NULL) {
+        NSLog(@"dmon: Failed to run command.");
         return nil;
     }
 
-    char version[256];
-    int bytesRead = fread(version, sizeof(char), 255, gc_cmd);
-    version[bytesRead] = '\0';
-    pclose(gc_cmd);
-    version[strcspn(version, "\n")] = '\0'; // Remove newline character
+    // Read the output from the command
+    if (fgets(path, sizeof(path)-1, fp) != NULL) {
+        version = [NSString stringWithUTF8String:path];
+        version = [version stringByTrimmingCharactersInSet:[NSCharacterSet newlineCharacterSet]];
+    }
+
+    // Close the file
+    pclose(fp);
 
-    NSLog(@"dmon: Installed version of GC: %s", version);
-    return [[NSString alloc] initWithUTF8String:version];
+    NSLog(@"dmon: Version of %@: %@", packageName, version);
+    return version;
 }
 
 NSDictionary * parseConfig(void) {
@@ -128,6 +149,7 @@ int installIpa(NSString *filePath) {
     FILE *install_ipa_cmd = popen(command, "r");
     fscanf(install_ipa_cmd, "%d", &results);
     pclose(install_ipa_cmd);
+    NSLog(@"dmon: Results for %@ are: %d", filePath, results);
     return results;
 }
 
@@ -148,8 +170,8 @@ int installDeb(NSString *filePath) {
 
 int downloadFile(NSString *url, NSString *userpass, NSString *outfile) {
     CURL *curl;
-    CURLcode res = -1;
     FILE *fp;
+    long httpCode = -1;
     curl = curl_easy_init();
 
     if (curl) {
@@ -168,58 +190,75 @@ int downloadFile(NSString *url, NSString *userpass, NSString *outfile) {
         curl_easy_setopt(curl, CURLOPT_CAINFO, "/usr/lib/ssl/cacert.pem");
 
         // Perform the request
-        res = curl_easy_perform(curl);
-        NSLog(@"dmon: Curl return code for %@: %u", url, res);
+        CURLcode res = curl_easy_perform(curl);
+
+        // Get the http status code
+        curl_easy_getinfo (curl, CURLINFO_RESPONSE_CODE, &httpCode);
 
         // Clean up
         fclose(fp);
         curl_easy_cleanup(curl);
+
+        // Check for successful download
+        if (res == CURLE_OK && httpCode >= 200 && httpCode < 300) {
+            NSLog(@"dmon: Download was sucessful: %ld", httpCode);
+            return 0;
+        } else {
+            NSLog(@"dmon: Download failed with error code: %ld", httpCode);
+            // Delete the outfile if it exists
+            if (remove([outfile UTF8String]) != 0) {
+                NSLog(@"Failed to delete the file %@", outfile);
+            }
+        }
     }
-    return res;
+    return -1;
 }
 
 void update(NSDictionary *config) {
     NSString *versionFile = @"version.txt";
     NSString *pogo_ipa = @"pogo.ipa";
     NSString *gc_deb = @"gc.deb";
     NSString *pogoVersion = installedPogoVersion();
-    NSString *gcVersion = installedGCVersion();
+    NSString *gcVersion = getAptList(@"com.gocheats.jb");
+    // getAptList(@"com.github.clburlison.dmon");
 
     // Strip trailing forward slashes to make things consistent for users
     NSString *url = [config[@"dmon_url"] stringByTrimmingCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@"/"]];
     NSLog(@"dmon: Update URL is: %@", url);
-    downloadFile(
+    int versionDownload = downloadFile(
         [NSString stringWithFormat:@"%@/%@", url, versionFile],
         [NSString stringWithFormat:@"%@:%@", config[@"dmon_username"], config[@"dmon_password"]],
         versionFile
     );
+    if (versionDownload != 0) {
+        NSLog(@"dmon: Unable to process updates as %@ is invalid", versionFile);
+        return;
+    }
 
     // Parse the config map style version.txt to NSDictionary
     NSMutableDictionary *parsedVersion = parseKeyValueFileAtPath(versionFile);
 
     // Update Pogo if needed
     if (![pogoVersion isEqualToString:parsedVersion[@"pogo"]]) {
-        NSLog(@"dmon: Pogo version mismatch. Have %@. Need %@", pogoVersion, parsedVersion[@"pogo"]);
+        NSLog(@"dmon: Pogo version mismatch. Have '%@'. Need '%@'", pogoVersion, parsedVersion[@"pogo"]);
         int pogoDownload = downloadFile(
             [NSString stringWithFormat:@"%@/%@", url, pogo_ipa],
             [NSString stringWithFormat:@"%@:%@", config[@"dmon_username"], config[@"dmon_password"]],
             pogo_ipa
         );
-        // TODO: Do we need a stricter validation?
         if (pogoDownload == 0) {
             installIpa(pogo_ipa);
         }
     }
 
     // Update GC if needed
     if (![gcVersion isEqualToString:parsedVersion[@"gc"]]) {
-        NSLog(@"dmon: GC version mismatch. Have %@. Need %@", gcVersion, parsedVersion[@"gc"]);
+        NSLog(@"dmon: GC version mismatch. Have '%@'. Need '%@'", gcVersion, parsedVersion[@"gc"]);
         int gcDownload = downloadFile(
             [NSString stringWithFormat:@"%@/%@", url, gc_deb],
             [NSString stringWithFormat:@"%@:%@", config[@"dmon_username"], config[@"dmon_password"]],
             gc_deb
         );
-        // TODO: Do we need a stricter validation?
         if (gcDownload == 0) {
             installDeb(gc_deb);
         }
@@ -233,9 +272,17 @@ void monitor(void) {
         killall(@"/usr/bin/kernbypass");
         NSLog(@"dmon: Force stopping Pogo...");
         killall(@"pokemongo");
-        sleep(2);
-        NSLog(@"dmon: Pogo not running. Launch it...");
+        sleep(5);
+
+        // Attempt to check versions and update now that Pogo & Kernbypass are not running
+        NSDictionary *config = parseConfig();
+        if (config[@"dmon_url"] != nil && [config[@"dmon_url"] isKindOfClass:[NSString class]] && ![config[@"dmon_url"] isEqualToString:@""]) {
+            // NSLog(@"dmon: Full config: %@", config);
+            update(config);
+        }
+
         // Launch Pogo
+        NSLog(@"dmon: Pogo not running. Launch it...");
         void* sbServices = dlopen("/System/Library/PrivateFrameworks/SpringBoardServices.framework/SpringBoardServices", RTLD_LAZY);
         int (*SBSLaunchApplicationWithIdentifier)(CFStringRef identifier, Boolean suspended) = dlsym(sbServices, "SBSLaunchApplicationWithIdentifier");
         NSString *bundleString=[NSString stringWithUTF8String:"com.nianticlabs.pokemongo"];
@@ -249,23 +296,8 @@ int main(void) {
     NSLog(@"dmon: Starting...");
 
     // Start loop
-    int i = 0;
     while (1) {
-        // Only call at the start of loop
-        if (i == 0) {
-            NSDictionary *config = parseConfig();
-            // NSLog(@"dmon: Full config: %@", config);
-            update(config);
-        }
-
-        // Call this function every loop
         monitor();
-
-        // Restart loop on the 30th iteration
-        if (++i == 30) {
-            i = 0;
-        }
-
         sleep(30);
     }
     return 0;