Add --tempdir and -T flags

Author: radare

index.ts

@@ -95,13 +95,16 @@ class Applesign {
     }
     await this._pullMobileProvision();
     this.emit("message", "File: " + this.config.file);
-    this.emit("message", "Outdir: " + this.config.outdir);
+    this.emit("message", "Tempdir: " + this.config.tempdir);
     if (tools.isDirectory(this.config.file as string)) {
       throw new Error("This is a directory");
     }
     try {
-      await this.unzipIPA(this.config.file, this.config.outdir);
-      const appDirectory = path.join(this.config.outdir, "/Payload");
+      if (!this.config.tempdir) {
+        throw new Error("No tempdir specified");
+      }
+      await this.unzipIPA(this.config.file, this.config.tempdir);
+      const appDirectory = path.join(this.config.tempdir, "/Payload");
       this.config.appdir = getAppDirectory(appDirectory);
       if (this.config.debug) {
         this.debugObject = {};
@@ -337,7 +340,7 @@ class Applesign {
     if (!val) {
       return;
     }
-    const f = path.replace(this.config.outdir + "/", "");
+    const f = path.replace(this.config.tempdir + "/", "");
     if (!this.debugObject) {
       this.debugObject = {};
     }
@@ -829,10 +832,9 @@ class Applesign {
     if (this.config.noclean) {
       return;
     }
-    const outdir = this.config.outdir;
-    this.emit("message", "Cleaning up " + outdir);
-    //  await tools.asyncRimraf(this.config.outfile);
-    return tools.asyncRimraf(outdir);
+    const tempdir = this.config.tempdir;
+    this.emit("message", "Cleaning up " + tempdir);
+    return tools.asyncRimraf(tempdir);
   }
 
   async cleanupTmp() {
@@ -847,15 +849,18 @@ class Applesign {
       return;
     }
     const ipaIn = this.config.file as string;
-    const ipaOut = getOutputPath(this.config.outdir, this.config.outfile!);
+    if (!this.config.tempdir) {
+      throw new Error("No tempdir specified");
+    }
+    const ipaOut = getOutputPath(this.config.tempdir, this.config.outfile!);
     try {
       fs.unlinkSync(ipaOut); // await for it
     } catch (e) {
       /* do nothing */
     }
     this.events.emit("message", "Zipifying into " + ipaOut + " ...");
     const rootFolder = this.config.payloadOnly ? "Payload" : ".";
-    await tools.zip(this.config.outdir, ipaOut, rootFolder);
+    await tools.zip(this.config.tempdir, ipaOut, rootFolder);
     if (this.config.replaceipa) {
       this.events.emit("message", "mv into " + ipaIn);
       fs.rename(ipaOut, ipaIn);
@@ -865,23 +870,23 @@ class Applesign {
   setFile(name: any) {
     fchk(arguments, ["string"]);
     this.config.file = path.resolve(name);
-    this.config.outdir = this.config.file + "." + uuid.v4();
+    this.config.tempdir ??= this.config.file + "." + uuid.v4();
     if (!this.config.outfile) {
       this.config.outfile = getResignedFilename(this.config.file);
     }
   }
 
-  async unzipIPA(file: any, outdir: any): Promise<any> {
+  async unzipIPA(file: any, workdir: any): Promise<any> {
     fchk(arguments, ["string", "string"]);
-    if (!file || !outdir) {
+    if (!file || !workdir) {
       throw new Error("No output specified");
     }
-    if (!outdir) {
+    if (!workdir) {
       throw new Error("Invalid output directory");
     }
     await this.cleanup();
     this.events.emit("message", "Unzipping " + file);
-    return tools.unzip(file, outdir);
+    return tools.unzip(file, workdir);
   }
 
   /* Event Wrapper API with cb support */
@@ -994,7 +999,7 @@ function runScriptSync(script: string, session: any) {
     process.env.APPLESIGN_DIRECTORY = session.config.appdir;
     process.env.APPLESIGN_MAINBIN = session.config.appbin;
     process.env.APPLESIGN_OUTFILE = session.config.outfile;
-    process.env.APPLESIGN_OUTDIR = session.config.outdir;
+    process.env.APPLESIGN_TEMPDIR = session.config.tempdir || "";
     process.env.APPLESIGN_FILE = session.config.file;
     try {
       const res = execSync(script);
@@ -1020,7 +1025,7 @@ function nestedApp(file: string) {
 
 function getAppDirectory(this: any, ipadir: string) {
   if (!ipadir) {
-    ipadir = path.join(this.config.outdir, "Payload");
+    ipadir = path.join(this.config.tempdir, "Payload");
   }
   if (!tools.isDirectory(ipadir)) {
     throw new Error("Not a directory " + ipadir);

lib/config.ts

@@ -20,6 +20,7 @@ const shortHelpMessage = `Usage:
   -m, --mobileprovision [FILE]  Specify the mobileprovision file to use
   -o, --output [APP.IPA]        Path to the output IPA filename
   -O, --osversion 9.0           Force specific OSVersion if any in Info.plist
+  -T, --tempdir [DIR]           Path to the output directory for temporary files
   -p, --without-plugins         Remove plugins (excluding XCTests) from the resigned IPA
   -w, --without-watchapp        Remove the WatchApp from the IPA before resigning
   -x, --without-xctests         Remove the XCTests from the resigned IPA
@@ -42,6 +43,7 @@ const helpMessage = `Usage:
   -o, --output [APP.IPA]        Path to the output IPA filename
   -P, --parallel                Run layered signing dependencies in parallel (EXPERIMENTAL)
   -r, --replace                 Replace the input IPA file with the resigned one
+  -T, --tempdir [DIR]           Path to the output directory for temporary files
   -u, --unfair                  Resign encrypted applications
   -z, --ignore-zip-errors       Ignore unzip/7z uncompressing errors
 
@@ -149,7 +151,7 @@ export interface ConfigOptions {
   payloadOnly: boolean;
   noclean: boolean;
   osversion: any; // opt.osversion || undefined,
-  outdir: any;
+  tempdir: string | undefined;
   outfile: string | null;
   parallel: boolean;
   pseudoSign: boolean;
@@ -229,7 +231,7 @@ const fromOptions = function (opt: any): ConfigOptions {
     osversion: opt.osversion || undefined,
     appbin: undefined,
     appdir: undefined,
-    outdir: undefined,
+    tempdir: opt.tempdir ? path.resolve(opt.tempdir) : undefined,
     payloadOnly: false,
     outfile: opt.outfile,
     parallel: opt.parallel || false,
@@ -267,6 +269,8 @@ function parse(argv: any) {
       "osversion",
       "R",
       "run",
+      "T",
+      "tempdir",
     ],
     boolean: [
       "7",
@@ -357,6 +361,7 @@ function compile(conf: any) {
       conf.noEntitlementsFile,
     noclean: conf.n || conf.noclean,
     osversion: conf.osversion || conf.O,
+    tempdir: conf.tempdir ? path.resolve(conf.tempdir) : undefined,
     outfile: (conf.output || conf.o) ? path.resolve(conf.output || conf.o) : "",
     parallel: conf.parallel || conf.P,
     pseudoSign: conf.Z || conf["pseudo-sign"],