diff --git a/.github/workflows/run-f8x-ctf.yml b/.github/workflows/run-f8x-ctf.yml new file mode 100644 index 00000000..80097004 --- /dev/null +++ b/.github/workflows/run-f8x-ctf.yml @@ -0,0 +1,64 @@ +name: f8x-ctf +on: + push: + paths: + - 'f8x-ctf' + +jobs: + ubuntu-2004-build: + runs-on: ubuntu-20.04 + steps: + - name: Checkout codes + uses: actions/checkout@v2 + + - name: init + run: + touch /tmp/IS_CI + + - name: Run + run: + sudo bash f8x + + - name: Run -h + run: + sudo bash f8x -h + + - name: Run -clear + run: + sudo bash f8x -clear + + - name: Run -b + run: + sudo bash f8x -b + + - name: Run -d + run: + sudo bash f8x -d + + - name: Run -web + run: + sudo bash f8x-ctf -web + + - name: Run -crypto + run: + sudo bash f8x-ctf -crypto + + - name: Run -misc + run: + sudo bash f8x-ctf -misc + + - name: Run -re + run: + sudo bash f8x-ctf -re + + - name: Run -pwn + run: + sudo bash f8x-ctf -pwn + + - name: Run -info + run: + sudo bash f8x -info + + - name: log + run: + cat /tmp/f8x_error.log diff --git a/.github/workflows/run.yml b/.github/workflows/run-f8x.yml similarity index 99% rename from .github/workflows/run.yml rename to .github/workflows/run-f8x.yml index c9db04bf..26b68d41 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run-f8x.yml @@ -1,4 +1,4 @@ -name: dev +name: f8x on: push: paths: diff --git a/README.zh-cn.md b/README.zh-cn.md index 10aa2da1..67969a42 100644 --- a/README.zh-cn.md +++ b/README.zh-cn.md @@ -24,7 +24,7 @@ --- -大多数场景下,在不同的云购买一些 vps 服务器用于部署红 / 蓝队设施,不能做到开箱即用,使用此工具可以快速部署所需要的各类服务。同时兼顾到本地 VM 虚拟机的需求,可以选择走 socket 代理进行安装部署,Proxychains-ng 也会自动安装,只需做好 Proxychains-ng 配置即可。 +大多数场景下,在不同的云购买一些 vps 服务器用于部署红 / 蓝队设施,不能做到开箱即用,使用 f8x 可以快速部署所需要的各类服务。同时兼顾到本地 VM 虚拟机的需求,可以选择走 socket 代理进行安装部署,Proxychains-ng 也会自动安装,只需做好 Proxychains-ng 配置即可。 ## 开始 diff --git a/f8x b/f8x index 0bb360fd..90016931 100644 --- a/f8x +++ b/f8x @@ -29,7 +29,7 @@ Proxy_URL="https://cdn.ffffffff0x.com/?durl=https://codeload.github.com/rofl0r/p Porxy_OK= Docker_OK= error=0 -F8x_Version="1.5.9 Dev(Beta4)" +F8x_Version="1.5.9 Dev(Beta5)" # ===================== Software version variable setting ===================== hashcat_Version="hashcat-6.2.5" @@ -113,7 +113,7 @@ Platypus_Ver="v1.5.0" Platypus_bin="Platypus_linux_amd64" lua_bin="lua-5.4.3.tar.gz" lua_dir="lua-5.4.3" -Amass_Ver="v3.15.0" +Amass_Ver="v3.15.1" Amass_bin="amass_linux_amd64.zip" gobuster_Ver="v3.1.0" gobuster_bin="gobuster-linux-amd64.7z" @@ -147,7 +147,7 @@ dismap_Ver="v0.2" dismap_bin="dismap-linux-amd64" gojwtcrack_bin="gojwtcrack-linux-amd64.gz" gojwtcrack_Ver="0.1" -fapro_Ver="v0.45" +fapro_Ver="v0.46" fapro_bin="fapro_linux_x86_64.tar.gz" py37_ver="3.7.12" py37_bin="Python-3.7.12.tar.xz" @@ -165,6 +165,8 @@ JNDIExploit_bin="JNDIExploit.v1.2.zip" JNDIExploit_dir="JNDIExploit.v1.2" sttr_Ver="v0.2.6" sttr_bin="sttr_0.2.6_linux_amd64.tar.gz" +zscan_Ver="1.1.0" +zscan_bin="zscan_linux_x64" # ===================== Base Folder ===================== Base_Dir(){ @@ -2500,6 +2502,22 @@ Pentest_WebCrack_fork_Install(){ } +Pentest_zscan_Install(){ + + name="zscan" + which zscan > /dev/null 2>&1 + + if [ $? == 0 ] + then + Echo_ALERT "$name installed" + else + cd /tmp && rm -f ${zscan_bin} && $Porxy_OK wget ${GitPorxy}https://github.com/zyylhn/zscan/releases/download/$zscan_Ver/$zscan_bin > /dev/null 2>&1 || Echo_ERROR2 + mv --force $zscan_bin /usr/local/bin/zscan && chmod +x /usr/local/bin/zscan + which zscan > /dev/null 2>&1 && Echo_INFOR "Successfully installed $name $zscan_Ver in the /usr/local/bin/" || Echo_ERROR3 + fi + +} + # ===================== Install Metasploit ===================== Pentest_Metasploit_Install(){ @@ -5950,6 +5968,8 @@ kali_Tools_TypeA(){ echo -e "\033[1;33m\n>> Installing WebCrack\n\033[0m" Pentest_WebCrack_Install + # Pentest_zscan_Install + } kali_Tools_TypeB(){