fix: bad output ipas (v2.1.0)

also:
- changed some codesigning behavior to hopefully be better
- added --zip option in case someone wants that
- windows support should be fixed

Author: asdfzxcvbn

README.md

@@ -3,7 +3,7 @@ a cli tool to patch IPAs and their plugins, fixing problems with the share sheet
 
 it uses [zxPluginsInject](https://github.com/asdfzxcvbn/zxPluginsInject) by default, which is a rewrite of choco's original patch.
 
-due to being written in go and having **native load command injection**, it's fully cross-compatible with macOS, linux, and iOS! (windows untested, but it should work)
+due to being written in go and having **native load command injection**, it's fully cross-compatible with macOS, linux, and iOS! (windows untested, but it should work correctly from v2.1.0)
 
 you can find the latest binaries on the [release page](https://github.com/asdfzxcvbn/ipapatch/releases/latest).
 
@@ -12,10 +12,12 @@ you can find the latest binaries on the [release page](https://github.com/asdfzx
 
 v2.0.0 has removed the dependency on `zip`! i figured it would be nice to just test whether or not this will REALLY noticably break things. for now, ipapatch is a fully portable, native binary!
 
+v2.1.0 fixed an issue where the output ipa wasnt able to be extracted by some signing apps and other tools. you can also pass `--zip` to use the `zip` command, although this isn't really required anymore
+
 # usage
 ```bash
 $ ipapatch --help
-usage: ipapatch [-h/--help] --input <path> [--output <path] [--dylib <path>] [--inplace] [--noconfirm] [--plugins-only] [--version]
+usage: ipapatch [-h/--help] --input <path> [--output <path] [--dylib <path>] [--inplace] [--noconfirm] [--plugins-only] [--zip] [--version]
 
 flags:
   --input path      the path to the ipa file to patch
@@ -24,6 +26,7 @@ flags:
   --inplace         takes priority over --output, use this to overwrite the input file
   --noconfirm       skip interactive confirmation when not using --inplace, overwriting a file that already exists, etc
   --plugins-only    only inject into plugin binaries (not the main executable)
+  --zip             use the zip cli tool to remove files (shouldnt be needed anymore)
 
 info:
   -h, --help        show usage and exit

cmd.go

@@ -7,7 +7,7 @@ import (
 	"go.uber.org/zap/zapcore"
 )
 
-const helpText = `usage: ipapatch [-h/--help] --input <path> [--output <path] [--dylib <path>] [--inplace] [--noconfirm] [--plugins-only] [--version]
+const helpText = `usage: ipapatch [-h/--help] --input <path> [--output <path] [--dylib <path>] [--inplace] [--noconfirm] [--plugins-only] [--no-zip] [--version]
 
 flags:
   --input path      the path to the ipa file to patch
@@ -16,6 +16,7 @@ flags:
   --inplace         takes priority over --output, use this to overwrite the input file
   --noconfirm       skip interactive confirmation when not using --inplace, overwriting a file that already exists, etc
   --plugins-only    only inject into plugin binaries (not the main executable)
+  --zip             use the zip cli tool to remove files (shouldnt be needed anymore)
 
 info:
   -h, --help        show usage and exit
@@ -28,10 +29,11 @@ type Args struct {
 	InPlace     bool   `arg:"--inplace"`
 	NoConfirm   bool   `arg:"--noconfirm"`
 	PluginsOnly bool   `arg:"--plugins-only"`
+	UseZip      bool   `arg:"--zip"`
 }
 
 func (Args) Version() string {
-	return "ipapatch v2.0.0"
+	return "ipapatch v2.1.0"
 }
 
 func AskInteractively(question string) bool {

go.mod

@@ -3,9 +3,9 @@ module github.com/asdfzxcvbn/ipapatch
 go 1.24.3
 
 require (
-	github.com/STARRY-S/zip v0.2.1
-	github.com/alexflint/go-arg v1.5.1
-	github.com/blacktop/go-macho v1.1.245
+	github.com/STARRY-S/zip v0.2.3
+	github.com/alexflint/go-arg v1.6.0
+	github.com/blacktop/go-macho v1.1.249
 	go.uber.org/zap v1.27.0
 	howett.net/plist v1.0.1
 )

go.sum

@@ -1,13 +1,13 @@
-github.com/STARRY-S/zip v0.2.1 h1:pWBd4tuSGm3wtpoqRZZ2EAwOmcHK6XFf7bU9qcJXyFg=
-github.com/STARRY-S/zip v0.2.1/go.mod h1:xNvshLODWtC4EJ702g7cTYn13G53o1+X9BWnPFpcWV4=
-github.com/alexflint/go-arg v1.5.1 h1:nBuWUCpuRy0snAG+uIJ6N0UvYxpxA0/ghA/AaHxlT8Y=
-github.com/alexflint/go-arg v1.5.1/go.mod h1:A7vTJzvjoaSTypg4biM5uYNTkJ27SkNTArtYXnlqVO8=
+github.com/STARRY-S/zip v0.2.3 h1:luE4dMvRPDOWQdeDdUxUoZkzUIpTccdKdhHHsQJ1fm4=
+github.com/STARRY-S/zip v0.2.3/go.mod h1:lqJ9JdeRipyOQJrYSOtpNAiaesFO6zVDsE8GIGFaoSk=
+github.com/alexflint/go-arg v1.6.0 h1:wPP9TwTPO54fUVQl4nZoxbFfKCcy5E6HBCumj1XVRSo=
+github.com/alexflint/go-arg v1.6.0/go.mod h1:A7vTJzvjoaSTypg4biM5uYNTkJ27SkNTArtYXnlqVO8=
 github.com/alexflint/go-scalar v1.2.0 h1:WR7JPKkeNpnYIOfHRa7ivM21aWAdHD0gEWHCx+WQBRw=
 github.com/alexflint/go-scalar v1.2.0/go.mod h1:LoFvNMqS1CPrMVltza4LvnGKhaSpc3oyLEBUZVhhS2o=
 github.com/blacktop/go-dwarf v1.0.14 h1:OjmzfSgg/qAKckn2tWFebcgKgJ7HOqCj7bS+CiE1lrY=
 github.com/blacktop/go-dwarf v1.0.14/go.mod h1:4W2FKgSFYcZLDwnR7k+apv5i3nrau4NGl9N6VQ9DSTo=
-github.com/blacktop/go-macho v1.1.245 h1:RxZc/yvau+W63/rK5Ag6zpYDHj241HEbToyb9Iw9blI=
-github.com/blacktop/go-macho v1.1.245/go.mod h1:qtWG1+TBJfq/8fs2Jg50v0P3LxzAZC1yLmT/rPXxuz8=
+github.com/blacktop/go-macho v1.1.249 h1:HJlYj9xsdbCHc6PYrrjLIdqhEtR3imrshzcC4p8OdSE=
+github.com/blacktop/go-macho v1.1.249/go.mod h1:qtWG1+TBJfq/8fs2Jg50v0P3LxzAZC1yLmT/rPXxuz8=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=

inject.go

@@ -13,6 +13,8 @@ import (
 	"github.com/blacktop/go-macho/types"
 )
 
+var ErrNoCodeDirectories = errors.New("no code directories")
+
 var dylibCmdSize = binary.Size(types.DylibCmd{})
 
 func injectLC(fsPath, bundleID, lcName, tmpdir string) error {
@@ -102,15 +104,24 @@ func addDylibCommand(m *macho.File, name, bundleID string) error {
 		Name: name,
 	})
 	if cs != nil {
-		if bundleID == "" {
-			bundleID = "fyi.zxcvbn.ipapatch.app" // shouldnt happen, but best to be safe
+		if len(cs.CodeDirectories) == 0 {
+			return ErrNoCodeDirectories
+		}
+		cd := cs.CodeDirectories[0]
+		if cd.ID == "" {
+			cd.ID = bundleID
+			if bundleID == "" {
+				cd.ID = "fyi.zxcvbn.ipapatch.app" // shouldnt happen, but best to be safe
+			}
 		}
-		m.CodeSign(&codesign.Config{
-			Flags:           cstypes.ADHOC,
-			ID:              bundleID,
+
+		// https://github.com/blacktop/go-macho/blob/0247374e8fc354e575b62401a6ec2195d1fae49f/export.go#L265
+		return m.CodeSign(&codesign.Config{
+			Flags:           cd.Header.Flags | cstypes.ADHOC,
+			ID:              cd.ID,
+			TeamID:          cd.TeamID,
 			Entitlements:    []byte(cs.Entitlements),
 			EntitlementsDER: cs.EntitlementsDER,
-			SpecialSlots:    []cstypes.SpecialSlot{{Hash: cstypes.EmptySha256Slot}}, // i think this was needed, found it in an old project
 		})
 	}
 	return nil

ipa.go

@@ -6,6 +6,7 @@ import (
 	"io"
 	"io/fs"
 	"os"
+	"path"
 	"path/filepath"
 	"strings"
 
@@ -51,7 +52,7 @@ func injectAll(args Args, tmpdir string) (map[string]string, error) {
 			return nil, err
 		}
 
-		path := filepath.Join(filepath.Dir(p), pl.Executable)
+		path := path.Join(path.Dir(p), pl.Executable)
 		fsPath, err := extractToPath(z, tmpdir, path)
 		if err != nil {
 			return nil, fmt.Errorf("error extracting %s: %w", pl.Executable, err)

main.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"os/exec"
 
 	"github.com/alexflint/go-arg"
 	"go.uber.org/zap/zapcore"
@@ -30,6 +31,11 @@ func main() {
 		logger.Fatalf("%v (see --help for usage)", err)
 	}
 
+	if args.UseZip {
+		if _, err := exec.LookPath("zip"); err != nil {
+			logger.Fatal("zip command not found in PATH, you need to install it or omit --zip (see help)")
+		}
+	}
 	if args.InPlace {
 		logger.Info("--inplace specified, will overwrite input")
 		args.Output = args.Input

patch.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"strings"
 
@@ -34,9 +35,21 @@ func Patch(args Args) error {
 	}
 
 	var appName string
-	for _, val := range paths {
-		appName = strings.Split(val, "/")[1] // yeah i couldnt figure out another way to do this lmao
-		break
+	if args.UseZip {
+		zipArgs := make([]string, 0, len(paths)+2)
+		zipArgs = append(zipArgs, "-d", args.Output)
+		for _, val := range paths {
+			zipArgs = append(zipArgs, val)
+		}
+		appName = strings.Split(zipArgs[2], "/")[1]
+		if err = exec.Command("zip", zipArgs...).Run(); err != nil {
+			return fmt.Errorf("error deleting from zipfile: %w", err)
+		}
+	} else {
+		for _, val := range paths {
+			appName = strings.Split(val, "/")[1] // yeah i couldnt figure out another way to do this lmao
+			break
+		}
 	}
 
 	//