chore: bump version to v1.4 (stable)

this issue was originally reported in #8

.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,5 @@
 __pycache__/
 
 build/
-*.egg-info
+*.egg-info/
 

cyan/__main__.py

@@ -99,7 +99,7 @@ def main() -> None:
   )
 
   parser.add_argument(
-    "--version", action="version", version="cyan v1.2.3"
+    "--version", action="version", version="cyan v1.4"
   )
 
   from cyan import logic

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,28 @@ 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() and dep != info["path"]:
+          self.change_dependency(dep, info["path"])
+          print(
+            f"[*] fixed common dependency in {self.bn}: "
+            f"{dep} -> {info['path']}"
+          )
+
+          needed.add(common)
+
+  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 +109,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,6 +1,13 @@
 import os
+import sys
 import shutil
 import subprocess
+from typing import Optional
+
+try:
+  import lief
+except Exception:
+  pass
 
 from cyan import tbhutils
 from .executable import Executable
@@ -10,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):
@@ -44,6 +58,8 @@ 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 bn.endswith(".appex"):
         fpath = f"{PLUGINS_DIR}/{bn}"
@@ -51,7 +67,10 @@ class MainExecutable(Executable):
         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)
@@ -75,11 +94,11 @@ class MainExecutable(Executable):
 
     # orion has a *weak* dependency to substrate,
     # but will still crash without it. nice !!!!!!!!!!!
-    if "Orion.framework" in needed:
+    if "orion." in needed:
-      needed.add("CydiaSubstrate.framework")
+      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)
@@ -95,12 +114,50 @@ class MainExecutable(Executable):
       self.sign_with_entitlements(ENT_PATH)
       print("[*] restored entitlements")
 
+  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 merge_entitlements(self, entitlements: str) -> None:
-    self.sign_with_entitlements(entitlements)
+    if self.sign_with_entitlements(entitlements):
       print("[*] merged new entitlements")
+    else:
+      print("[!] failed to merge new entitlements, are they valid?")
 
   def sign_with_entitlements(self, entitlements: str) -> bool:
     return subprocess.run(
-      [self.ldid, f"-S{entitlements}", "-M", 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}")
+

setup.py

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