Skip to content

Commit

Permalink
update(2023/08/02)
Browse files Browse the repository at this point in the history
  • Loading branch information
@No-Github
No-Github committed Aug 2, 2023
1 parent d8dcf5d commit 6d62e63
Show file tree
Hide file tree
Showing 2 changed files with 81 additions and 71 deletions.
86 changes: 48 additions & 38 deletions f8x
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Proxy_OK=
Docker_OK=
error=0
Linux_architecture_Name=
F8x_Version="1.6.7 Dev(2023/07/18)"
F8x_Version="1.6.7 Dev(2023/08/02)"
wget_option="-q --show-progress"

# ===================== Software version variable setting (dev) =====================
Expand Down Expand Up @@ -65,11 +65,11 @@ ttyd_Ver="1.7.3"
ttyd_bin_amd64="ttyd.x86_64"
ttyd_bin_arm64="ttyd.arm"
# https://github.com/coder/code-server
code_server_Ver="v4.14.1"
code_server_bin1_amd64="code-server-4.14.1-amd64.rpm"
code_server_bin2_amd64="code-server_4.14.1_amd64.deb"
code_server_bin1_arm64="code-server-4.14.1-arm64.rpm"
code_server_bin2_arm64="code-server_4.14.1_arm64.deb"
code_server_Ver="v4.16.1"
code_server_bin1_amd64="code-server-4.16.1-amd64.rpm"
code_server_bin2_amd64="code-server_4.16.1_amd64.deb"
code_server_bin1_arm64="code-server-4.16.1-arm64.rpm"
code_server_bin2_arm64="code-server_4.16.1_arm64.deb"
# https://www.python.org/downloads/
py37_ver="3.7.12"
py37_bin="Python-3.7.12.tar.xz"
Expand All @@ -92,11 +92,11 @@ phantomjs_dir="phantomjs-2.1.1-linux-x86_64"

# ===================== Software version variable setting (pentest) =====================
# https://github.com/fatedier/frp/releases
frp_Ver="v0.51.0"
frp_File_amd64="frp_0.51.0_linux_amd64.tar.gz"
frp_File_arm64="frp_0.51.0_linux_arm64.tar.gz"
frp_Dir_amd64="frp_0.51.0_linux_amd64"
frp_Dir_arm64="frp_0.51.0_linux_arm64"
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"
# https://github.com/ehang-io/nps/releases
nps_Ver="v0.26.10"
nps_File_amd64="linux_amd64_server.tar.gz"
Expand Down Expand Up @@ -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.9"
Nuclei_Install_amd64="nuclei_2.9.9_linux_amd64.zip"
Nuclei_Install_arm64="nuclei_2.9.9_linux_arm64.zip"
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"
# https://github.com/Ne0nd0g/merlin/releases
merlin_Ver="v1.5.0"
merlin_Install_amd64="merlinServer-Linux-x64.7z"
Expand Down Expand Up @@ -164,15 +164,15 @@ mitmproxy_bin="mitmproxy-9.0.1-linux.tar.gz"
naabu_Ver="v2.1.5"
naabu_bin="naabu_2.1.5_linux_amd64.zip"
# https://github.com/projectdiscovery/proxify/releases
proxify_Ver="v0.0.9"
proxify_bin_amd64="proxify_0.0.9_linux_amd64.zip"
proxify_bin_arm64="proxify_0.0.9_linux_arm64.zip"
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"
# https://github.com/hashcat/hashcat/releases
hashcat_Version="hashcat-6.2.6"
# https://github.com/projectdiscovery/subfinder/releases
subfinder_Ver="v2.6.0"
subfinder_bin_amd64="subfinder_2.6.0_linux_amd64.zip"
subfinder_bin_arm64="subfinder_2.6.0_linux_arm64.zip"
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"
# https://github.com/projectdiscovery/httpx/releases
httpx_Ver="v1.3.3"
httpx_bin_amd64="httpx_1.3.3_linux_amd64.zip"
Expand All @@ -190,8 +190,8 @@ dnsx_Ver="v1.1.4"
dnsx_bin_amd64="dnsx_1.1.4_linux_amd64.zip"
dnsx_bin_arm64="dnsx_1.1.4_linux_arm64.zip"
# https://github.com/iBotPeaches/Apktool/releases
apktool_Ver="v2.8.0"
apktool_bin="apktool_2.8.0.jar"
apktool_Ver="v2.8.1"
apktool_bin="apktool_2.8.1.jar"
# https://github.com/lc/gau/releases
gau_Ver="v2.1.2"
gau_bin="gau_2.1.2_linux_amd64.tar.gz"
Expand Down Expand Up @@ -220,7 +220,7 @@ Platypus_Ver="v1.5.1"
Platypus_bin_amd64="Platypus_linux_amd64"
Platypus_bin_arm64="Platypus_linux_arm64"
# https://github.com/OWASP/Amass/releases
Amass_Ver="v3.23.2"
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
Expand Down Expand Up @@ -299,9 +299,9 @@ cf_Install_arm64="cf_v0.5.0_linux_arm64.tar.gz"
ysuserial_Ver="v1.5"
ysuserial_bin="ysuserial-1.5-su18-all.jar"
# https://github.com/projectdiscovery/katana
katana_Ver="v1.0.2"
katana_bin_amd64="katana_1.0.2_linux_amd64.zip"
katana_bin_arm64="katana_1.0.2_linux_arm64.zip"
katana_Ver="v1.0.3"
katana_bin_amd64="katana_1.0.3_linux_amd64.zip"
katana_bin_arm64="katana_1.0.3_linux_arm64.zip"
# https://github.com/projectdiscovery/uncover
uncover_Ver="v0.0.9"
uncover_bin_amd64="uncover_0.0.9_linux_amd64.zip"
Expand All @@ -319,7 +319,7 @@ 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"
# https://github.com/chainreactors/gogo
gogo_Ver="v2.11.4"
gogo_Ver="v2.11.5"
gogo_File_amd64="gogo_linux_amd64"
gogo_File_arm64="gogo_linux_arm64"
# https://github.com/projectdiscovery/simplehttpserver
Expand All @@ -343,7 +343,7 @@ alterx_bin_arm64="alterx_0.0.2_linux_arm64.zip"

# ===================== Software version variable setting (other) =====================
# https://github.com/AdguardTeam/AdGuardHome/releases
AdGuardHome_Version="v0.107.34"
AdGuardHome_Version="v0.107.35"
AdGuardHome_File_amd64="AdGuardHome_linux_amd64.tar.gz"
AdGuardHome_File_arm64="AdGuardHome_linux_arm64.tar.gz"
# https://github.com/junegunn/fzf/releases
Expand Down Expand Up @@ -380,13 +380,13 @@ 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.3"
Terraform_bin_amd64="terraform_1.5.3_linux_amd64.zip"
Terraform_bin_arm64="terraform_1.5.3_linux_arm64.zip"
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"
# https://github.com/aliyun/aliyun-cli/releases
aliyun_cli_Ver="v3.0.169"
aliyun_cli_bin_amd64="aliyun-cli-linux-3.0.169-amd64.tgz"
aliyun_cli_bin_arm64="aliyun-cli-linux-3.0.169-arm64.tgz"
aliyun_cli_Ver="v3.0.170"
aliyun_cli_bin_amd64="aliyun-cli-linux-3.0.170-amd64.tgz"
aliyun_cli_bin_arm64="aliyun-cli-linux-3.0.170-arm64.tgz"
# https://github.com/bcicen/ctop/releases/
ctop_Ver="v0.7.7"
ctop_bin_amd64="ctop-0.7.7-linux-amd64"
Expand Down Expand Up @@ -4703,7 +4703,9 @@ Pentest_pypykatz_Install(){
# ===================== Install CrackMapExec =====================
Pentest_CrackMapExec_Install(){

# https://wiki.porchetta.industries/getting-started/installation/installation-on-unix
name="CrackMapExec"
# dir="$P_Dir/CrackMapExec"
which crackmapexec > /dev/null 2>&1

if [ $? == 0 ]
Expand All @@ -4713,6 +4715,11 @@ Pentest_CrackMapExec_Install(){
Install_Switch5 "pipx"
pipx ensurepath
pipx install crackmapexec

# 这个版本使用有些 bug,还是先安装旧版本
#$Proxy_OK git clone --depth 1 ${GitProxy}https://github.com/mpgn/CrackMapExec $dir > /dev/null 2>&1 && Echo_INFOR "Downloaded $name in the $dir" || Echo_ERROR2
#cd CrackMapExec
#$Proxy_OK pipx install .
fi

}
Expand Down Expand Up @@ -8069,12 +8076,14 @@ sliver-server_Install(){
Rm_Lock
case $Linux_Version in
*"CentOS"*|*"RedHat"*|*"Fedora"*|*"AlmaLinux"*|*"VzLinux"*|*"Rocky"*)
Install_Switch "git"
Install_Switch "gcc"
Install_Switch "gcc-c++"
Install_Switch "make"
Install_Switch "mingw64-gcc"
;;
*"Kali"*|*"Ubuntu"*|*"Debian"*)
Install_Switch "git"
Install_Switch "build-essential"
Install_Switch "mingw-w64"
Install_Switch "binutils-mingw-w64"
Expand Down Expand Up @@ -8120,11 +8129,12 @@ EOF

USER_DIRS=(/home/*)
for USER_DIR in "${USER_DIRS[@]}"; do
USER=$(basename $USER_DIR)
if id -u $USER >/dev/null 2>&1; then
USER=$(basename "$USER_DIR")
if id -u "$USER" >/dev/null 2>&1; then
Echo_INFOR "Generating operator configs for user $USER..."
mkdir -p $USER_DIR/.sliver-client/configs
/root/sliver-server operator --name $USER --lhost localhost --save $USER_DIR/.sliver-client/configs
chown -R $USER:$USER $USER_DIR/.sliver-client/
/root/sliver-server operator --name "$USER" --lhost localhost --save "$USER_DIR/.sliver-client/configs"
chown -R "$USER":"$(id -gn "$USER")" "$USER_DIR/.sliver-client/"
fi
done

Expand Down
66 changes: 33 additions & 33 deletions f8x_version.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ ttyd_Ver="1.7.3"
ttyd_bin_amd64="ttyd.x86_64"
ttyd_bin_arm64="ttyd.arm"
# https://github.com/coder/code-server
code_server_Ver="v4.14.1"
code_server_bin1_amd64="code-server-4.14.1-amd64.rpm"
code_server_bin2_amd64="code-server_4.14.1_amd64.deb"
code_server_bin1_arm64="code-server-4.14.1-arm64.rpm"
code_server_bin2_arm64="code-server_4.14.1_arm64.deb"
code_server_Ver="v4.16.1"
code_server_bin1_amd64="code-server-4.16.1-amd64.rpm"
code_server_bin2_amd64="code-server_4.16.1_amd64.deb"
code_server_bin1_arm64="code-server-4.16.1-arm64.rpm"
code_server_bin2_arm64="code-server_4.16.1_arm64.deb"
# https://www.python.org/downloads/
py37_ver="3.7.12"
py37_bin="Python-3.7.12.tar.xz"
Expand All @@ -64,11 +64,11 @@ phantomjs_dir="phantomjs-2.1.1-linux-x86_64"

# ===================== Software version variable setting (pentest) =====================
# https://github.com/fatedier/frp/releases
frp_Ver="v0.51.0"
frp_File_amd64="frp_0.51.0_linux_amd64.tar.gz"
frp_File_arm64="frp_0.51.0_linux_arm64.tar.gz"
frp_Dir_amd64="frp_0.51.0_linux_amd64"
frp_Dir_arm64="frp_0.51.0_linux_arm64"
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"
# https://github.com/ehang-io/nps/releases
nps_Ver="v0.26.10"
nps_File_amd64="linux_amd64_server.tar.gz"
Expand Down Expand Up @@ -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.9"
Nuclei_Install_amd64="nuclei_2.9.9_linux_amd64.zip"
Nuclei_Install_arm64="nuclei_2.9.9_linux_arm64.zip"
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"
# https://github.com/Ne0nd0g/merlin/releases
merlin_Ver="v1.5.0"
merlin_Install_amd64="merlinServer-Linux-x64.7z"
Expand Down Expand Up @@ -136,15 +136,15 @@ mitmproxy_bin="mitmproxy-9.0.1-linux.tar.gz"
naabu_Ver="v2.1.5"
naabu_bin="naabu_2.1.5_linux_amd64.zip"
# https://github.com/projectdiscovery/proxify/releases
proxify_Ver="v0.0.9"
proxify_bin_amd64="proxify_0.0.9_linux_amd64.zip"
proxify_bin_arm64="proxify_0.0.9_linux_arm64.zip"
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"
# https://github.com/hashcat/hashcat/releases
hashcat_Version="hashcat-6.2.6"
# https://github.com/projectdiscovery/subfinder/releases
subfinder_Ver="v2.6.0"
subfinder_bin_amd64="subfinder_2.6.0_linux_amd64.zip"
subfinder_bin_arm64="subfinder_2.6.0_linux_arm64.zip"
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"
# https://github.com/projectdiscovery/httpx/releases
httpx_Ver="v1.3.3"
httpx_bin_amd64="httpx_1.3.3_linux_amd64.zip"
Expand All @@ -162,8 +162,8 @@ dnsx_Ver="v1.1.4"
dnsx_bin_amd64="dnsx_1.1.4_linux_amd64.zip"
dnsx_bin_arm64="dnsx_1.1.4_linux_arm64.zip"
# https://github.com/iBotPeaches/Apktool/releases
apktool_Ver="v2.8.0"
apktool_bin="apktool_2.8.0.jar"
apktool_Ver="v2.8.1"
apktool_bin="apktool_2.8.1.jar"
# https://github.com/lc/gau/releases
gau_Ver="v2.1.2"
gau_bin="gau_2.1.2_linux_amd64.tar.gz"
Expand Down Expand Up @@ -192,7 +192,7 @@ Platypus_Ver="v1.5.1"
Platypus_bin_amd64="Platypus_linux_amd64"
Platypus_bin_arm64="Platypus_linux_arm64"
# https://github.com/OWASP/Amass/releases
Amass_Ver="v3.22.2"
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
Expand Down Expand Up @@ -271,9 +271,9 @@ cf_Install_arm64="cf_v0.5.0_linux_arm64.tar.gz"
ysuserial_Ver="v1.5"
ysuserial_bin="ysuserial-1.5-su18-all.jar"
# https://github.com/projectdiscovery/katana
katana_Ver="v1.0.2"
katana_bin_amd64="katana_1.0.2_linux_amd64.zip"
katana_bin_arm64="katana_1.0.2_linux_arm64.zip"
katana_Ver="v1.0.3"
katana_bin_amd64="katana_1.0.3_linux_amd64.zip"
katana_bin_arm64="katana_1.0.3_linux_arm64.zip"
# https://github.com/projectdiscovery/uncover
uncover_Ver="v0.0.9"
uncover_bin_amd64="uncover_0.0.9_linux_amd64.zip"
Expand All @@ -291,7 +291,7 @@ 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"
# https://github.com/chainreactors/gogo
gogo_Ver="v2.11.4"
gogo_Ver="v2.11.5"
gogo_File_amd64="gogo_linux_amd64"
gogo_File_arm64="gogo_linux_arm64"
# https://github.com/projectdiscovery/simplehttpserver
Expand All @@ -315,7 +315,7 @@ alterx_bin_arm64="alterx_0.0.2_linux_arm64.zip"

# ===================== Software version variable setting (other) =====================
# https://github.com/AdguardTeam/AdGuardHome/releases
AdGuardHome_Version="v0.107.34"
AdGuardHome_Version="v0.107.35"
AdGuardHome_File_amd64="AdGuardHome_linux_amd64.tar.gz"
AdGuardHome_File_arm64="AdGuardHome_linux_arm64.tar.gz"
# https://github.com/junegunn/fzf/releases
Expand Down Expand Up @@ -352,13 +352,13 @@ 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.3"
Terraform_bin_amd64="terraform_1.5.3_linux_amd64.zip"
Terraform_bin_arm64="terraform_1.5.3_linux_arm64.zip"
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"
# https://github.com/aliyun/aliyun-cli/releases
aliyun_cli_Ver="v3.0.169"
aliyun_cli_bin_amd64="aliyun-cli-linux-3.0.169-amd64.tgz"
aliyun_cli_bin_arm64="aliyun-cli-linux-3.0.169-arm64.tgz"
aliyun_cli_Ver="v3.0.170"
aliyun_cli_bin_amd64="aliyun-cli-linux-3.0.170-amd64.tgz"
aliyun_cli_bin_arm64="aliyun-cli-linux-3.0.170-arm64.tgz"
# https://github.com/bcicen/ctop/releases/
ctop_Ver="v0.7.7"
ctop_bin_amd64="ctop-0.7.7-linux-amd64"
Expand Down

0 comments on commit 6d62e63

Please sign in to comment.