From 00feb9b0e40466725a8899a082da2dcd9ebf5b9a Mon Sep 17 00:00:00 2001 From: init <> Date: Mon, 16 Jan 2023 11:05:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96usb=E7=AB=AF=E5=8F=A3?= =?UTF-8?q?=E5=92=8Cwifi=E9=85=8D=E7=BD=AE=E4=BF=9D=E5=AD=98=E5=88=B0?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E3=80=82=E4=BC=98=E5=8C=96fridaname=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E8=87=AA=E5=AE=9A=E4=B9=89=EF=BC=8C=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=90=8E=E9=9C=80=E8=A6=81=E9=87=8D=E6=96=B0=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0frida=EF=BC=8C=E5=B0=B1=E6=98=AF=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E6=96=B0=E7=9A=84=E5=90=8D=E5=AD=97=E4=BA=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 ++ config/conf.ini | 4 ++ forms/Port.py | 4 ++ forms/Wifi.py | 2 + kmainForm.py | 99 ++++++++++++++++++++++++++++----------- sh/tmp/frida_linux.tmp | 2 +- sh/tmp/frida_mac.tmp | 2 +- sh/tmp/frida_win.tmp | 2 +- ui/port.py | 62 ++++++++++++++---------- ui/port.ui | 104 +++++++++++++++++++++++++---------------- 10 files changed, 188 insertions(+), 96 deletions(-) diff --git a/README.md b/README.md index 22e69a3..a541227 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,9 @@ fridaUiTools是一个界面化整理脚本的工具。新人的练手作品。 ## 交流群 +## 更新 2022-01-16 +优化usb端口和wifi配置保存到文件。优化fridaname可以自定义，自定义后需要重新上传frida，就是使用新的名字了。 + ## 更新 2022-01-08 新增语言切换功能,支持切换English，修复fart的部分bug diff --git a/config/conf.ini b/config/conf.ini index 49870de..9bcccfa 100644 --- a/config/conf.ini +++ b/config/conf.ini @@ -1,3 +1,7 @@ [kmain] language = China +frida_name = fs +usb_port = 7777 +wifi_addr = 127.0.0.1 +wifi_port = 8989 diff --git a/forms/Port.py b/forms/Port.py index 3550e8c..687fcac 100644 --- a/forms/Port.py +++ b/forms/Port.py @@ -13,10 +13,13 @@ def __init__(self, parent=None): self.setWindowOpacity(0.93) self.btnSubmit.clicked.connect(self.submit) self.btnClear.clicked.connect(self.clearUi) + self.fridaName="" + self.port="6666" def clearUi(self): self.txtPort.setText("") + self.txtFridaName.setText("") def submit(self): port = self.txtPort.text() @@ -24,4 +27,5 @@ def submit(self): QMessageBox().information(self, "hint", "missing port") return self.port = port + self.fridaName = self.txtFridaName.text() self.accept() \ No newline at end of file diff --git a/forms/Wifi.py b/forms/Wifi.py index 73c1ed1..0182724 100644 --- a/forms/Wifi.py +++ b/forms/Wifi.py @@ -12,6 +12,8 @@ def __init__(self, parent=None): self.setWindowOpacity(0.93) self.btnSubmit.clicked.connect(self.submit) self.btnClear.clicked.connect(self.clearUi) + self.address="" + self.wifi_port="" def clearUi(self): diff --git a/kmainForm.py b/kmainForm.py index 26340cf..304cd20 100644 --- a/kmainForm.py +++ b/kmainForm.py @@ -91,6 +91,11 @@ def initUi(self): self.languageGroup = QActionGroup(self) self.languageGroup.addAction(self.actionChina) self.languageGroup.addAction(self.actionEnglish) + + self.fridaName = conf.read("kmain", "frida_name") + self.customPort = conf.read("kmain", "usb_port") + self.address=conf.read("kmain", "wifi_addr") + self.wifi_port = conf.read("kmain", "wifi_port") language = conf.read("kmain", "language") if language == "China": self.actionChina.setChecked(True) @@ -133,6 +138,10 @@ def initUi(self): self.actionFridax86Start.triggered.connect(self.FridaX86Start) self.actionFridax64Start.triggered.connect(self.FridaX64Start) self.actionPullApk.triggered.connect(self.PullApk) + + self.connectHeadGroup = QActionGroup(self) + self.connectHeadGroup.addAction(self.actionWifi) + self.connectHeadGroup.addAction(self.actionUsb) self.actionWifi.triggered.connect(self.WifiConn) self.actionUsb.triggered.connect(self.UsbConn) self.actionVer14.triggered.connect(self.ChangeVer14) @@ -245,9 +254,6 @@ def initUi(self): self.chkLibArt.tag = "libArt" self.chkHookEvent.tag = "hookEvent" self.connType="usb" - self.address="" - self.port="" - self.customPort="" self.curFridaVer = "15.1.9" self.actionVer15.setChecked(True) @@ -440,18 +446,26 @@ def PullDumpDex(self): def PushFridaServer(self): try: - res = CmdUtil.execCmd(f"adb push ./exec/frida-server-{self.curFridaVer}-android-arm /data/local/tmp") + name32="" + name64="" + if self.fridaName!="": + name32=self.fridaName+"32" + name64=self.fridaName+"64" + + res = CmdUtil.execCmd(f"adb push ./exec/frida-server-{self.curFridaVer}-android-arm /data/local/tmp/"+name32) self.log(res) if "error" in res: QMessageBox().information(self, "hint",self._translate("kmainForm", "上传失败.") + res) return - res = CmdUtil.execCmd(f"adb push ./exec/frida-server-{self.curFridaVer}-android-arm64 /data/local/tmp") + res = CmdUtil.execCmd(f"adb push ./exec/frida-server-{self.curFridaVer}-android-arm64 /data/local/tmp/"+name64) self.log(res) if "file pushed" not in res: QMessageBox().information(self, "hint",self._translate("kmainForm", "上传失败,可能未连接设备.") + res) return - - res = CmdUtil.adbshellCmd("chmod 0777 /data/local/tmp/frida*") + if self.fridaName!="": + res = CmdUtil.adbshellCmd("chmod 0777 /data/local/tmp/"+self.fridaName+"*") + else: + res = CmdUtil.adbshellCmd("chmod 0777 /data/local/tmp/frida*") self.log(res) if "invalid" in res: QMessageBox().information(self, "hint",self._translate("kmainForm", "上传完成，但是设置权限失败。可能是su权限错误，请先cmd切换.")) @@ -571,13 +585,17 @@ def PullApk(self): def ReplaceSh(self,rfile,wfile,name): data = FileUtil.readFile(rfile) + adb = "adb" + if platform.system() == "Darwin": + adb = "%adb%" if self.connType == "wifi": - data = data.replace("%fridaName%", name + " -l 0.0.0.0:" + self.port) - data=data.replace("%customPort%",f"adb forward tcp:{self.customPort} tcp:{self.customPort}") + data = data.replace("%fridaName%", name + " -l 0.0.0.0:" + self.wifi_port) + + data=data.replace("%customPort%",f"{adb} forward tcp:{self.customPort} tcp:{self.customPort}") elif self.connType == "usb": if self.customPort!=None and len(self.customPort)>0: data = data.replace("%fridaName%", name + " -l 0.0.0.0:" + self.customPort) - data=data.replace("%customPort%",f"adb forward tcp:{self.customPort} tcp:{self.customPort}") + data=data.replace("%customPort%",f"{adb} forward tcp:{self.customPort} tcp:{self.customPort}") else: data = data.replace("%fridaName%", name) data = data.replace("%customPort%","") @@ -587,15 +605,17 @@ def ReplaceSh(self,rfile,wfile,name): data = data.replace("%sumod%", "su -c") elif self.actionMks0.isChecked(): data = data.replace("%sumod%", "mks 0") - + if platform.system()=="Darwin": adbPath= CmdUtil.execCmdData("which adb") data=data.replace("%adb%",adbPath.replace("\n","")) - + if self.fridaName != None and len(self.fridaName) > 0: + data = data.replace("%fName%", self.fridaName) FileUtil.writeFile(wfile,data) def ShStart(self, name): projectPath = os.path.abspath("./") + if platform.system() == "Windows": shfile = "%s\\sh\\tmp\\frida_win.tmp"% (projectPath) savefile="%s\\sh\\tmp\\frida_win.bat"% (projectPath) @@ -652,16 +672,32 @@ def ChangeChina(self,checked): restart_real_live() def Frida32Start(self): - self.ShStart(f"frida-server-{self.curFridaVer}-android-arm") + if self.fridaName !=None and len(self.fridaName)>0: + name=self.fridaName+"32" + else: + name=f"frida-server-{self.curFridaVer}-android-arm" + self.ShStart(name) def Frida64Start(self): - self.ShStart(f"frida-server-{self.curFridaVer}-android-arm64") + if self.fridaName !=None and len(self.fridaName)>0: + name=self.fridaName+"64" + else: + name=f"frida-server-{self.curFridaVer}-android-arm64" + self.ShStart(name) def FridaX86Start(self): - self.ShStart(f"frida-server-{self.curFridaVer}-android-x86") + if self.fridaName !=None and len(self.fridaName)>0: + name=self.fridaName+"64" + else: + name=f"frida-server-{self.curFridaVer}-android-x86" + self.ShStart(name) def FridaX64Start(self): - self.ShStart(f"frida-server-{self.curFridaVer}-android-x86_64") + if self.fridaName !=None and len(self.fridaName)>0: + name=self.fridaName+"64" + else: + name=f"frida-server-{self.curFridaVer}-android-x86_64" + self.ShStart(name) def changeCmdType(self,data): CmdUtil.cmdhead = data @@ -727,7 +763,7 @@ def getFridaDevice(self): else: return frida.get_usb_device() elif self.connType=="wifi": - str_host = "%s:%s" % (self.address, self.port) + str_host = "%s:%s" % (self.address, self.wifi_port) manager = frida.get_device_manager() device = manager.add_remote_device(str_host) return device @@ -737,7 +773,7 @@ def actionAttachStart(self): self.log("actionAttach") try: if self.connType=="wifi": - if len(self.address)<8 or len(self.port)<0: + if len(self.address)<8 or len(self.wifi_port)<0: QMessageBox().information(self, "hint", self._translate("kmainForm","当前为wifi连接,但是未设置地址或端口")) return @@ -747,7 +783,7 @@ def actionAttachStart(self): self.changeAttachStatus(True) self.th = TraceThread.Runthread(self.hooksData, "", False,self.connType) self.th.address=self.address - self.th.port=self.port + self.th.port=self.wifi_port self.th.customPort=self.customPort self.th.taskOverSignel.connect(self.taskOver) self.th.loggerSignel.connect(self.log) @@ -774,7 +810,7 @@ def actionSpawnStart(self): if res == 0: return try: - if self.connType=="wifi" and (len(self.address)<8 or len(self.port)): + if self.connType=="wifi" and (len(self.address)<8 or len(self.wifi_port)): QMessageBox().information(self, "hint",self._translate("kmainForm","当前为wifi连接,但是未设置地址或端口")) return # 查下进程。能查到说明frida_server开启了 @@ -783,7 +819,7 @@ def actionSpawnStart(self): self.changeAttachStatus(True) self.th = TraceThread.Runthread(self.hooksData, self.spawnAttachForm.packageName, True,self.connType) self.th.address=self.address - self.th.port=self.port + self.th.port=self.wifi_port self.th.taskOverSignel.connect(self.taskOver) self.th.loggerSignel.connect(self.log) self.th.outloggerSignel.connect(self.outlog) @@ -816,7 +852,7 @@ def changeAttachStatus(self, isattach): def actionAttachNameStart(self): self.log("actionAttachName") try: - if self.connType=="wifi" and (len(self.address)<8 or len(self.port)): + if self.connType=="wifi" and (len(self.address)<8 or len(self.wifi_port)): QMessageBox().information(self, "hint", self._translate("kmainForm","当前为wifi连接,但是未设置地址或端口")) return device = self.getFridaDevice() @@ -829,7 +865,7 @@ def actionAttachNameStart(self): self.changeAttachStatus(True) self.th = TraceThread.Runthread(self.hooksData, selectPackageForm.packageName, False,self.connType) self.th.address=self.address - self.th.port=self.port + self.th.port=self.wifi_port self.th.taskOverSignel.connect(self.taskOver) self.th.loggerSignel.connect(self.log) self.th.outloggerSignel.connect(self.outlog) @@ -844,21 +880,27 @@ def actionAttachNameStart(self): QMessageBox().information(self, "hint", self._translate("kmainForm","附加异常.") + str(ex)) def ChangePort(self): + self.portForm.txtFridaName.setText(self.fridaName) + self.portForm.txtPort.setText(self.customPort) res=self.portForm.exec() if res==0: return + self.fridaName = self.portForm.fridaName self.customPort = self.portForm.port + conf.write("kmain", "frida_name", self.fridaName) + conf.write("kmain", "usb_port", self.customPort) def WifiConn(self): + self.wifiForm.txtAddress.setText(self.address) + self.wifiForm.txtPort.setText(self.wifi_port) res=self.wifiForm.exec() - if res==0: - self.actionWifi.setChecked(False) + if res==0 : return self.connType="wifi" self.address=self.wifiForm.address - self.port=self.wifiForm.port - self.actionWifi.setChecked(True) - self.actionUsb.setChecked(False) + self.wifi_port=self.wifiForm.port + conf.write("kmain", "wifi_addr", self.address) + conf.write("kmain", "wifi_port", self.wifi_port) def UsbConn(self): self.connType="usb" self.actionUsb.setChecked(True) @@ -1187,6 +1229,7 @@ def antiFrida(self): "bak": self._translate("kmainForm","简单的过frida检测."), "address": self.pform.address, "code": self.pform.patch} typeStr = "antiFrida" self.hooksData[typeStr]=hookData + CmdUtil.adbshellCmd("touch /data/local/tmp/maps && chmod 777 /data/local/tmp/maps") self.updateTabHooks() def saveHooks(self): diff --git a/sh/tmp/frida_linux.tmp b/sh/tmp/frida_linux.tmp index c18f386..7ab06c3 100755 --- a/sh/tmp/frida_linux.tmp +++ b/sh/tmp/frida_linux.tmp @@ -1,4 +1,4 @@ -adb shell %sumod% 'pkill -9 frida-server ' +adb shell %sumod% 'pkill -9 %fName% ' adb forward tcp:27042 tcp:27042 adb forward tcp:27043 tcp:27043 %customPort% diff --git a/sh/tmp/frida_mac.tmp b/sh/tmp/frida_mac.tmp index 070bcc3..6ca7574 100755 --- a/sh/tmp/frida_mac.tmp +++ b/sh/tmp/frida_mac.tmp @@ -4,7 +4,7 @@ osascript < - Dialog - + Port + 0 @@ -11,7 +11,7 @@ - 无线连接设置 + 连接配置 @@ -19,46 +19,68 @@ 设置 - + - - - 端口： - - + + + + + 6666 + + + + + + + 端口： + + + + + + + frida_name： + + + + + + + + + + + - - - - 6666 - - - - - - - - 120 - 16777215 - - - - 提交 - - - - - - - - 120 - 16777215 - - - - 清空 - - + + + + + + + 120 + 16777215 + + + + 清空 + + + + + + + + 120 + 16777215 + + + + 提交 + + + +