diff --git a/README.md b/README.md index 4e3d55d..5420fe0 100644 --- a/README.md +++ b/README.md @@ -4,11 +4,6 @@ rewriting [pyzule](https://github.com/asdfzxcvbn/pyzule), but actually good this this is pretty much just a hobby project that i'll work on when i'm bored. pyzule in its current state is kinda ugly, but it works and i haven't really had the motivation to work on it. there really isn't any need for improvements, anyway.. -`cyan` will target python v3.12 (finally!), be pep8-compliant (hopefully..), and be type-hinted! +`cyan` will ~~target python v3.12 (finally!)~~, be pep8-compliant (hopefully..), and be type-hinted! -## plan - -- have a __main__ file ofc, this is what `cyan` command runs -- also have a cyan file, it should have the main logic of the program -- have other files for a class of the ipa/app, main executable, etc diff --git a/cyan/tbhtypes/app_bundle.py b/cyan/tbhtypes/app_bundle.py index 38f661d..738f662 100644 --- a/cyan/tbhtypes/app_bundle.py +++ b/cyan/tbhtypes/app_bundle.py @@ -8,7 +8,7 @@ class AppBundle: self.plist = get_plist(plist_path) self.executable = Executable( - f"{path}/{self.plist["CFBundleExecutable"]}", + f"{path}/{self.plist['CFBundleExecutable']}", path ) diff --git a/cyan/tbhtypes/dylib.py b/cyan/tbhtypes/dylib.py deleted file mode 100644 index e69de29..0000000 diff --git a/cyan/tbhtypes/executable.py b/cyan/tbhtypes/executable.py index 1a20f95..f906783 100644 --- a/cyan/tbhtypes/executable.py +++ b/cyan/tbhtypes/executable.py @@ -27,13 +27,17 @@ class Executable: self.bn = os.path.basename(path) self.inj: Optional[lief.MachO.Binary] = None + if self.specific.endswith("iOS"): + self.inj_func = self.ios_inject + else: + self.inj_func = self.insert_cmd + def is_encrypted(self) -> bool: proc = subprocess.run( [self.otool, "-l", self.path], capture_output=True ) - # print(proc.stdout) return b"cryptid 1" in proc.stdout def inject(self, tweaks: dict[str, str], tmpdir: str) -> None: @@ -155,12 +159,12 @@ class Executable: elif bn.endswith(".dylib"): fpath = f"{FRAMEWORKS_DIR}/{bn}" existed = tbhutils.delete_if_exists(fpath, bn) - self.insert_cmd(f"@rpath/{bn}") + self.inj_func(f"@rpath/{bn}") shutil.copy2(path, FRAMEWORKS_DIR) elif bn.endswith(".framework"): fpath = f"{FRAMEWORKS_DIR}/{bn}" existed = tbhutils.delete_if_exists(fpath, bn) - self.insert_cmd(f"@rpath/{bn}/{bn[:-10]}") + self.inj_func(f"@rpath/{bn}/{bn[:-10]}") shutil.copytree(path, fpath) else: fpath = f"{self.bundle_path}/{bn}" @@ -193,10 +197,20 @@ class Executable: def insert_cmd(self, cmd: str) -> None: if self.inj is None: + lief.logging.disable() self.inj = lief.parse(self.path) # type: ignore self.inj.add(lief.MachO.DylibCommand.weak_lib(cmd)) # type: ignore + def ios_inject(self, cmd: str) -> None: + subprocess.run( + [ + f"{self.specific}/insert_dylib", + "--weak", "--inplace", "--no-strip-codesig", "--all-yes", + cmd, self.path + ], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL + ) + def get_dependencies(self) -> list[str]: proc = subprocess.run( [self.otool, "-L", self.path], diff --git a/cyan/tbhutils.py b/cyan/tbhutils.py index dacb3d1..432178c 100644 --- a/cyan/tbhutils.py +++ b/cyan/tbhutils.py @@ -88,7 +88,7 @@ def get_tools_dir() -> tuple[str, str]: system = platform.system() if "iPhone" in mach or "iPad" in mach: - mach = "arm64" + mach = "iOS" with resources.files() as files: # type: ignore return ( diff --git a/cyan/tools/Darwin/arm64/insert_dylib b/cyan/tools/Darwin/arm64/insert_dylib new file mode 100755 index 0000000..f37175f Binary files /dev/null and b/cyan/tools/Darwin/arm64/insert_dylib differ diff --git a/cyan/tools/Darwin/arm64/install_name_tool b/cyan/tools/Darwin/arm64/install_name_tool old mode 100644 new mode 100755 diff --git a/cyan/tools/Darwin/arm64/ldid b/cyan/tools/Darwin/arm64/ldid old mode 100644 new mode 100755 diff --git a/cyan/tools/Darwin/arm64/otool b/cyan/tools/Darwin/arm64/otool old mode 100644 new mode 100755 diff --git a/cyan/tools/Darwin/iOS b/cyan/tools/Darwin/iOS new file mode 120000 index 0000000..1ae7d91 --- /dev/null +++ b/cyan/tools/Darwin/iOS @@ -0,0 +1 @@ +arm64 \ No newline at end of file diff --git a/cyan/tools/Darwin/x86_64/install_name_tool b/cyan/tools/Darwin/x86_64/install_name_tool old mode 100644 new mode 100755 diff --git a/cyan/tools/Darwin/x86_64/ldid b/cyan/tools/Darwin/x86_64/ldid old mode 100644 new mode 100755 diff --git a/cyan/tools/Darwin/x86_64/otool b/cyan/tools/Darwin/x86_64/otool old mode 100644 new mode 100755 diff --git a/setup.py b/setup.py index dec1479..458505a 100644 --- a/setup.py +++ b/setup.py @@ -7,8 +7,8 @@ setup( author="zx", author_email="hi@zxcvbn.fyi", packages=["cyan", "cyan.tbhtypes"], - install_requires=["lief"], - python_requires=">=3.12", + # install_requires=["lief"], + python_requires=">=3.9", include_package_data=True, entry_points={ "console_scripts": ["cyan=cyan.__main__:main"],