diff --git a/doc/dev.md b/doc/dev.md index af945ec..6ba077f 100644 --- a/doc/dev.md +++ b/doc/dev.md @@ -4,6 +4,32 @@ ### 前置条件 - 本地安装python版本为3.10.X +### 解压static +> 因为github上传文件大小限制, 所以将static文件夹下的静态资源文件压缩成了static.7z, 需要解压才可以正常跑起来代码 + +1. 进入helper/static目录 +2. 通过解压软件解压static.7z文件到**当前目录(static)** +3. 解压后的文件夹结构如下 +``` +$ tree +. +├── darwin +│ └── adb +├── gadget-android-arm64.so +├── hluda-server-arm64 +├── hluda-server-x86 +├── sdk.json +├── static.7z +└── windows + ├── adb.exe + ├── AdbWinApi.dll + └── AdbWinUsbApi.dll + +3 directories, 9 files + +``` +此时可删除static.7z文件 + ### 安装依赖 1. 进入helper目录 2. 打开命令行(或者使用vscode等专业软件打开文件夹) @@ -14,6 +40,7 @@ ### 启动 > websocket 可以通过 postman 或在线网站 http://www.websocket-test.com/ 进行连接和调试 + 1. 根据 [api](./api.md) 进行API调试 ## view diff --git a/helper/.gitignore b/helper/.gitignore index 40c44ab..b9eddcf 100644 --- a/helper/.gitignore +++ b/helper/.gitignore @@ -36,3 +36,8 @@ ENV/ *.pcap *.out + +# static +static/gadget-android-arm64.so +static/hluda-server-arm64 +static/hluda-server-x86 \ No newline at end of file diff --git a/helper/README.md b/helper/README.md index 43db882..281adc7 100644 --- a/helper/README.md +++ b/helper/README.md @@ -8,13 +8,13 @@ > -15.2.2 +16.1.4 # adb version > -33.0.3 +RC34.0.5 # powered by @@ -35,10 +35,10 @@ pyinstaller ./main.spec # server start -adb shell "su -c '/data/local/tmp/frida-server-16.0.7-android-arm64 &'" +adb shell "su -c '/data/local/tmp/frida-server-arm64 &'" # kill frida-server > -adb shell "su -c 'killall -9 frida-server-16.0.7-android-arm64'" +adb shell "su -c 'killall -9 frida-server-arm64'" diff --git a/helper/requirements.txt b/helper/requirements.txt index a964ed0..70dff89 100644 --- a/helper/requirements.txt +++ b/helper/requirements.txt @@ -6,8 +6,8 @@ click==8.1.3 colorama==0.4.6 dnspython==2.2.1 fastapi==0.86.0 -frida==15.2.2 -frida-tools==11.0.0 +frida==16.1.4 +frida-tools==12.3.0 h11==0.14.0 hexdump==3.3 idna==3.4 diff --git a/helper/routers/adb/init.py b/helper/routers/adb/init.py index 2ba1c18..ece6dc1 100644 --- a/helper/routers/adb/init.py +++ b/helper/routers/adb/init.py @@ -36,8 +36,8 @@ + os.sep + "adb" ) # 默认mac环境 -frida_server_arm = "hluda-server-15.2.2-arm64" -frida_server_x86 = "hluda-server-15.2.2-x86" +frida_server_arm = "hluda-server-arm64" +frida_server_x86 = "hluda-server-x86" # 根据手机架构选择 frida-server, arm和x86 # 兼容模拟器 detecting_phone_architecture_cmd = [adb_path, "shell", "su -c 'getprop ro.product.cpu.abi'"] @@ -115,8 +115,8 @@ def generation_cmd(): + os.sep + "adb" ) # 默认mac环境 - frida_server_arm = "hluda-server-15.2.2-arm64" - frida_server_x86 = "hluda-server-15.2.2-x86" + frida_server_arm = "hluda-server-arm64" + frida_server_x86 = "hluda-server-x86" # 根据手机架构选择 frida-server, arm和x86 # 兼容模拟器 detecting_phone_architecture_cmd = [adb_path, "shell", "su -c 'getprop ro.product.cpu.abi'"] diff --git a/helper/static/darwin/adb b/helper/static/darwin/adb old mode 100755 new mode 100644 index c3b50bc..a826255 Binary files a/helper/static/darwin/adb and b/helper/static/darwin/adb differ diff --git a/helper/static/gadget-android-arm64.so b/helper/static/gadget-android-arm64.so deleted file mode 100644 index 768c2ef..0000000 Binary files a/helper/static/gadget-android-arm64.so and /dev/null differ diff --git a/helper/static/hluda-server-15.2.2-x86 b/helper/static/hluda-server-15.2.2-x86 deleted file mode 100644 index a6d3508..0000000 Binary files a/helper/static/hluda-server-15.2.2-x86 and /dev/null differ diff --git a/helper/static/hluda-server-15.2.2-arm64 b/helper/static/static.7z similarity index 68% rename from helper/static/hluda-server-15.2.2-arm64 rename to helper/static/static.7z index 1eb794f..a4f5a1d 100644 Binary files a/helper/static/hluda-server-15.2.2-arm64 and b/helper/static/static.7z differ diff --git a/helper/static/windows/AdbWinApi.dll b/helper/static/windows/AdbWinApi.dll old mode 100755 new mode 100644 index 7abe26c..f99563a Binary files a/helper/static/windows/AdbWinApi.dll and b/helper/static/windows/AdbWinApi.dll differ diff --git a/helper/static/windows/AdbWinUsbApi.dll b/helper/static/windows/AdbWinUsbApi.dll old mode 100755 new mode 100644 index e7a6de1..2fffaea Binary files a/helper/static/windows/AdbWinUsbApi.dll and b/helper/static/windows/AdbWinUsbApi.dll differ diff --git a/helper/static/windows/adb.exe b/helper/static/windows/adb.exe old mode 100755 new mode 100644 index 375729c..b0e26e1 Binary files a/helper/static/windows/adb.exe and b/helper/static/windows/adb.exe differ diff --git a/view/package.json b/view/package.json index 6ecced5..1b8c2d8 100644 --- a/view/package.json +++ b/view/package.json @@ -1,6 +1,6 @@ { "name": "app-scan", - "version": "2.0.0", + "version": "2.1.1", "description": "自动化隐私检测工具", "productName": "app-scan", "author": "TongchengSecurityTeam ",