chore: bump version to v1.4.3

macos moment

.github/ISSUE_TEMPLATE/question.yaml

@@ -0,0 +1,22 @@
+# thanks to uYouEnhanced for the issue template:
+# https://github.com/arichornlover/uYouEnhanced/blob/main/.github/ISSUE_TEMPLATE/bug.yaml?plain=1
+
+name: question
+description: have a question about cyan or its code? use this template!
+title: "[question] "
+labels: question
+body:
+  - type: checkboxes
+    attributes:
+      label: have you searched the existing issues?
+      options:
+        - label: this is a unique question. i agree that if this isn't a unique question, i'll be BLOCKED from the cyan repo
+          required: true
+
+  - type: textarea
+    attributes:
+      label: what's up?
+      description: what's the question?
+    validations:
+      required: true
+

.gitignore

@@ -1,5 +1,8 @@
 __pycache__/
 
 build/
-*.egg-info
+*.egg-info/
+
+*.cyan
+.DS_Store
 

README.md

@@ -2,6 +2,8 @@
 
 a rewrite of [pyzule](https://github.com/asdfzxcvbn/pyzule) that doesn't (completely) suck !!
 
+wouldn't a go rewrite be really cool? (or in rust or something, adding features to this makes me realize PYTHONM FUCKING SUCKS SOMEONE PLEASE REWRITE IN LIKE ANY COMPILED AND STATICALLY TYPED LANGUAGE PLEASE!!!!!!!
+
 ## features
 
 you can open an issue to request a feature :D !! also see my [recommended flags](https://github.com/asdfzxcvbn/pyzule-rw/wiki/recommended-flags)
@@ -14,7 +16,8 @@ you can open an issue to request a feature :D !! also see my [recommended flags]
 - remove UISupportedDevices
 - remove watch app
 - change the app icon
-- fakesign the output ipa/app
+- fakesign the output ipa/tipa/app
+- merge a plist into the app's existing Info.plist
 - add custom entitlements to the main executable
 - thin all binaries to arm64, it can LARGELY reduce app size sometimes!
 - remove all app extensions (or just encrypted ones!)
@@ -48,8 +51,6 @@ the `zip` and `unzip` commands are *optional* dependencies, they may [fix issues
 </ol>
 </details>
 
-note: if you installed cyan before v1.1.3 using `pip`, make sure you `pip uninstall cyan`, then verify you have the latest version with `cyan --version`
-
 ## making cyan files
 
 cyan comes bundled with the `cgen` command, which lets you generate `.cyan` files to pass to `-z`/`--cyan` !

cgen/__main__.py

@@ -42,6 +42,14 @@ def main() -> None:
     "-k", metavar="icon",
     help="modify the app's icon"
   )
+  parser.add_argument(
+    "-l", metavar="plist",
+    help="a plist to merge with the app's Info.plist"
+  )
+  parser.add_argument(
+    "-x", metavar="entitlements",
+    help="add or modify entitlements to the main binary"
+  )
 
   parser.add_argument(
     "-u", "--remove-supported-devices", action="store_true",
@@ -83,6 +91,10 @@ def generate_cyan(parser: argparse.ArgumentParser) -> None:
     parser.error(f"invalid minimum OS version: {args.m}")
   if args.k is not None and not os.path.isfile(args.k):
     parser.error(f"{args.k} does not exist")
+  if args.l is not None and not os.path.isfile(args.l):
+    parser.error(f"{args.l} does not exist")
+  if args.x is not None and not os.path.isfile(args.x):
+    parser.error(f"{args.x} does not exist")
   if args.f is not None:
     fake = [f for f in args.f if not os.path.exists(f)]
 
@@ -107,7 +119,7 @@ def generate_cyan(parser: argparse.ArgumentParser) -> None:
   real_args = {k: v for k, v in dict(vars(args)).items() if v}
   del real_args["output"]
 
-  for key in "fk":  # these need files
+  for key in "fkxl":  # these need files
     if key in real_args:
       real_args[key] = True
 
@@ -136,6 +148,12 @@ def generate_cyan(parser: argparse.ArgumentParser) -> None:
     if args.k is not None:
       zf.write(args.k, "icon.idk")
 
+    if args.l:
+      zf.write(args.l, "merge.plist")
+
+    if args.x:
+      zf.write(args.x, "new.entitlements")
+
 
 if __name__ == "__main__":
   main()

cyan/__main__.py

@@ -21,15 +21,16 @@ def main() -> None:
     "-o", "--output", metavar="output",
     help="if unspecified, overwrites input"
   )
-  parser.add_argument(
-    "-z", "--cyan", metavar="cyan",
-    help="the .cyan file to use"
-  )
 
+  parser.add_argument(
+    "-z", "--cyan", metavar="cyan", nargs="+",
+    help="the .cyan file(s) to use"
+  )
   parser.add_argument(
     "-f", metavar="file", nargs="+",
     help="a tweak to inject/item to be added to the bundle"
   )
+
   parser.add_argument(
     "-n", metavar="name",
     help="modify the app's name"
@@ -50,6 +51,10 @@ def main() -> None:
     "-k", metavar="icon",
     help="modify the app's icon"
   )
+  parser.add_argument(
+    "-l", metavar="plist",
+    help="a plist to merge with the app's Info.plist"
+  )
   parser.add_argument(
     "-x", metavar="entitlements",
     help="add or modify entitlements to the main binary"
@@ -99,7 +104,7 @@ def main() -> None:
   )
 
   parser.add_argument(
-    "--version", action="version", version="cyan v1.2"
+    "--version", action="version", version="cyan v1.4.3"
   )
 
   from cyan import logic

cyan/extras/Orion.framework/Info.plist

@@ -12,7 +12,7 @@
 	<string>Orion</string>
 	
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.1</string>
+	<string>1.0.2</string>
 	
 	<key>CFBundleVersion</key>
 	<string>1</string>

cyan/logic.py

@@ -13,8 +13,12 @@ def main(parser: ArgumentParser) -> None:
 
   if args.output is not None:
     args.o = os.path.normpath(args.output)
-    if not (args.o.endswith(".app") or args.o.endswith(".ipa")):
+    if not (
-      print("[?] output's file extension not specified; will create ipa")
+        args.o.endswith(".app")
+        or args.o.endswith(".ipa")
+        or args.o.endswith(".tipa")
+    ):
+      print("[?] valid file extension not found; will create ipa")
       args.o += ".ipa"
   else:
     args.o = args.i
@@ -25,8 +29,9 @@ def main(parser: ArgumentParser) -> None:
   if arg_err is not None:
     parser.error(arg_err)
 
-  INPUT_IS_IPA = True if args.i.endswith(".ipa") else False
+  # mfw when "True if True else False" HAHAHAH
-  OUTPUT_IS_IPA = True if args.o.endswith(".ipa") else False
+  INPUT_IS_IPA = args.i.endswith(".ipa") or args.i.endswith(".tipa")
+  OUTPUT_IS_IPA = args.o.endswith(".ipa") or args.o.endswith(".tipa")
 
   with TemporaryDirectory() as tmpdir, tbhtypes.LeavingCM():
     app_path = tbhutils.get_app(args.i, tmpdir, INPUT_IS_IPA)
@@ -40,7 +45,7 @@ def main(parser: ArgumentParser) -> None:
 
     if args.cyan is not None:
       changing = vars(args)
-      tbhutils.parse_cyan(changing, tmpdir)
+      tbhutils.parse_cyans(changing, tmpdir)
 
     # this goes before injection,
     # since user might inject their own extensions
@@ -61,8 +66,10 @@ def main(parser: ArgumentParser) -> None:
       app.plist.change_minimum_version(args.m)
     if args.k is not None:
       app.change_icon(args.k, tmpdir)
-    if args.x is not None:  # `validate_inputs()` made it a dict
+    if args.l is not None:
-      app.executable.merge_entitlements(args.x, tmpdir)
+      app.plist.merge_plist(args.l)
+    if args.x is not None:
+      app.executable.merge_entitlements(args.x)
 
     if args.remove_supported_devices:
       app.plist.remove_uisd()

cyan/tbhtypes/app_bundle.py

@@ -105,7 +105,7 @@ class AppBundle:
 
   def change_icon(self, path: str, tmpdir: str) -> None:
     try:
-      from PIL import Image
+      from PIL import Image  # type: ignore
     except Exception:
       return print("[?] pillow is not installed, -k is not available")
 

cyan/tbhtypes/executable.py

@@ -1,12 +1,6 @@
 import os
 import sys
 import subprocess
-from typing import Optional
-
-try:
-  import lief
-except Exception:
-  pass
 
 from cyan import tbhutils
 
@@ -20,16 +14,31 @@ class Executable:
   idylib = f"{specific}/insert_dylib"
 
   starters = ("\t/Library/", "\t@rpath", "\t@executable_path")
-  common = {
+
   # substrate could show up as
   # CydiaSubstrate.framework, libsubstrate.dylib, EVEN CydiaSubstrate.dylib
   # AND PROBABLY EVEN MORE !!!! IT'S CRAZY.
-
+  common = {
-    "CydiaSubstrate.framework": "CydiaSubstrate.framework",
+    "substrate.": {
-    "Orion.framework": "Orion.framework",
+      "name": "CydiaSubstrate.framework",
-    "Cephei.framework": "Cephei.framework",
+      "path": "@rpath/CydiaSubstrate.framework/CydiaSubstrate"
-    "CepheiUI.framework": "CepheiUI.framework",
+    },
-    "CepheiPrefs.framework": "CepheiPrefs.framework"
+    "orion.": {
+      "name": "Orion.framework",
+      "path": "@rpath/Orion.framework/Orion"
+    },
+    "cephei.": {
+      "name": "Cephei.framework",
+      "path": "@rpath/Cephei.framework/Cephei"
+    },
+    "cepheiui.": {
+      "name": "CepheiUI.framework",
+      "path": "@rpath/CepheiUI.framework/CepheiUI"
+    },
+    "cepheiprefs.": {
+      "name": "CepheiPrefs.framework",
+      "path": "@rpath/CepheiPrefs.framework/CepheiPrefs"
+    }
   }
 
   def __init__(self, path: str):
@@ -42,14 +51,7 @@ class Executable:
       )
 
     self.path = path
-
     self.bn = os.path.basename(path)
-    self.inj: Optional = None  # type: ignore
-
-    if os.path.isfile(self.idylib):
-      self.inj_func = self.idyl_inject
-    else:
-      self.inj_func = self.lief_inj
 
   def is_encrypted(self) -> bool:
     proc = subprocess.run(
@@ -65,17 +67,6 @@ class Executable:
   def fakesign(self) -> bool:
     return subprocess.run([self.ldid, "-S", "-M", self.path]).returncode == 0
 
-  def write_entitlements(self, output: str) -> bool:
-    with open(output, "wb") as entf:
-      proc = subprocess.run(
-        [self.ldid, "-e", self.path],
-        capture_output=True
-      )
-
-      entf.write(proc.stdout)
-
-    return os.path.getsize(output) > 0
-
   def thin(self) -> bool:
     return subprocess.run(
       [self.lipo, "-thin", "arm64", self.path, "-output", self.path],
@@ -88,39 +79,29 @@ class Executable:
       stderr=subprocess.DEVNULL
     )
 
-  def lief_inj(self, cmd: str) -> None:
+  def fix_common_dependencies(self, needed: set[str]) -> None:
-    if self.inj is None:  # type: ignore
-      try:
-        lief.logging.disable()  # type: ignore
-      except Exception:
-        sys.exit("[!] did you forget to install lief?")
-
-      self.inj = lief.parse(self.path)  # type: ignore
-
-    try:
-      self.inj.add(lief.MachO.DylibCommand.weak_lib(cmd))  # type: ignore
-    except AttributeError:
-      sys.exit("[!] couldn't add LC (lief), did you use a valid app?")
-
-  def idyl_inject(self, cmd: str) -> None:
-    proc = subprocess.run(
-      [
-        self.idylib, "--weak", "--inplace", "--strip-codesig", "--all-yes",
-        cmd, self.path
-      ], capture_output=True, text=True
-    )
-
-    if proc.returncode != 0:
-      sys.exit(f"[!] couldn't add LC (insert_dylib), error:\n{proc.stderr}")
-
-  def fix_dependencies(self, tweaks: dict[str, str], need: set[str]) -> None:
     self.remove_signature()
 
     for dep in self.get_dependencies():
-      for cname in (tweaks | self.common):
+      for common, info in self.common.items():
+        if common in dep.lower():
+          needed.add(common)
+
+          if dep != info["path"]:
+            self.change_dependency(dep, info["path"])
+            print(
+              f"[*] fixed common dependency in {self.bn}: "
+              f"{dep} -> {info['path']}"
+            )
+
+  def fix_dependencies(self, tweaks: dict[str, str]) -> None:
+    for dep in self.get_dependencies():
+      for cname in tweaks:
         if cname in dep:
           # i wonder if there's a better way to do this?
           if cname.endswith(".framework"):
+            # nah, not gonna parse the plist,
+            # i've never seen a framework with a "mismatched" name
             npath = f"@rpath/{cname}/{cname[:-10]}"
           else:
             npath = f"@rpath/{cname}"
@@ -129,9 +110,6 @@ class Executable:
             self.change_dependency(dep, npath)
             print(f"[*] fixed dependency in {self.bn}: {dep} -> {npath}")
 
-          if cname in self.common:
-            need.add(cname)
-
   def get_dependencies(self) -> list[str]:
     proc = subprocess.run(
       [self.otool, "-L", self.path],

cyan/tbhtypes/main_executable.py

@@ -1,9 +1,13 @@
 import os
+import sys
 import shutil
-import plistlib
 import subprocess
-from typing import Any
+from typing import Optional
-from plistlib import dump as pdump
+
+try:
+  import lief  # type: ignore
+except Exception:
+  pass
 
 from cyan import tbhutils
 from .executable import Executable
@@ -13,13 +17,20 @@ class MainExecutable(Executable):
     super().__init__(path)
     self.bundle_path = bundle_path
 
+    self.inj: Optional = None  # type: ignore
+
+    if os.path.isfile(self.idylib):
+      self.inj_func = self.idyl_inject
+    else:
+      self.inj_func = self.lief_inject
+
   def inject(self, tweaks: dict[str, str], tmpdir: str) -> None:
     ENT_PATH = f"{self.bundle_path}/cyan.entitlements"
     PLUGINS_DIR = f"{self.bundle_path}/PlugIns"
     FRAMEWORKS_DIR = f"{self.bundle_path}/Frameworks"
     has_entitlements = self.write_entitlements(ENT_PATH)
 
-    # iirc, injecting doesnt work (sometimes) if the file isn't signed
+    # iirc, injecting doesnt work (sometimes) if the file is signed
     self.remove_signature()
 
     if any(t.endswith(".appex") for t in tweaks):
@@ -47,14 +58,22 @@ class MainExecutable(Executable):
     os.chdir(cwd)  # i fucking hate jailbroken iOS utils.
 
     needed: set[str] = set()
+
+    # inject/fix user things
     for bn, path in tweaks.items():
+      if os.path.islink(path):
+        continue  # symlinks can potentially have some security implications
+
       if bn.endswith(".appex"):
         fpath = f"{PLUGINS_DIR}/{bn}"
         existed = tbhutils.delete_if_exists(fpath, bn)
         shutil.copytree(path, fpath)
       elif bn.endswith(".dylib"):
         path = shutil.copy2(path, tmpdir)
-        Executable(path).fix_dependencies(tweaks, needed)
+
+        e = Executable(path)
+        e.fix_common_dependencies(needed)
+        e.fix_dependencies(tweaks)
 
         fpath = f"{FRAMEWORKS_DIR}/{bn}"
         existed = tbhutils.delete_if_exists(fpath, bn)
@@ -78,11 +97,13 @@ class MainExecutable(Executable):
 
     # orion has a *weak* dependency to substrate,
     # but will still crash without it. nice !!!!!!!!!!!
-    if "Orion.framework" in needed:
+    ## edit: actually, maybe this is in case someone uses Internal backend?
-      needed.add("CydiaSubstrate.framework")
+    ## someone test it pls!!!
+    if "orion." in needed:
+      needed.add("substrate.")
 
     for missing in needed:
-      real = self.common[missing]  # "real" name, thanks substrate!
+      real = self.common[missing]["name"]  # e.g. "Orion.framework"
       ip = f"{FRAMEWORKS_DIR}/{real}"
       existed = tbhutils.delete_if_exists(ip, real)
       shutil.copytree(f"{self.install_dir}/extras/{real}", ip)
@@ -98,27 +119,50 @@ class MainExecutable(Executable):
       self.sign_with_entitlements(ENT_PATH)
       print("[*] restored entitlements")
 
-  def merge_entitlements(
+  def write_entitlements(self, output: str) -> bool:
-      self, entitlements: dict[str, Any], tmpdir: str
+    with open(output, "wb") as entf:
-  ) -> None:
+      proc = subprocess.run(
-    ENT_PATH = f"{tmpdir}/new.entitlements"
+        [self.ldid, "-e", self.path],
-    existing: dict[str, Any]
+        capture_output=True
+      )
 
-    if self.write_entitlements(ENT_PATH):  # has entitlements
+      entf.write(proc.stdout)
-      with open(ENT_PATH, "rb") as f:
+
-        existing = plistlib.load(f)
+    return os.path.getsize(output) > 0
+
+  def merge_entitlements(self, entitlements: str) -> None:
+    if self.sign_with_entitlements(entitlements):
+      print("[*] merged new entitlements")
     else:
-      existing = {}
+      print("[!] failed to merge new entitlements, are they valid?")
-
-    new = existing | entitlements
-    with open(ENT_PATH, "wb") as f2:
-      pdump(new, f2)
-
-    self.sign_with_entitlements(ENT_PATH)
-    print("[*] modified entitlement keys:", ", ".join(entitlements))
 
   def sign_with_entitlements(self, entitlements: str) -> bool:
     return subprocess.run(
-      [self.ldid, f"-S{entitlements}", self.path]
+      [self.ldid, f"-S{entitlements}", "-M", "-Cadhoc", self.path]
     ).returncode == 0
 
+  def lief_inject(self, cmd: str) -> None:
+    if self.inj is None:  # type: ignore
+      try:
+        lief.logging.disable()  # type: ignore
+      except Exception:
+        sys.exit("[!] did you forget to install lief?")
+
+      self.inj = lief.parse(self.path)  # type: ignore
+
+    try:
+      self.inj.add(lief.MachO.DylibCommand.weak_lib(cmd))  # type: ignore
+    except AttributeError:
+      sys.exit("[!] couldn't add LC (lief), did you use a valid app?")
+
+  def idyl_inject(self, cmd: str) -> None:
+    proc = subprocess.run(
+      [
+        self.idylib, "--weak", "--inplace", "--all-yes",
+        cmd, self.path
+      ], capture_output=True, text=True
+    )
+
+    if proc.returncode != 0:
+      sys.exit(f"[!] couldn't add LC (insert_dylib), error:\n{proc.stderr}")
+

cyan/tbhtypes/plist.py

@@ -10,11 +10,13 @@ class Plist:
     try:
       with open(path, "rb") as f:
         self.data: dict[str, Any] = plistlib.load(f)
+
+      self.success = True
     except Exception:
       if throw:
         sys.exit(f"[!] couldn't read {path}")
-      else:
+
-        return None
+      self.success = False
 
     self.path = path
     self.app_path = app_path
@@ -44,7 +46,7 @@ class Plist:
     try:
       if all(self[key] == val for key in keys):
         return False
-      raise KeyError  # lets pretend this was always here..
+      raise KeyError
     except KeyError:
       for key in keys:
         self[key] = val
@@ -121,3 +123,18 @@ class Plist:
     else:
       print(f"[?] minimum version was already \"{minimum}\"")
 
+  def merge_plist(self, path: str) -> None:
+    pl = Plist(path, throw=False)
+    if not pl.success:
+      return print(f"[!] couldn't parse {path}")
+
+    changed = False
+    for k, v in pl.data.items():
+      if self.change(v, k):
+        changed = True
+
+    if not changed:
+      print("[?] no modified plist entries")
+    else:
+      print("[*] set plist keys:", ", ".join(pl.data))
+

cyan/tbhutils.py

@@ -17,10 +17,11 @@ HAS_UNZIP = shutil.which("unzip") is not None
 
 def validate_inputs(args: Namespace) -> Optional[str]:
   if not (
-      args.i.endswith(".ipa")
+      args.i.endswith(".app")
-      or args.i.endswith(".app")
+      or args.i.endswith(".ipa")
+      or args.i.endswith(".tipa")
   ):
-    return "the input file must be an ipa/app"
+    return "the input file must be an ipa/tipa/app"
 
   if not os.path.exists(args.i):
     return f"{args.i} does not exist"
@@ -66,8 +67,13 @@ def validate_inputs(args: Namespace) -> Optional[str]:
   if args.k is not None and not os.path.isfile(args.k):
     sys.exit(f"[!] {args.k} does not exist")
 
-  if args.cyan is not None and not os.path.isfile(args.cyan):
+  if args.l is not None and not os.path.isfile(args.l):
-    sys.exit(f"[!] {args.cyan} does not exist")
+    sys.exit(f"[!] {args.l} does not exist")
+
+  if args.cyan is not None:
+    for cyan in args.cyan:
+      if not os.path.isfile(cyan):
+        sys.exit(f"[!] {cyan} does not exist")
 
   if args.x is not None:
     if not os.path.isfile(args.x):
@@ -75,7 +81,7 @@ def validate_inputs(args: Namespace) -> Optional[str]:
 
     try:
       with open(args.x, "rb") as f:
-        args.x = pload(f)
+        pload(f)
     except Exception:
       sys.exit("[!] couldn't parse given entitlements file")
 
@@ -185,7 +191,7 @@ def extract_deb(deb: str, tweaks: dict[str, str], tmpdir: str) -> None:
       glob(f"{t2}/**/*.framework", recursive=True)
   ), []):  # type: ignore
     if (
-        os.path.islink(hi)  # symlinks are broken iirc
+        os.path.islink(hi)  # symlinks are broken iirc, also for security
         or hi.count(".bundle") > 1  # prevent sub-bundle detection (rip)
         or hi.count(".framework") > 1
     ):
@@ -208,8 +214,10 @@ def make_ipa(tmpdir: str, output: str, level: int) -> None:
     except FileNotFoundError:
       pass
 
+    # don't zip hidden files to fix an installd error sometimes
+    # thanks a lot eevee 😭
     subprocess.run(
-      ["zip", f"-{level}", "-r", output, "Payload"],
+      ["zip", f"-{level}", "-r", output, "Payload", "-x", "*/.*"],
       stdout=subprocess.DEVNULL
     )
   else:
@@ -226,10 +234,12 @@ def make_ipa(tmpdir: str, output: str, level: int) -> None:
     print(f"[?] was unable to zip {weird} file(s) due to timestamps")
 
 
-def parse_cyan(args: dict[str, Any], tmpdir: str) -> None:
+def parse_cyans(args: dict[str, Any], tmpdir: str) -> None:
-  print("[*] parsing .cyan file..")
+  for ind, cyan in enumerate(args["cyan"]):
-  with zipfile.ZipFile(args["cyan"]) as zf:
+    print(f"[*] parsing {os.path.basename(cyan)} ..")
-    DOT_PATH = f"{tmpdir}/cyan"
+
+    with zipfile.ZipFile(cyan) as zf:
+      DOT_PATH = f"{tmpdir}/cyan-{ind}"
       os.mkdir(DOT_PATH)
 
       with zf.open("config.json") as f:
@@ -247,7 +257,14 @@ def parse_cyan(args: dict[str, Any], tmpdir: str) -> None:
       if "k" in config:
         args["k"] = zf.extract("icon.idk", DOT_PATH)
         del config["k"]
+      if "l" in config:
+        args["l"] = zf.extract("merge.plist", DOT_PATH)
+        del config["l"]
+      if "x" in config:
+        args["x"] = zf.extract("new.entitlements", DOT_PATH)
+        del config["x"]
 
+      # the rest of the config (not the ones above, we `del` them)
       for k, v in config.items():
         args[k] = v
 

setup.py

@@ -4,7 +4,7 @@ from setuptools import setup
 
 setup(
   name="cyan",
-  version="1.2",
+  version="1.4.3",
   description="finally, pyzule doesn't suck",
   author="zx",
   author_email="zx@hrzn.email",