fix #123

v3.0.25

index.js

@@ -140,19 +140,10 @@ export class BagBak extends EventEmitter {
     this.emit('sshBegin');
     await this.#copyToLocal(remoteRoot, parent);
 
-    // exclude SC_Info, etc.
-    const exclude = ['SC_Info', 'iTunesMetadata.plist', 'embedded.mobileprovision', '_CodeSignature'];
-    for (const name of exclude) {
-      await rm(join(localRoot, name), { recursive: true, force: true })
-        .catch(() => { });
-    }
-
     this.emit('sshFinish');
 
     const visitor = new AppBundleVisitor(localRoot);
-    // find all encrypted binaries.
-    // side effects: it will also remove some unwanted files
-    // todo: refactor to 2 passes
+    await visitor.removeUnwanted();
     const map = await visitor.encryptedBinaries();
 
     debug('encrypted binaries', map);

lib/scan.js

@@ -32,14 +32,6 @@ const exclude = {
   files: new Set(['iTunesMetadata.plist', 'embedded.mobileprovision'])
 };
 
-/**
- * 
- * @param {PathLike} dir 
- */
-function unlink(dir) {
-  return rm(dir, { recursive: true, force: true }).catch(() => { });
-}
-
 export class AppBundleVisitor {
   #root;
 
@@ -60,11 +52,6 @@ export class AppBundleVisitor {
       if (item.endsWith('.appex')) {
         const fullname = path.join(pluginsDir, item);
         const scope = fullname;
-
-        for (const item of exclude.dirs) {
-          await unlink(path.join(fullname, item));
-        }
-
         yield* this.#visit(scope, fullname);
       }
     }
@@ -79,15 +66,9 @@ export class AppBundleVisitor {
       const info = await stat(fullname);
 
       if (info.isFile()) {
-        if (exclude.files.has(item)) {
-          await unlink(fullname);
-        } else {
-          yield* this.#visitFile(this.#root, fullname);
-        }
+        yield* this.#visitFile(this.#root, fullname);
       } else if (info.isDirectory()) {
-        if (exclude.dirs.has(item)) {
-          await unlink(fullname);
-        } else if (item === 'PlugIns' || item === 'Extensions') {
+        if (item === 'PlugIns' || item === 'Extensions') {
           yield* this.#visitPlugins(fullname);
         } else {
           yield* this.#visit(this.#root, fullname);
@@ -137,7 +118,6 @@ export class AppBundleVisitor {
   }
 
   /**
-   * Warning: this function has side effects: it will remove some files in the app bundle
    * @returns {Promise<Map<import('fs').PathLike, [import('fs').PathLike, import('./macho.js').MachO][]>>}
    */
   async encryptedBinaries() {
@@ -167,4 +147,36 @@ export class AppBundleVisitor {
 
     return result;
   }
+
+  /**
+   * @returns {Promise<void>}
+   */
+  async removeUnwanted() {
+    /**
+     * @param {PathLike} dir
+     * @returns {Promise<void>}
+     */
+    async function visit(dir) {
+      console.log('dir', dir)
+      for (const item of await readdir(dir)) {
+        const fullname = path.join(dir, item);
+        const info = await stat(fullname);
+        if (!info.isDirectory()) {
+          continue;
+        }
+
+        if (exclude.dirs.has(item)) {
+          await rm(fullname, { recursive: true, force: true }).catch(() => { });
+        } else {
+          await visit(fullname);
+        }
+      }
+    }
+
+    for (const name of exclude.files) {
+      await rm(path.join(this.#root, name), { force: true }).catch(() => { });
+    }
+
+    return visit(this.#root);
+  }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bagbak",
-  "version": "3.0.23",
+  "version": "3.0.25",
   "description": "Dump iOS app from a jailbroken device, based on frida.re",
   "main": "index.js",
   "scripts": {