新增对 Typhon 和 Fenjing 工具的安装函数，并优化相关安装逻辑

Author: No-Github

f8x

@@ -861,6 +861,12 @@ Install_Switch7(){
 
 }
 
+Install_Switch8(){
+
+    pipx install $1 $1 1> /dev/null 2>> /tmp/f8x_error.log && Echo_INFOR "Successfully installed $1 (python3 pipx)" && return 0 || { Echo_ERROR "$1 module installation failed"; return 1; }
+
+}
+
 # ===================== Proxy Switch =====================
 Proxy_Switch(){
 
@@ -2571,6 +2577,8 @@ pyenv_Install(){
                     ;;
                 *) ;;
             esac
+
+            Install_Switch "pipx"
         fi
     fi
 
@@ -2584,6 +2592,7 @@ Python3_def_Install(){
         *"CentOS"*|*"RedHat"*|*"Fedora"*|*"AlmaLinux"*|*"VzLinux"*|*"Rocky"*)
             Install_Switch "python3-devel"
             Install_Switch "python3-pip"
+            Install_Switch "pipx"
             python3 -m pip install --upgrade pip > /dev/null 2>&1 && Echo_INFOR "Updated python3-pip" || Echo_ERROR "Update python3-pip failed"
 
             Install_Switch4 "setuptools"
@@ -2595,6 +2604,7 @@ Python3_def_Install(){
             Install_Switch "python3-pip"
             Install_Switch "python3-venv"
             Install_Switch "python3-distutils"
+            Install_Switch "pipx"
             python3 -m pip install --upgrade pip > /dev/null 2>&1 && Echo_INFOR "Updated python3-pip" || Echo_ERROR "Update python3-pip failed"
             ;;
         *"Ubuntu"*)
@@ -2603,6 +2613,7 @@ Python3_def_Install(){
             Install_Switch "python3-pip"
             Install_Switch "python3-venv"
             Install_Switch "python3-distutils"
+            Install_Switch "pipx"
             case $Linux_Version_Num in
                 "16.04")
                     mkdir -p /tmp/get-pip && cd /tmp/get-pip && rm -rf get-pip.py && $Proxy_OK wget https://bootstrap.pypa.io/pip/3.5/get-pip.py > /dev/null 2>&1

f8x-ctf

@@ -92,6 +92,34 @@ CTF_flask-session-cookie-manager_install(){
 
 }
 
+CTF_Typhon_install(){
+
+    name="Typhon"
+    dir="$P_Dir/Typhon"
+
+    if test -d $dir
+    then
+        Echo_ALERT "$name is already installed in $dir"
+    else
+        $Proxy_OK git clone --depth 1 ${GitProxy}https://github.com/Team-intN18-SoybeanSeclab/Typhon.git $dir > /dev/null 2>&1
+        cd $dir && Echo_INFOR "Successfully installed $name in the $dir" || Echo_ERROR3
+    fi
+
+}
+
+CTF_Fenjing_install(){
+
+    name="Fenjing"
+    which Fenjing > /dev/null 2>&1
+    if [ $? -eq 0 ]
+    then
+        Echo_ALERT "$name installed"
+    else
+        Install_Switch8 "Fenjing"
+    fi
+
+}
+
 Pentest_redis-ssrf_Install(){
 
     name="redis-ssrf"
@@ -717,8 +745,7 @@ CTF_PWN_pwndbg_install(){
 
     #     $Proxy_OK curl -o install.sh -qsL 'https://install.pwndbg.re'
     #     $Proxy_OK bash -xv install.sh -t pwndbg-gdb
-
-    # fi
+    fi
 
 }
 
@@ -871,6 +898,10 @@ CTF_WEB_tools(){
     Pentest_redis_lua_exploit_Install
     echo -e "\033[1;33m\n>> Installing redis-ssrf\n\033[0m"
     Pentest_redis-ssrf_Install
+    echo -e "\033[1;33m\n>> Installing Typhon\n\033[0m"
+    CTF_Typhon_install
+    echo -e "\033[1;33m\n>> Installing Fenjing\n\033[0m"
+    CTF_Fenjing_install
 
 }