From cecee46a199e9eb5037a12b116813e429f23af56 Mon Sep 17 00:00:00 2001
From: r0fus0d <d2hwakh7bs5e@protonmail.com>
Date: Mon, 28 Aug 2023 14:19:12 +0800
Subject: [PATCH] update(2023/08/28)

---
 f8x            | 125 +++++++++++++++++++++++++++++++------------------
 f8x_version.sh |  54 ++++++++++-----------
 2 files changed, 106 insertions(+), 73 deletions(-)

diff --git a/f8x b/f8x
index fe62907e..7d5534d4 100644
--- a/f8x
+++ b/f8x
@@ -32,7 +32,7 @@ Proxy_OK=
 Docker_OK=
 error=0
 Linux_architecture_Name=
-F8x_Version="1.6.7 Dev(2023/08/11)"
+F8x_Version="1.6.7 Dev(2023/08/28)"
 wget_option="-q --show-progress"
 
 # ===================== Software version variable setting (dev) =====================
@@ -92,17 +92,17 @@ phantomjs_dir="phantomjs-2.1.1-linux-x86_64"
 
 # ===================== Software version variable setting (pentest) =====================
 # https://github.com/fatedier/frp/releases
-frp_Ver="v0.51.2"
-frp_File_amd64="frp_0.51.2_linux_amd64.tar.gz"
-frp_File_arm64="frp_0.51.2_linux_arm64.tar.gz"
-frp_Dir_amd64="frp_0.51.2_linux_amd64"
-frp_Dir_arm64="frp_0.51.2_linux_arm64"
+frp_Ver="v0.51.3"
+frp_File_amd64="frp_0.51.3_linux_amd64.tar.gz"
+frp_File_arm64="frp_0.51.3_linux_arm64.tar.gz"
+frp_Dir_amd64="frp_0.51.3_linux_amd64"
+frp_Dir_arm64="frp_0.51.3_linux_arm64"
 # https://github.com/ehang-io/nps/releases
 nps_Ver="v0.26.10"
 nps_File_amd64="linux_amd64_server.tar.gz"
 nps_File_arm64="linux_arm64_server.tar.gz"
 # https://github.com/wikiZ/RedGuard/releases
-RedGuard_Ver="23.05.14"
+RedGuard_Ver="23.08.21"
 RedGuard_File_amd64="RedGuard_64"
 # https://github.com/RustScan/RustScan/releases
 RustScan_Version="2.0.1"
@@ -128,9 +128,9 @@ ffuf_Ver="v2.0.0"
 ffuf_Install_amd64="ffuf_2.0.0_linux_amd64.tar.gz"
 ffuf_Install_arm64="ffuf_2.0.0_linux_arm64.tar.gz"
 # https://github.com/projectdiscovery/nuclei/releases
-Nuclei_Ver="v2.9.10"
-Nuclei_Install_amd64="nuclei_2.9.10_linux_amd64.zip"
-Nuclei_Install_arm64="nuclei_2.9.10_linux_arm64.zip"
+Nuclei_Ver="v2.9.13"
+Nuclei_Install_amd64="nuclei_2.9.13_linux_amd64.zip"
+Nuclei_Install_arm64="nuclei_2.9.13_linux_arm64.zip"
 # https://github.com/Ne0nd0g/merlin/releases
 merlin_Ver="v1.5.0"
 merlin_Install_amd64="merlinServer-Linux-x64.7z"
@@ -161,18 +161,18 @@ bettercap_bin_arm64="bettercap_linux_aarch64_v2.31.1.zip"
 mitmproxy_Ver="10.0.0"
 mitmproxy_bin="mitmproxy-10.0.0-linux.tar.gz"
 # https://github.com/projectdiscovery/naabu/releases
-naabu_Ver="v2.1.5"
-naabu_bin="naabu_2.1.5_linux_amd64.zip"
+naabu_Ver="v2.1.7"
+naabu_bin="naabu_2.1.7_linux_amd64.zip"
 # https://github.com/projectdiscovery/proxify/releases
-proxify_Ver="v0.0.11"
-proxify_bin_amd64="proxify_0.0.11_linux_amd64.zip"
-proxify_bin_arm64="proxify_0.0.11_linux_arm64.zip"
+proxify_Ver="v0.0.12"
+proxify_bin_amd64="proxify_0.0.12_linux_amd64.zip"
+proxify_bin_arm64="proxify_0.0.12_linux_arm64.zip"
 # https://github.com/hashcat/hashcat/releases
 hashcat_Version="hashcat-6.2.6"
 # https://github.com/projectdiscovery/subfinder/releases
-subfinder_Ver="v2.6.1"
-subfinder_bin_amd64="subfinder_2.6.1_linux_amd64.zip"
-subfinder_bin_arm64="subfinder_2.6.1_linux_arm64.zip"
+subfinder_Ver="v2.6.2"
+subfinder_bin_amd64="subfinder_2.6.2_linux_amd64.zip"
+subfinder_bin_arm64="subfinder_2.6.2_linux_arm64.zip"
 # https://github.com/projectdiscovery/httpx/releases
 httpx_Ver="v1.3.3"
 httpx_bin_amd64="httpx_1.3.3_linux_amd64.zip"
@@ -224,9 +224,9 @@ Amass_Ver="v4.1.0"
 Amass_bin_amd64="amass_linux_amd64.zip"
 Amass_bin_arm64="amass_linux_arm64.zip"
 # https://github.com/OJ/gobuster/releases
-gobuster_Ver="v3.5.0"
-gobuster_bin_amd64="gobuster_3.5.0_Linux_x86_64.tar.gz"
-gobuster_bin_arm64="gobuster_3.5.0_Linux_arm64.tar.gz"
+gobuster_Ver="v3.6.0"
+gobuster_bin_amd64="gobuster_Linux_x86_64.tar.gz"
+gobuster_bin_arm64="gobuster_Linux_arm64.tar.gz"
 # https://github.com/jaeles-project/gospider/releases
 gospider_Ver="v1.1.6"
 gospider_bin_amd64="gospider_v1.1.6_linux_x86_64.zip"
@@ -315,11 +315,11 @@ asnmap_Ver="v1.0.4"
 asnmap_bin_amd64="asnmap_1.0.4_linux_amd64.zip"
 asnmap_bin_arm64="asnmap_1.0.4_linux_arm64.zip"
 # https://github.com/projectdiscovery/tlsx
-tlsx_Ver="v1.1.1"
-tlsx_bin_amd64="tlsx_1.1.1_linux_amd64.zip"
-tlsx_bin_arm64="tlsx_1.1.1_linux_arm64.zip"
+tlsx_Ver="v1.1.4"
+tlsx_bin_amd64="tlsx_1.1.4_linux_amd64.zip"
+tlsx_bin_arm64="tlsx_1.1.4_linux_arm64.zip"
 # https://github.com/chainreactors/gogo
-gogo_Ver="v2.11.5"
+gogo_Ver="v2.11.6"
 gogo_File_amd64="gogo_linux_amd64"
 gogo_File_arm64="gogo_linux_arm64"
 # https://github.com/projectdiscovery/simplehttpserver
@@ -380,9 +380,9 @@ fd_Ver="v8.7.0"
 fd_bin_amd64="fd_8.7.0_amd64.deb"
 fd_bin_arm64="fd_8.7.0_arm64.deb"
 # https://github.com/hashicorp/terraform/releases
-Terraform_Ver="1.5.4"
-Terraform_bin_amd64="terraform_1.5.4_linux_amd64.zip"
-Terraform_bin_arm64="terraform_1.5.4_linux_arm64.zip"
+Terraform_Ver="1.5.6"
+Terraform_bin_amd64="terraform_1.5.6_linux_amd64.zip"
+Terraform_bin_arm64="terraform_1.5.6_linux_arm64.zip"
 # https://github.com/aliyun/aliyun-cli/releases
 aliyun_cli_Ver="v3.0.170"
 aliyun_cli_bin_amd64="aliyun-cli-linux-3.0.170-amd64.tgz"
@@ -650,6 +650,26 @@ Docker_Check(){
 
 }
 
+Docker_Compose_Check(){
+
+    docker compose version > /dev/null 2>&1
+    if [ $? == 0 ]
+    then
+        Echo_INFOR "Docker passed~"
+    else
+        docker_compose_Install
+    fi
+
+    docker-compose -version > /dev/null 2>&1
+    if [ $? == 0 ]
+    then
+        Echo_INFOR "Docker passed~"
+    else
+        docker_compose_Install
+    fi
+
+}
+
 mac_Check(){
 
     case $Running_Mode in
@@ -2686,16 +2706,6 @@ Docker_Install(){
     # new
     docker_compose_Install
 
-    # old
-    #docker-compose -version > /dev/null 2>&1
-    #if [ $? == 0 ]
-    #then
-    #    Echo_ALERT "docker-compose installed"
-    #else
-    #    pip3_Check && pip3 install --upgrade pip > /dev/null 2>&1
-    #    Install_Switch4 "docker-compose"
-    #fi
-
 }
 
 # ===================== Install docker_compose =====================
@@ -2712,6 +2722,16 @@ docker_compose_Install(){
         Install_Switch "docker-compose-plugin"
     fi
 
+    # old
+    docker-compose -version > /dev/null 2>&1
+    if [ $? == 0 ]
+    then
+        Echo_ALERT "docker-compose installed"
+    else
+        pip3_Check && pip3 install --upgrade pip > /dev/null 2>&1
+        Install_Switch4 "docker-compose"
+    fi
+
 }
 
 # ===================== Install SDKMAN =====================
@@ -3658,9 +3678,9 @@ Pentest_Amass_Install(){
     then
         Echo_ALERT "$name installed"
     else
-        mkdir -p /tmp/Amass && cd /tmp/Amass && rm -rf ${Amass_bin} && rm -rf amass_linux_amd64 && $Proxy_OK wget ${GitProxy}https://github.com/owasp-amass/amass/releases/download/$Amass_Ver/$Amass_bin > /dev/null 2>&1 || Echo_ERROR2
-        unzip ${Amass_bin} > /dev/null 2>&1
-        mv --force amass_linux_*/amass /usr/local/bin/amass && chmod +x /usr/local/bin/amass
+        mkdir -p /tmp/Amass && cd /tmp/Amass && rm -rf ${Amass_bin} && $Proxy_OK wget ${GitProxy}https://github.com/owasp-amass/amass/releases/download/$Amass_Ver/$Amass_bin > /dev/null 2>&1 || Echo_ERROR2
+        unzip ${Amass_bin} > /dev/null 2>&1 && rm -rf ${Amass_bin}
+        mv --force amass_*/amass /usr/local/bin/amass && chmod +x /usr/local/bin/amass
         rm -rf /tmp/Amass
         which amass > /dev/null 2>&1 && Echo_INFOR "Successfully installed $name $Amass_Ver in the /usr/local/bin/" || Echo_ERROR3
     fi
@@ -6569,6 +6589,7 @@ volatility3_Install(){
 lt_Install(){
 
     Docker_Check
+    Docker_Compose_Check
     name="LogonTracer"
     echo -e "\033[1;33m\n>> Installing $name\n\033[0m"
 
@@ -7374,6 +7395,7 @@ metarget_Install(){
 
     Pentest_Base_Install
     Docker_Check
+    Docker_Compose_Check
     name="metarget"
     dir="$P_Dir/metarget"
 
@@ -7394,6 +7416,7 @@ vulhub_Install(){
 
     Pentest_Base_Install
     Docker_Check
+    Docker_Compose_Check
     name="vulhub"
     dir="$P_Dir/vulhub"
 
@@ -7413,6 +7436,7 @@ vulhub_Install(){
 vulfocus_Install(){
 
     Docker_Check
+    Docker_Compose_Check
     name="vulfocus"
     echo -e "\033[1;33m\n>> Installing $name\n\033[0m"
 
@@ -7425,6 +7449,7 @@ TerraformGoat_Install(){
 
     Pentest_Base_Install
     Docker_Check
+    Docker_Compose_Check
     name="TerraformGoat"
     dir="$P_Dir/TerraformGoat"
 
@@ -7487,6 +7512,7 @@ Goby_Install(){
 awvs14_Install(){
 
     Docker_Check
+    Docker_Compose_Check
     name="awvs14"
     echo -e "\033[1;33m\n>> Installing $name\n\033[0m"
 
@@ -7501,6 +7527,7 @@ awvs14_Install(){
 awvs15_Install(){
 
     Docker_Check
+    Docker_Compose_Check
     name="awvs15"
     echo -e "\033[1;33m\n>> Installing $name\n\033[0m"
 
@@ -7514,6 +7541,7 @@ awvs15_Install(){
 mobsf_Install(){
 
     Docker_Check
+    Docker_Compose_Check
     name="MobSF"
     echo -e "\033[1;33m\n>> Installing $name\n\033[0m"
 
@@ -7526,6 +7554,7 @@ mobsf_Install(){
 mythic_Install(){
 
     Docker_Check
+    Docker_Compose_Check
     name="Mythic"
     dir="$P_Dir/Mythic"
 
@@ -7557,6 +7586,7 @@ mythic_Install(){
 nodejsscan_Install(){
 
     Docker_Check
+    Docker_Compose_Check
     name="nodejsscan"
     echo -e "\033[1;33m\n>> Installing $name\n\033[0m"
 
@@ -7568,6 +7598,7 @@ nodejsscan_Install(){
 pupy_Install(){
 
     Docker_Check
+    Docker_Compose_Check
     name="pupy"
     echo -e "\033[1;33m\n>> Installing $name\n\033[0m"
 
@@ -7669,6 +7700,7 @@ SharPyShell_Install(){
 viper_Install(){
 
     Docker_Check
+    Docker_Compose_Check
     name="viper"
     echo -e "\033[1;33m\n>> Installing $name\n\033[0m"
 
@@ -7679,7 +7711,7 @@ viper_Install(){
     echo -e "\033[5;33m\nPlease enter your Viper password(Password needs to be greater than 8 digits)\033[0m" && read -r input
     Viper_Pass=$input
     cat docker-compose.yml.bak | sed "s/diypassword/$Viper_Pass/" >> docker-compose.yml
-    cd /root/VIPER && docker compose up -d
+    cd /root/VIPER && docker compose up -d || docker-compose up -d
     rm /root/VIPER/docker-compose.yml.bak
     Echo_INFOR "Waiting for the system to start(15s), access https://vpsip:60000 Login to the server. Username : root Password : $Viper_Pass"
 
@@ -7710,6 +7742,7 @@ EOF
 arl_Install(){
 
     Docker_Check
+    Docker_Compose_Check
     name="ARL"
 
     echo -e "\033[1;33m\n>> Installing $name\n\033[0m"
@@ -9250,10 +9283,10 @@ kali_Tools_TypeA(){
     Pentest_dirsearch_Install
     echo -e "\033[1;33m\n>> Installing netspy\n\033[0m"
     Pentest_netspy_Install
-    echo -e "\033[1;33m\n>> Installing ksubdomain\n\033[0m"
-    Pentest_ksubdomain_Install
     echo -e "\033[1;33m\n>> Installing naabu\n\033[0m"
     Pentest_naabu_Install
+    echo -e "\033[1;33m\n>> Installing ksubdomain\n\033[0m"
+    Pentest_ksubdomain_Install
     echo -e "\033[1;33m\n>> Installing gau\n\033[0m"
     Pentest_gau_Install
     echo -e "\033[1;33m\n>> Installing gobuster\n\033[0m"
@@ -9309,8 +9342,6 @@ kali_Tools_TypeB(){
     Pentest_ysomap_Install
     echo -e "\033[1;33m\n>> Installing SSRFmap\n\033[0m"
     Pentest_SSRFmap_Install
-    echo -e "\033[1;33m\n>> Installing testssl.sh\n\033[0m"
-    Pentest_testssl_Install
     echo -e "\033[1;33m\n>> Installing Gopherus\n\033[0m"
     Pentest_Gopherus_Install
     echo -e "\033[1;33m\n>> Installing CDK\n\033[0m"
@@ -9318,6 +9349,8 @@ kali_Tools_TypeB(){
     # echo -e "\033[1;33m\n>> Installing cf\n\033[0m"
     # Pentest_cf_Install
 
+    # echo -e "\033[1;33m\n>> Installing testssl.sh\n\033[0m"
+    # Pentest_testssl_Install
     # echo -e "\033[1;33m\n>> Installing dalfox\n\033[0m"
     # Pentest_dalfox_Install
     # Pentest_pocsuite3_Install
diff --git a/f8x_version.sh b/f8x_version.sh
index 1c9a35f4..03578a44 100644
--- a/f8x_version.sh
+++ b/f8x_version.sh
@@ -64,17 +64,17 @@ phantomjs_dir="phantomjs-2.1.1-linux-x86_64"
 
 # ===================== Software version variable setting (pentest) =====================
 # https://github.com/fatedier/frp/releases
-frp_Ver="v0.51.2"
-frp_File_amd64="frp_0.51.2_linux_amd64.tar.gz"
-frp_File_arm64="frp_0.51.2_linux_arm64.tar.gz"
-frp_Dir_amd64="frp_0.51.2_linux_amd64"
-frp_Dir_arm64="frp_0.51.2_linux_arm64"
+frp_Ver="v0.51.3"
+frp_File_amd64="frp_0.51.3_linux_amd64.tar.gz"
+frp_File_arm64="frp_0.51.3_linux_arm64.tar.gz"
+frp_Dir_amd64="frp_0.51.3_linux_amd64"
+frp_Dir_arm64="frp_0.51.3_linux_arm64"
 # https://github.com/ehang-io/nps/releases
 nps_Ver="v0.26.10"
 nps_File_amd64="linux_amd64_server.tar.gz"
 nps_File_arm64="linux_arm64_server.tar.gz"
 # https://github.com/wikiZ/RedGuard/releases
-RedGuard_Ver="23.05.14"
+RedGuard_Ver="23.08.21"
 RedGuard_File_amd64="RedGuard_64"
 # https://github.com/RustScan/RustScan/releases
 RustScan_Version="2.0.1"
@@ -100,9 +100,9 @@ ffuf_Ver="v2.0.0"
 ffuf_Install_amd64="ffuf_2.0.0_linux_amd64.tar.gz"
 ffuf_Install_arm64="ffuf_2.0.0_linux_arm64.tar.gz"
 # https://github.com/projectdiscovery/nuclei/releases
-Nuclei_Ver="v2.9.10"
-Nuclei_Install_amd64="nuclei_2.9.10_linux_amd64.zip"
-Nuclei_Install_arm64="nuclei_2.9.10_linux_arm64.zip"
+Nuclei_Ver="v2.9.13"
+Nuclei_Install_amd64="nuclei_2.9.13_linux_amd64.zip"
+Nuclei_Install_arm64="nuclei_2.9.13_linux_arm64.zip"
 # https://github.com/Ne0nd0g/merlin/releases
 merlin_Ver="v1.5.0"
 merlin_Install_amd64="merlinServer-Linux-x64.7z"
@@ -133,18 +133,18 @@ bettercap_bin_arm64="bettercap_linux_aarch64_v2.31.1.zip"
 mitmproxy_Ver="10.0.0"
 mitmproxy_bin="mitmproxy-10.0.0-linux.tar.gz"
 # https://github.com/projectdiscovery/naabu/releases
-naabu_Ver="v2.1.5"
-naabu_bin="naabu_2.1.5_linux_amd64.zip"
+naabu_Ver="v2.1.7"
+naabu_bin="naabu_2.1.7_linux_amd64.zip"
 # https://github.com/projectdiscovery/proxify/releases
-proxify_Ver="v0.0.11"
-proxify_bin_amd64="proxify_0.0.11_linux_amd64.zip"
-proxify_bin_arm64="proxify_0.0.11_linux_arm64.zip"
+proxify_Ver="v0.0.12"
+proxify_bin_amd64="proxify_0.0.12_linux_amd64.zip"
+proxify_bin_arm64="proxify_0.0.12_linux_arm64.zip"
 # https://github.com/hashcat/hashcat/releases
 hashcat_Version="hashcat-6.2.6"
 # https://github.com/projectdiscovery/subfinder/releases
-subfinder_Ver="v2.6.1"
-subfinder_bin_amd64="subfinder_2.6.1_linux_amd64.zip"
-subfinder_bin_arm64="subfinder_2.6.1_linux_arm64.zip"
+subfinder_Ver="v2.6.2"
+subfinder_bin_amd64="subfinder_2.6.2_linux_amd64.zip"
+subfinder_bin_arm64="subfinder_2.6.2_linux_arm64.zip"
 # https://github.com/projectdiscovery/httpx/releases
 httpx_Ver="v1.3.3"
 httpx_bin_amd64="httpx_1.3.3_linux_amd64.zip"
@@ -196,9 +196,9 @@ Amass_Ver="v4.1.0"
 Amass_bin_amd64="amass_linux_amd64.zip"
 Amass_bin_arm64="amass_linux_arm64.zip"
 # https://github.com/OJ/gobuster/releases
-gobuster_Ver="v3.5.0"
-gobuster_bin_amd64="gobuster_3.5.0_Linux_x86_64.tar.gz"
-gobuster_bin_arm64="gobuster_3.5.0_Linux_arm64.tar.gz"
+gobuster_Ver="v3.6.0"
+gobuster_bin_amd64="gobuster_Linux_x86_64.tar.gz"
+gobuster_bin_arm64="gobuster_Linux_arm64.tar.gz"
 # https://github.com/jaeles-project/gospider/releases
 gospider_Ver="v1.1.6"
 gospider_bin_amd64="gospider_v1.1.6_linux_x86_64.zip"
@@ -287,11 +287,11 @@ asnmap_Ver="v1.0.4"
 asnmap_bin_amd64="asnmap_1.0.4_linux_amd64.zip"
 asnmap_bin_arm64="asnmap_1.0.4_linux_arm64.zip"
 # https://github.com/projectdiscovery/tlsx
-tlsx_Ver="v1.1.1"
-tlsx_bin_amd64="tlsx_1.1.1_linux_amd64.zip"
-tlsx_bin_arm64="tlsx_1.1.1_linux_arm64.zip"
+tlsx_Ver="v1.1.4"
+tlsx_bin_amd64="tlsx_1.1.4_linux_amd64.zip"
+tlsx_bin_arm64="tlsx_1.1.4_linux_arm64.zip"
 # https://github.com/chainreactors/gogo
-gogo_Ver="v2.11.5"
+gogo_Ver="v2.11.6"
 gogo_File_amd64="gogo_linux_amd64"
 gogo_File_arm64="gogo_linux_arm64"
 # https://github.com/projectdiscovery/simplehttpserver
@@ -352,9 +352,9 @@ fd_Ver="v8.7.0"
 fd_bin_amd64="fd_8.7.0_amd64.deb"
 fd_bin_arm64="fd_8.7.0_arm64.deb"
 # https://github.com/hashicorp/terraform/releases
-Terraform_Ver="1.5.4"
-Terraform_bin_amd64="terraform_1.5.4_linux_amd64.zip"
-Terraform_bin_arm64="terraform_1.5.4_linux_arm64.zip"
+Terraform_Ver="1.5.6"
+Terraform_bin_amd64="terraform_1.5.6_linux_amd64.zip"
+Terraform_bin_arm64="terraform_1.5.6_linux_arm64.zip"
 # https://github.com/aliyun/aliyun-cli/releases
 aliyun_cli_Ver="v3.0.170"
 aliyun_cli_bin_amd64="aliyun-cli-linux-3.0.170-amd64.tgz"