Update app.py

app.py

@@ -21,45 +21,32 @@ BASE_URL = "https://gabefromsimplebit-simplebit-signer.hf.space"
 # -------------------------------------------------
 @app.route("/")
 def home():
-    return jsonify({
-        "status": "online",
-        "service": "SimpleBit Signer"
-    })
+    return jsonify({"status": "online"})
 
 
 # -------------------------------------------------
-# GET BUNDLE ID (safe)
+# FIND .APP BUNDLE
 # -------------------------------------------------
-def get_actual_bundle_id(ipa_path):
-
-    try:
-        with zipfile.ZipFile(ipa_path, "r") as ipa:
-
-            for name in ipa.namelist():
-
-                if name.endswith("Info.plist") and ".app/" in name:
-                    with ipa.open(name) as f:
-                        plist_data = plistlib.load(f)
-                        return plist_data.get("CFBundleIdentifier")
-
-    except Exception as e:
-        print("Bundle error:", e)
-
+def find_app_bundle(temp_dir):
+    for item in Path(temp_dir).rglob("*.app"):
+        if item.is_dir():
+            return item
     return None
 
 
 # -------------------------------------------------
-# FIND APP BUNDLE ANYWHERE (FIXED)
+# READ INFO.PLIST
 # -------------------------------------------------
-def find_app_bundle(temp_dir):
+def read_info_plist(app_bundle):
+    for f in Path(app_bundle).rglob("Info.plist"):
+        with open(f, "rb") as fp:
+            return f, plistlib.load(fp)
+    return None, None
 
-    temp_dir = Path(temp_dir)
 
-    for item in temp_dir.rglob("*.app"):
-        if item.is_dir():
-            return item
-
-    return None
+def write_info_plist(plist_path, data):
+    with open(plist_path, "wb") as fp:
+        plistlib.dump(data, fp)
 
 
 # -------------------------------------------------
@@ -72,15 +59,12 @@ def sign():
 
         if "ipa" not in request.files:
             return jsonify({"error": "Missing IPA"}), 400
-
         if "p12" not in request.files:
             return jsonify({"error": "Missing P12"}), 400
-
         if "provision" not in request.files:
             return jsonify({"error": "Missing provisioning profile"}), 400
 
         zsign_path = shutil.which("zsign")
-
         if not zsign_path:
             return jsonify({"error": "zsign not installed"}), 500
 
@@ -99,30 +83,49 @@ def sign():
 
         password = request.form.get("password", "")
 
-        bundle_id = get_actual_bundle_id(ipa_path) or "com.simplebit.dynamic"
-
         # -------------------------------------------------
-        # Extract IPA
+        # EXTRACT IPA
         # -------------------------------------------------
         temp_dir = tempfile.mkdtemp()
 
         with zipfile.ZipFile(ipa_path, "r") as zip_ref:
             zip_ref.extractall(temp_dir)
 
-        print("EXTRACTED FILES:", list(Path(temp_dir).rglob("*")))
-
         app_bundle = find_app_bundle(temp_dir)
 
         if not app_bundle:
             shutil.rmtree(temp_dir)
-            return jsonify({
-                "error": "No .app bundle found in IPA"
-            }), 500
+            return jsonify({"error": "No .app found"}), 500
+
+        # -------------------------------------------------
+        # READ ORIGINAL INFO
+        # -------------------------------------------------
+        plist_path, plist_data = read_info_plist(app_bundle)
+
+        if not plist_data:
+            shutil.rmtree(temp_dir)
+            return jsonify({"error": "Info.plist missing"}), 500
+
+        original_bundle_id = plist_data.get("CFBundleIdentifier", "unknown.bundle")
+        original_name = (
+            plist_data.get("CFBundleDisplayName")
+            or plist_data.get("CFBundleName")
+            or "App"
+        )
+
+        # -------------------------------------------------
+        # DO NOT CHANGE BUNDLE ID (ENTERPRISE MODE)
+        # -------------------------------------------------
+        target_bundle_id = original_bundle_id
+
+        plist_data["CFBundleIdentifier"] = target_bundle_id
+        plist_data["CFBundleDisplayName"] = original_name
+        plist_data["CFBundleName"] = original_name
 
-        print("FOUND APP:", app_bundle)
+        write_info_plist(plist_path, plist_data)
 
         # -------------------------------------------------
-        # SIGN APP
+        # SIGN
         # -------------------------------------------------
         command = [
             zsign_path,
@@ -133,14 +136,7 @@ def sign():
             str(app_bundle)
         ]
 
-        result = subprocess.run(
-            command,
-            capture_output=True,
-            text=True
-        )
-
-        print(result.stdout)
-        print(result.stderr)
+        result = subprocess.run(command, capture_output=True, text=True)
 
         if result.returncode != 0:
             shutil.rmtree(temp_dir)
@@ -151,20 +147,22 @@ def sign():
             }), 500
 
         # -------------------------------------------------
-        # REPACK IPA
+        # BUILD CLEAN IPA
         # -------------------------------------------------
-        shutil.make_archive(
-            str(job_dir / "signed"),
-            'zip',
-            temp_dir
-        )
+        payload_dir = Path(job_dir) / "Payload"
+        payload_dir.mkdir(exist_ok=True)
 
-        shutil.move(job_dir / "signed.zip", signed_path)
+        shutil.copytree(app_bundle, payload_dir / app_bundle.name)
+
+        zip_path = Path(job_dir) / "signed"
+        shutil.make_archive(str(zip_path), "zip", job_dir, "Payload")
+
+        shutil.move(str(zip_path) + ".zip", signed_path)
 
         shutil.rmtree(temp_dir)
 
-        # Save bundle ID
-        (job_dir / "bundle_id.txt").write_text(bundle_id)
+        # save ORIGINAL bundle id for manifest
+        (job_dir / "bundle_id.txt").write_text(original_bundle_id)
 
         plist_url = f"{BASE_URL}/plist/{job_id}"
         install_url = f"itms-services://?action=download-manifest&url={plist_url}"
@@ -176,14 +174,14 @@ def sign():
 
 
 # -------------------------------------------------
-# PLIST
+# MANIFEST
 # -------------------------------------------------
 @app.route("/plist/<job_id>")
 def plist(job_id):
 
     job_dir = Path(job_id)
 
-    bundle_id = "com.simplebit.dynamic"
+    bundle_id = "unknown"
 
     if (job_dir / "bundle_id.txt").exists():
         bundle_id = (job_dir / "bundle_id.txt").read_text().strip()
@@ -208,6 +206,7 @@ def plist(job_id):
 <string>{ipa_url}</string>
 </dict>
 </array>
+
 <key>metadata</key>
 <dict>
 <key>bundle-identifier</key>
@@ -217,8 +216,9 @@ def plist(job_id):
 <key>kind</key>
 <string>software</string>
 <key>title</key>
-<string>SimpleBit App</string>
+<string>Signed App</string>
 </dict>
+
 </dict>
 </array>
 </dict>
@@ -232,7 +232,7 @@ def plist(job_id):
 
 
 # -------------------------------------------------
-# DOWNLOAD IPA (iOS SAFE)
+# DOWNLOAD IPA
 # -------------------------------------------------
 @app.route("/download/<job_id>")
 def download(job_id):
@@ -242,11 +242,7 @@ def download(job_id):
     if not ipa_path.exists():
         return jsonify({"error": "IPA not found"}), 404
 
-    response = send_file(
-        ipa_path,
-        mimetype="application/octet-stream"
-    )
-
+    response = send_file(ipa_path, mimetype="application/octet-stream")
     response.headers["Content-Disposition"] = "inline; filename=signed.ipa"
     return response
 
@@ -256,10 +252,7 @@ def download(job_id):
 # -------------------------------------------------
 @app.route("/health")
 def health():
-    return jsonify({
-        "ok": True,
-        "zsign": shutil.which("zsign") is not None
-    })
+    return jsonify({"ok": True, "zsign": shutil.which("zsign") is not None})
 
 
 # -------------------------------------------------