chore: bump version to v1.1.5

lol, this is so fucking stupid, i was trying to fix #3 but also found that `Plist.change()` was being used incorrectly EVERYWHERE in cyan, LMAO

slight oversight since i forgot i had even changed its usage, but at least it's fixed now

README.md

@@ -2,13 +2,11 @@
 
 a rewrite of [pyzule](https://github.com/asdfzxcvbn/pyzule) that doesn't (completely) suck !!
 
-cyan supports **linux, macOS, WSL, and jailbroken iOS!** all either x86_64 or arm64/aarch64 !!
-
 ## features
 
-more coming soon! i'm trying to copy pyzule in order to deprecate it in favor of cyan, which is 1000x better
+you can open an issue to request a feature :D !!
 
-- generate and use [shareable .cyan files](https://github.com/asdfzxcvbn/cyan-gen) to configure IPAs!
+- generate and use shareable .cyan files to configure IPAs!
 - inject deb, dylib, framework, bundle, and appex files/folders
 - automatically fix dependencies on CydiaSubstrate **(cyan uses [ElleKit](https://github.com/evelyneee/ellekit/)!)**, Cephei*, and Orion
 - copy any unknown file/folder types to app root
@@ -22,38 +20,41 @@ more coming soon! i'm trying to copy pyzule in order to deprecate it in favor of
 
 ## install instructions
 
+cyan supports **linux, macOS, WSL, and jailbroken iOS!** all either x86_64 or arm64/aarch64 !!
+
 first, make sure you have [ar](https://command-not-found.com/ar) and [tar](https://command-not-found.com/tar) installed
 
-also obviously install python, version 3.9 or greater is required (the version available on the procursus repo for iOS)
+also obviously install python, version 3.9 or greater is required
 
-**if you want to inject dylibs AND ARE NOT ON iOS,** make sure you install lief (you only have to do this once): `pip install -U lief`
+<details>
+<summary><b>linux/WSL/macOS instructions</b></summary>
+<br/>
+<ol>
+  <li>install <a href="https://github.com/pypa/pipx?tab=readme-ov-file#install-pipx">pipx</a></li>
+  <li>install OR update cyan: <code>pipx install --force https://github.com/asdfzxcvbn/pyzule-rw/archive/main.zip</code></li>
+  <li><b>if you want to inject dylibs ON AARCH64 LINUX</b>: <code>pipx inject cyan lief</code></li>
+  <li><b>if you want to change app icons (iOS NOT supported)</b>: <code>pipx inject cyan Pillow</code></li>
+</ol>
+</details>
 
-**if you want to change app icons (iOS NOT supported),** also make sure you install pillow: `pip install Pillow`
+<details>
+<summary><b>jailbroken iOS instructions / automated environment (github workflow, etc)</b></summary>
+<br/>
+<ol>
+  <li>install OR update cyan: <code>pip install --force-reinstall https://github.com/asdfzxcvbn/pyzule-rw/archive/main.zip</code></li>
+</ol>
+</details>
 
-then finally, to install or update cyan, just `pip install --force-reinstall git+https://github.com/asdfzxcvbn/pyzule-rw.git#egg=cyan`
+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` !
 
 ## acknowledgements
 
 - [Al4ise](https://github.com/Al4ise) for the original [Azule](https://github.com/Al4ise/Azule)
 - [lief-project](https://github.com/lief-project) for [LIEF](https://github.com/lief-project/LIEF)
-
+- [tyilo](https://github.com/tyilo) for [insert_dylib](https://github.com/tyilo/insert_dylib/) (macOS/iOS)
-### todo
+- [LeanVel](https://github.com/LeanVel) for [insert_dylib](https://github.com/LeanVel/insert_dylib) (linux)
-
-[x] refactor: dont prepare, just copy and fix as you go
-
-[x] feat: plist operations (-l and -r wont be implemented)
-
-[x] feat: remove watch app
-
-[x] feat: fakesign
-
-[x] feat: thin binaries
-
-[x] feat: plugin operations (-q, -e)
-
-[x] feat: change app icon
-
-[x] feat: .cyan files (lol rip .pyzule files)
-
-:D
 

cgen/__main__.py

@@ -0,0 +1,142 @@
+import os
+import sys
+import json
+import zipfile
+import argparse
+
+
+def main() -> None:
+  if sys.platform == "win32":
+    sys.exit("[!] windows is not supported")
+
+  parser = argparse.ArgumentParser(
+    description="a tool to generate .cyan files"
+  )
+
+  parser.add_argument(
+    "-o", "--output", metavar="output", required=True,
+    help="output of the .cyan file"
+  )
+
+  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"
+  )
+  parser.add_argument(
+    "-v", metavar="version",
+    help="modify the app's version"
+  )
+  parser.add_argument(
+    "-b", metavar="bundle id",
+    help="modify the app's bundle id"
+  )
+  parser.add_argument(
+    "-m", metavar="minimum",
+    help="modify the app's minimum OS version"
+  )
+  parser.add_argument(
+    "-k", metavar="icon",
+    help="modify the app's icon"
+  )
+
+  parser.add_argument(
+    "-u", "--remove-supported-devices", action="store_true",
+    help="remove UISupportedDevices"
+  )
+  parser.add_argument(
+    "-w", "--no-watch", action="store_true",
+    help="remove all watch apps"
+  )
+  parser.add_argument(
+    "-d", "--enable-documents", action="store_true",
+    help="enable documents support"
+  )
+  parser.add_argument(
+    "-s", "--fakesign", action="store_true",
+    help="fakesign all binaries for use with appsync/trollstore"
+  )
+  parser.add_argument(
+    "-q", "--thin", action="store_true",
+    help="thin all binaries to arm64, may largely reduce size"
+  )
+  parser.add_argument(
+    "-e", "--remove-extensions", action="store_true",
+    help="remove all app extensions"
+  )
+  parser.add_argument(
+    "-g", "--remove-encrypted", action="store_true",
+    help="only remove encrypted app extensions"
+  )
+
+  generate_cyan(parser)
+
+
+def generate_cyan(parser: argparse.ArgumentParser) -> None:
+  args = parser.parse_args()
+
+  # input validation
+  if args.m is not None and any(c not in "0123456789." for c in args.m):
+    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.f is not None:
+    fake = [f for f in args.f if not os.path.exists(f)]
+
+    # it would be great if everyone was using python 3.12 !!!
+    if len(fake) != 0:
+      parser.error(f"the following file(s) do not exist: {', '.join(fake)}")
+
+  if not args.output.endswith(".cyan"):
+    print("[*] appended cyan file extension to output")
+    args.output += ".cyan"
+  if os.path.isfile(args.output):
+    try:
+      overwrite = input(
+        f"[<] {args.output} already exists. overwrite? [Y/n] "
+      ).lower().strip()
+    except KeyboardInterrupt:
+      sys.exit("\n[?] guess not")
+
+    if overwrite not in ("y", "yes", ""):
+      sys.exit("[>] quitting.")
+
+  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
+    if key in real_args:
+      real_args[key] = True
+
+  print("[*] generating..")
+  with zipfile.ZipFile(
+      args.output, "w", zipfile.ZIP_DEFLATED, compresslevel=1
+  ) as zf:
+    with zf.open("config.json", "w") as f:
+      f.write(json.dumps(real_args).encode())
+
+    if args.f is not None:
+      for f in args.f:
+        if os.path.isfile(f):
+          zf.write(f, f"inject/{os.path.basename(f)}")
+        else:  # G YHUJMNFTGYHNFTGYHTGYHUT6Y7UJM8RFTYHNR564TY
+          if f.endswith("/"):
+            f = f[:-1]  # yes this is needed to prevent a bug wtf
+          for dp, _, files in os.walk(f):
+            for f2 in files:
+              thing = f"{dp}/{f2}"
+              zf.write(
+                thing,
+                f"inject/{os.path.relpath(thing, os.path.dirname(f))}"
+              )  # no, i don't know what this is doing.
+
+    if args.k is not None:
+      zf.write(args.k, "icon.idk")
+
+
+if __name__ == "__main__":
+  main()
+

cyan/__main__.py

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

cyan/logic.py

@@ -86,6 +86,6 @@ def main(parser: ArgumentParser) -> None:
       if os.path.isdir(args.o):
         shutil.rmtree(args.o)
 
-      shutil.move(app_path, args.o)
+      shutil.move(app.path, args.o)
       print(f"[*] generated app at {args.o}")
 

cyan/tbhtypes/executable.py

@@ -18,6 +18,7 @@ class Executable:
   ldid = f"{specific}/ldid"
   lipo = f"{specific}/lipo"
   otool = f"{specific}/otool"
+  idylib = f"{specific}/insert_dylib"
 
   starters = ("\t/Library/", "\t@rpath", "\t@executable_path")
   common = {
@@ -42,10 +43,10 @@ class Executable:
     self.bn = os.path.basename(path)
     self.inj: Optional = None  # type: ignore
 
-    if self.specific.endswith("iOS"):
+    if os.path.isfile(self.idylib):
-      self.inj_func = self.ios_inject
+      self.inj_func = self.idyl_inject
     else:
-      self.inj_func = self.insert_cmd
+      self.inj_func = self.lief_inj
 
   def is_encrypted(self) -> bool:
     proc = subprocess.run(
@@ -76,7 +77,7 @@ class Executable:
       has_entitlements = True
 
     # iirc, injecting doesnt work (sometimes) if the file isn't signed
-    self.fakesign(False)
+    self.remove_signature()
 
     if any(t.endswith(".appex") for t in tweaks):
       os.makedirs(PLUGINS_DIR, exist_ok=True)
@@ -151,9 +152,12 @@ class Executable:
       self.inj.write(self.path)  # type: ignore
 
     if has_entitlements:
-      subprocess.run(["ldid", f"-S{ENT_PATH}", self.path])
+      subprocess.run([self.ldid, f"-S{ENT_PATH}", self.path])
       print("[*] restored entitlements")
 
+  def remove_signature(self) -> None:
+    subprocess.run([self.ldid, "-R", self.path], stderr=subprocess.DEVNULL)
+
   def fakesign(self, keep_entitlements: bool = True) -> bool:
     cmd = [self.ldid, "-S"]
     if keep_entitlements:
@@ -174,7 +178,7 @@ class Executable:
       stderr=subprocess.DEVNULL
     )
 
-  def insert_cmd(self, cmd: str) -> None:
+  def lief_inj(self, cmd: str) -> None:
     if self.inj is None:  # type: ignore
       try:
         lief.logging.disable()  # type: ignore
@@ -183,19 +187,24 @@ class Executable:
 
       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 ios_inject(self, cmd: str) -> None:
+  def idyl_inject(self, cmd: str) -> None:
-    subprocess.run(
+    proc = subprocess.run(
       [
-        f"{self.specific}/insert_dylib",
+        self.idylib, "--weak", "--inplace", "--strip-codesig", "--all-yes",
-        "--weak", "--inplace", "--no-strip-codesig", "--all-yes",
         cmd, self.path
-      ], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL
+      ], 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.fakesign()  # sometimes it doesnt work if we dont do this
+    self.remove_signature()
 
     for dep in self.get_dependencies():
       for cname in (tweaks | self.common):

cyan/tbhtypes/plist.py

@@ -44,6 +44,7 @@ class Plist:
     try:
       if all(self[key] == val for key in keys):
         return False
+      raise KeyError  # lets pretend this was always here..
     except KeyError:
       for key in keys:
         self[key] = val
@@ -67,15 +68,14 @@ class Plist:
       print("[?] documents support was already enabled")
 
   def change_name(self, name: str) -> None:
-    if self.change("CFBundleName", "CFBundleDisplayName", name):
+    if self.change(name, "CFBundleName", "CFBundleDisplayName"):
       print(f"[*] changed name to \"{name}\"")
       changed = 0
 
       for lproj in glob(f"{self.app_path}/*.lproj"):
         try:
           pl = Plist(f"{lproj}/InfoPlist.strings", None, False)
-          pl["CFBundleDisplayName"] = name
+          pl.change(name, "CFBundleName", "CFBundleDisplayName")
-          pl["CFBundleName"] = name
           pl.save()
           changed += 1
         except Exception:
@@ -87,7 +87,7 @@ class Plist:
       print(f"[?] name was already \"{name}\"")
 
   def change_version(self, version: str) -> None:
-    if self.change("CFBundleVersion", "CFBundleShortVersionString", version):
+    if self.change(version, "CFBundleVersion", "CFBundleShortVersionString"):
       print(f"[*] changed version to \"{version}\"")
     else:
       print(f"[?] version was already \"{version}\"")
@@ -95,7 +95,7 @@ class Plist:
   def change_bundle_id(self, bundle_id: str) -> None:
     orig = self["CFBundleIdentifier"]
 
-    if self.change("CFBundleIdentifier", bundle_id):
+    if self.change(bundle_id, "CFBundleIdentifier"):
       print(f"[*] changed bundle id to \"{bundle_id}\"")
       changed = 0
 
@@ -116,7 +116,7 @@ class Plist:
       print(f"[?] bundle id was already \"{bundle_id}\"")
 
   def change_minimum_version(self, minimum: str) -> None:
-    if self.change("MinimumOSVersion", minimum):
+    if self.change(minimum, "MinimumOSVersion"):
       print(f"[*] changed minimum version to \"{minimum}\"")
     else:
       print(f"[?] minimum version was already \"{minimum}\"")

cyan/tbhutils.py

@@ -39,15 +39,19 @@ def validate_inputs(args: Namespace) -> Optional[str]:
         sys.exit(0)
 
   if args.f is not None:
-    # dictionary ensures unique names
+    new: dict[str, str] = {}  # dictionary ensures unique names
-    args.f = {os.path.basename(f): os.path.realpath(f) for f in args.f}
-    nonexistent = [f for f in args.f.values() if not os.path.exists(f)]
 
-    if len(nonexistent) != 0:
+    for f in list(args.f):
-      print("[!] please ensure the following file(s) exist:")
+      if f[-1] == "/":  # yeah this is stupid
-      for ne in nonexistent:
+        f = f[:-1]
-        print(f"[?] - {ne}")
+
-      sys.exit(1)
+      if not os.path.exists(f):
+        sys.exit(f"[!] \"{f}\" does not exist")
+
+      new[os.path.basename(f)] = os.path.realpath(f)
+
+    # i would've modified args.f directly, but it causes type-hinting error :(
+    args.f = new
 
   if (
       args.m is not None
@@ -106,11 +110,12 @@ def get_tools_dir() -> tuple[str, str]:
   # thank god i dont have to use importlib,
   # it's the WORST standard library package prior to 3.12
   install_dir = os.path.dirname(__file__)
+  specific_dir = f"{install_dir}/tools/{system}/{mach}"
 
-  return (
+  if not os.path.isdir(specific_dir):
-    install_dir,
+    sys.exit(f"[!] cyan is not supported on: {system} {mach}")
-    f"{install_dir}/tools/{system}/{mach}"
+
-  )
+  return (install_dir, specific_dir)
 
 
 def delete_if_exists(path: str, bn: str) -> bool:
@@ -153,12 +158,16 @@ def extract_deb(deb: str, tweaks: dict[str, str], tmpdir: str) -> None:
 
   for hi in sum((
       glob(f"{t2}/**/*.dylib", recursive=True),
-      glob(f"{t2}/**/*.bundle", recursive=True),
       glob(f"{t2}/**/*.appex", recursive=True),
+      glob(f"{t2}/**/*.bundle", recursive=True),
       glob(f"{t2}/**/*.framework", recursive=True)
   ), []):  # type: ignore
-    if os.path.islink(hi):
+    if (
-      continue  # symlinks are broken iirc
+        os.path.islink(hi)  # symlinks are broken iirc
+        or hi.count(".bundle") > 1  # prevent sub-bundle detection (rip)
+        or hi.count(".framework") > 1
+    ):
+      continue
 
     tweaks[os.path.basename(hi)] = hi
 

setup.py

@@ -1,17 +1,21 @@
+# type: ignore
+
 from setuptools import setup
 
 setup(
   name="cyan",
-  version="1.1",
+  version="1.1.5",
   description="finally, pyzule doesn't suck",
   author="zx",
   author_email="zx@hrzn.email",
-  packages=["cyan", "cyan.tbhtypes"],
+  packages=["cyan", "cyan.tbhtypes", "cgen"],
-  # install_requires=["lief"],
   python_requires=">=3.9",
   include_package_data=True,
   entry_points={
-    "console_scripts": ["cyan=cyan.__main__:main"],
+    "console_scripts": [
+      "cyan=cyan.__main__:main",
+      "cgen=cgen.__main__:main"
+    ],
   }
 )