Linux support, explain how to get ECID and other information with tooltips, specify url for .ipsw so user doesn't have to download entire .ipsw for betas, actually fix iPad7,5 and iPad7,6, bump to v1.2

Author: airsquared

README.md

@@ -1,5 +1,5 @@
 # blobsaver
-A GUI for saving SHSH blobs using encounter's fork of tsschecker. Supports both Mac and Windows. Requires [Java](https://java.com/inc/BrowserRedirect1.jsp).
+A GUI for saving SHSH blobs using encounter's fork of tsschecker. Supports both Mac, Windows, and Linux. Requires [Java](https://java.com/inc/BrowserRedirect1.jsp).
 
 If you have an antivirus, select "Always Allow" for anything related to tsschecker or Java. An antivirus may cause blobsaver to crash. If that happens please send feedback.
 
@@ -10,16 +10,17 @@ If you have an antivirus, select "Always Allow" for anything related to tsscheck
 - Store up to ten devices with presets
 - Choose where to save blobs with file picker
 - Save blobs for beta versions
+- No need to download entire .ipsw for beta versions(just specify link)
+- Explains how to get ECID, Board Config(if needed), and information necessary for beta versions
 - Automatically checks for updates and prompts if available
 - Optionally specify device identifier instead of using device picker
 - Optionally specify apnonce
 
 ## Feedback
-Please send feedback via [Github Issue](https://github.com/airsquared/blobsaver/issues/new) or [Reddit PM](https://www.reddit.com//message/compose?to=01110101_00101111&subject=Blobsaver+Feedback) if you encounter any bugs/problems or have a feature request. 
+Please send feedback via [Github Issue](https://github.com/airsquared/blobsaver/issues/new/choose) or [Reddit PM](https://www.reddit.com//message/compose?to=01110101_00101111&subject=Blobsaver+Feedback) if you encounter any bugs/problems or have a feature request. 
 
 ## TODO:
 - Use macOS menu bar
-- Explain how to get everything
 - Package into .app/.exe [maybe this](https://github.com/Jorl17/jar2app)
 - Automatically save blobs for all signed versions
 - Daemon to do it automatically in the background

build.gradle

@@ -3,7 +3,7 @@ plugins {
     id 'java'
 }
 
-version '1.1.1'
+version '1.2'
 
 sourceCompatibility = 1.8
 

src/main/java/blobsaver/Controller.java

@@ -17,7 +17,6 @@
 import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
 import javafx.stage.DirectoryChooser;
-import javafx.stage.FileChooser;
 import javafx.stage.Modality;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -33,6 +32,8 @@
 import java.util.Arrays;
 import java.util.concurrent.CountDownLatch;
 import java.util.prefs.Preferences;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
 
 public class Controller {
 
@@ -46,7 +47,7 @@ public class Controller {
     @FXML private TextField versionField;
     @FXML private TextField identifierField;
     @FXML private TextField pathField;
-    @FXML private TextField buildManifestField;
+    @FXML private TextField ipswField;
     @FXML private TextField buildIDField;
 
     @FXML private CheckBox apnonceCheckBox;
@@ -72,7 +73,6 @@ public class Controller {
     @FXML private VBox presetVBox;
 
     @FXML private Button goButton;
-    @FXML private Button plistPickerButton;
 
     private boolean boardConfig = false;
     private boolean editingPresets = false;
@@ -85,6 +85,9 @@ public class Controller {
     private URI githubIssueURI;
     private URI redditPMURI;
 
+    private File buildManifestPlist;
+    private File tsschecker;
+
     static void setPresetButtonNames() {
         Preferences appPrefs = Preferences.userRoot().node("airsquared/blobsaver/prefs");
         for (int i = 1; i < 11; i++) {
@@ -154,7 +157,7 @@ public void initialize() {
                 return;
             }
             final String v = (String) newValue;
-            if (v.equals("iPhone 6s") || v.equals("iPhone 6s+") || v.equals("iPhone SE")) {
+            if (v.equals("iPhone 6s") || v.equals("iPhone 6s+") || v.equals("iPhone SE") || v.equals("iPad 6 (WiFi)(iPad 7,5)") || v.equals("iPad 6 (Cellular)(iPad7,6)")) {
                 int depth = 20;
                 DropShadow borderGlow = new DropShadow();
                 borderGlow.setOffsetY(0f);
@@ -174,7 +177,7 @@ public void initialize() {
         });
         identifierField.textProperty().addListener((observable, oldValue, newValue) -> {
             identifierField.setEffect(null);
-            if (newValue.equals("iPhone8,1") || newValue.equals("iPhone8,2") || newValue.equals("iPhone8,4")) {
+            if (newValue.equals("iPhone8,1") || newValue.equals("iPhone8,2") || newValue.equals("iPhone8,4") || newValue.equals("iPad7,5") || newValue.equals("iPad7,6")) {
                 final int depth = 20;
                 DropShadow borderGlow = new DropShadow();
                 borderGlow.setOffsetY(0f);
@@ -212,7 +215,7 @@ public void initialize() {
         presetButtons.forEach((Button btn) -> btn.setOnAction(this::presetButtonHandler));
 
         try {
-            githubIssueURI = new URI("https://github.com/airsquared/blobsaver/issues/new");
+            githubIssueURI = new URI("https://github.com/airsquared/blobsaver/issues/new/choose");
             redditPMURI = new URI("https://www.reddit.com//message/compose?to=01110101_00101111&subject=Blobsaver+Bug+Report");
         } catch (URISyntaxException ignored) {
         }
@@ -366,17 +369,19 @@ private void newUnreportableError(String msg) {
     }
 
     private void run(String device) {
-        File file;
         try {
             InputStream input;
             if (PlatformUtil.isWindows()) {
-                input = getClass().getResourceAsStream("tsschecker.exe");
-                file = File.createTempFile("tsschecker", ".tmp.exe");
+                input = getClass().getResourceAsStream("tsschecker_windows.exe");
+                tsschecker = File.createTempFile("tsschecker_windows", ".tmp.exe");
+            } else if (PlatformUtil.isMac()) {
+                input = getClass().getResourceAsStream("tsschecker_macos");
+                tsschecker = File.createTempFile("tsschecker_macos", ".tmp");
             } else {
-                input = getClass().getResourceAsStream("tsschecker");
-                file = File.createTempFile("tsschecker", ".tmp");
+                input = getClass().getResourceAsStream("tsschecker_linux");
+                tsschecker = File.createTempFile("tsschecker_linux", ".tmp");
             }
-            OutputStream out = new FileOutputStream(file);
+            OutputStream out = new FileOutputStream(tsschecker);
             int read;
             byte[] bytes = new byte[1024];
 
@@ -388,18 +393,19 @@ private void run(String device) {
             ex.printStackTrace();
             return;
         }
-        file.deleteOnExit();
+        tsschecker.deleteOnExit();
 
-        if (!file.setExecutable(true, false)) {
+        if (!tsschecker.setExecutable(true, false)) {
             newReportableError("There was an error setting tsschecker as executable.");
+            deleteTempFiles();
             return;
         }
 
         File locationToSaveBlobs = new File(pathField.getText());
         //noinspection ResultOfMethodCallIgnored
         locationToSaveBlobs.mkdirs();
         ArrayList<String> args;
-        args = new ArrayList<>(Arrays.asList(file.getPath(), "-d", device, "-s", "-e", ecidField.getText(), "--save-path", pathField.getText()));
+        args = new ArrayList<>(Arrays.asList(tsschecker.getPath(), "-d", device, "-s", "-e", ecidField.getText(), "--save-path", pathField.getText()));
         if (boardConfig) {
             args.add("--boardconfig");
             args.add(boardConfigField.getText());
@@ -411,26 +417,65 @@ private void run(String device) {
         if (versionCheckBox.isSelected()) {
             args.add("-l");
         } else if (betaCheckBox.isSelected()) {
+            try {
+                buildManifestPlist = File.createTempFile("BuildManifest", ".plist");
+                OutputStream out = new FileOutputStream(buildManifestPlist);
+                if (!ipswField.getText().matches("https?://.*apple.*\\.ipsw")) {
+                    newUnreportableError("\"" + ipswField.getText() + "\" is not a valid URL.\n\nMake sure it starts with \"http://\" or \"https://\", has \"apple\" in it, and ends with \".ipsw\"");
+                    deleteTempFiles();
+                    return;
+                }
+                ZipInputStream zin;
+                try {
+                    URL url = new URL(ipswField.getText());
+                    zin = new ZipInputStream(url.openStream());
+                } catch (IOException e) {
+                    newUnreportableError("\"" + ipswField.getText() + "\" is not a valid URL.\n\nMake sure it starts with \"http://\" or \"https://\", has \"apple\" in it, and ends with \".ipsw\"");
+                    deleteTempFiles();
+                    return;
+                }
+                ZipEntry ze;
+                while ((ze = zin.getNextEntry()) != null) {
+                    if (ze.getName().equals("BuildManifest.plist")) {
+                        byte[] buffer = new byte[500_000];
+                        int len;
+                        while ((len = zin.read(buffer)) != -1) {
+                            out.write(buffer, 0, len);
+                        }
+                        out.close();
+                        break;
+                    }
+                }
+                zin.close();
+                buildManifestPlist.deleteOnExit();
+            } catch (IOException e) {
+                newReportableError("Unable to get BuildManifest from .ipsw.", e.getMessage());
+                e.printStackTrace();
+                deleteTempFiles();
+                return;
+            }
             args.add("-i");
             args.add(versionField.getText());
             args.add("--beta");
             args.add("--buildid");
             args.add(buildIDField.getText());
             args.add("-m");
-            args.add(buildManifestField.getText());
+            args.add(buildManifestPlist.toString());
         } else {
             args.add("-i");
             args.add(versionField.getText());
         }
-        Process proc = null;
+        Process proc;
         try {
+            System.out.println("Running: " + args.toString());
             proc = new ProcessBuilder(args).start();
         } catch (IOException e) {
             newReportableError("There was an error starting tsschecker.", e.toString());
             e.printStackTrace();
+            deleteTempFiles();
+            return;
         }
         String tsscheckerLog;
-        //noinspection ConstantConditions
         try (BufferedReader reader = new BufferedReader(new InputStreamReader(proc.getInputStream()))) {
             StringBuilder logBuilder = new StringBuilder();
             String line;
@@ -442,18 +487,20 @@ private void run(String device) {
         } catch (IOException e) {
             newReportableError("There was an error getting the tsschecker result", e.toString());
             e.printStackTrace();
+            deleteTempFiles();
             return;
         }
 
         if (tsscheckerLog.contains("Saved shsh blobs")) {
             Alert alert = new Alert(Alert.AlertType.INFORMATION, "Successfully saved blobs in\n" + pathField.getText(), ButtonType.OK);
+            alert.setHeaderText("Success!");
             alert.showAndWait();
         } else if (tsscheckerLog.contains("[Error] [TSSC] manually specified ecid=" + ecidField.getText() + ", but parsing failed")) {
             newUnreportableError("\"" + ecidField.getText() + "\"" + " is not a valid ECID. Try getting it from iTunes");
             ecidField.setEffect(errorBorder);
         } else if (tsscheckerLog.contains("[Error] [TSSC] device " + device + " could not be found in devicelist")) {
             Alert alert = new Alert(Alert.AlertType.ERROR, "tsschecker could not find device: \"" + device +
-                    "\"\n\nPlease create a new Github issue or PM me on Reddit if you used the dropdown menu", githubIssue, redditPM, ButtonType.CANCEL);
+                    "\"\n\nPlease create a new Github issue or PM me on Reddit if you used the dropdown menu.", githubIssue, redditPM, ButtonType.CANCEL);
             alert.showAndWait();
             reportError(alert);
         } else if (tsscheckerLog.contains("[Error] [TSSC] ERROR: could not get url for device " + device + " on iOS " + versionField.getText())) {
@@ -485,7 +532,11 @@ private void run(String device) {
             newUnreportableError("iOS/tvOS " + versionField.getText() + " is not being signed for device " + device);
             versionField.setEffect(errorBorder);
         } else if (tsscheckerLog.contains("[Error] [TSSC] failed to load manifest")) {
-            newUnreportableError("\'" + buildManifestField.getText() + "\' is not a valid manifest");
+            Alert alert = new Alert(Alert.AlertType.ERROR,
+                    "Failed to load manifest.\n\n \"" + ipswField.getText() + "\" might not be a valid URL.\n\nMake sure it starts with \"http://\" or \"https://\", has \"apple\" in it, and ends with \".ipsw\"\n\nIf the URL is fine, please create a new issue on Github or PM me on Reddit. The log has been copied to your clipboard",
+                    githubIssue, redditPM, ButtonType.OK);
+            alert.showAndWait();
+            reportError(alert, tsscheckerLog);
         } else if (tsscheckerLog.contains("[Error]")) {
             newReportableError("Saving blobs failed.", tsscheckerLog);
         } else {
@@ -497,12 +548,23 @@ private void run(String device) {
             newReportableError("The tsschecker process was interrupted.", e.toString());
         }
 
-        if (!file.delete()) {
-            newUnreportableError("\"There was an error deleting the temporary file.\"");
-        }
+        deleteTempFiles();
 
     }
 
+    @SuppressWarnings("ResultOfMethodCallIgnored")
+    private void deleteTempFiles() {
+        try {
+            if (tsschecker.exists()) {
+                tsschecker.delete();
+            }
+            if (buildManifestPlist.exists()) {
+                buildManifestPlist.delete();
+            }
+        } catch (NullPointerException ignored) {
+        }
+    }
+
     public void apnonceCheckBoxHandler() {
         if (apnonceCheckBox.isSelected()) {
             apnonceField.setDisable(false);
@@ -570,40 +632,29 @@ public void identifierCheckBoxHandler() {
 
     public void betaCheckBoxHandler() {
         if (betaCheckBox.isSelected()) {
-            buildManifestField.setDisable(false);
+            ipswField.setDisable(false);
             int depth = 20;
             DropShadow borderGlow = new DropShadow();
             borderGlow.setOffsetY(0f);
             borderGlow.setOffsetX(0f);
             borderGlow.setColor(Color.DARKCYAN);
             borderGlow.setWidth(depth);
             borderGlow.setHeight(depth);
-            buildManifestField.setEffect(borderGlow);
-            plistPickerButton.setDisable(false);
+            ipswField.setEffect(borderGlow);
             buildIDField.setDisable(false);
             buildIDField.setEffect(borderGlow);
             if (versionCheckBox.isSelected()) {
                 versionCheckBox.fire();
             }
+            versionCheckBox.setDisable(true);
         } else {
-            buildManifestField.setEffect(null);
-            buildManifestField.setText("");
-            buildManifestField.setDisable(true);
-            plistPickerButton.setDisable(true);
+            ipswField.setEffect(null);
+            ipswField.setText("");
+            ipswField.setDisable(true);
             buildIDField.setEffect(null);
             buildIDField.setText("");
             buildIDField.setDisable(true);
-        }
-    }
-
-    public void plistPickerHandler() {
-        FileChooser fileChooser = new FileChooser();
-        fileChooser.setTitle("Select the BuildManifest.plist");
-        fileChooser.setInitialDirectory(new File(System.getProperty("user.home")));
-        fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("PLIST", "*.plist"));
-        File result = fileChooser.showOpenDialog(Main.primaryStage);
-        if (result != null) {
-            buildManifestField.setText(result.toString());
+            versionCheckBox.setDisable(false);
         }
     }
 
@@ -647,7 +698,6 @@ private void loadPreset(int preset) {
         if (!prefs.get("Board Config", "").equals("none")) {
             boardConfigField.setText(prefs.get("Board Config", ""));
         }
-
     }
 
     private void presetButtonHandler(ActionEvent evt) {
@@ -807,8 +857,8 @@ public void go() {
             buildIDField.setEffect(errorBorder);
             doReturn = true;
         }
-        if (betaCheckBox.isSelected() && buildManifestField.getText().equals("")) {
-            buildManifestField.setEffect(errorBorder);
+        if (betaCheckBox.isSelected() && ipswField.getText().equals("")) {
+            ipswField.setEffect(errorBorder);
             doReturn = true;
         }
         if (doReturn) {

src/main/java/blobsaver/Main.java

@@ -6,17 +6,19 @@
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 
+import java.io.IOException;
+
 public class Main extends Application {
 
-    static final String appVersion = "v1.1.1";
+    static final String appVersion = "v1.2";
     static Stage primaryStage;
 
     public static void main(String[] args) {
         launch(args);
     }
 
     @Override
-    public void start(Stage primaryStage) throws Exception {
+    public void start(Stage primaryStage) throws IOException {
         Main.primaryStage = primaryStage;
         Parent root = FXMLLoader.load(getClass().getResource("blobsaver.fxml"));
         primaryStage.setTitle("SHSH Blob Saver " + appVersion);