Alex-Devera/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2025-08-30 23:06:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Apply suggestions from code review

Browse source 
Small fixes

Co-authored-by: Hamidreza <70919649+hamid-gh98@users.noreply.github.com>
This commit is contained in:
somebodywashere 2023-06-18 20:52:56 +03:00 committed by GitHub
parent dac1e441c2
commit bc9e8949d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
x-ui.sh
View file

@ -704,18 +704,17 @@ install_iplimit() {
if ! command -v fail2ban-client &>/dev/null; then if ! command -v fail2ban-client &>/dev/null; then
echo -e "${green}Fail2ban is not installed. Installing now...!${plain}\n" echo -e "${green}Fail2ban is not installed. Installing now...!${plain}\n"
# Check the OS and install necessary packages # Check the OS and install necessary packages
if [[ "$(cat /etc/os-release | grep -E '^ID=' | awk -F '=' '{print $2}')" == "ubuntu" ]]; then case "${release}" in
sudo apt-get update && sudo apt-get install fail2ban -y ubuntu|debian)
elif [[ "$(cat /etc/os-release | grep -E '^ID=' | awk -F '=' '{print $2}')" == "debian" ]]; then sudo apt-get update && sudo apt-get install fail2ban -y ;;
sudo apt-get update && sudo apt-get install fail2ban -y centos)
elif [[ "$(cat /etc/os-release | grep -E '^ID=' | awk -F '=' '{print $2}')" == "fedora" ]]; then sudo yum -y update && sudo yum -y install fail2ban ;;
sudo dnf -y update && sudo dnf -y install fail2ban fedora)
elif [[ "$(cat /etc/os-release | grep -E '^ID=' | awk -F '=' '{print $2}')" == "centos" ]]; then sudo dnf -y update && sudo dnf -y install fail2ban ;;
sudo yum -y update && sudo yum -y install fail2ban *)
else echo -e "${red}Unsupported operating system. Please check the script and install the necessary packages manually.${plain}\n"
echo -e "${red}Unsupported operating system. Please check the script and install the necessary packages manually.${plain}\n" exit 1 ;;
exit 1 esac
fi
echo -e "${green}Fail2ban installed successfully!${plain}\n" echo -e "${green}Fail2ban installed successfully!${plain}\n"
else else
echo -e "${yellow}Fail2ban is already installed.${plain}\n" echo -e "${yellow}Fail2ban is already installed.${plain}\n"
@ -724,7 +723,7 @@ install_iplimit() {
echo -e "${green}Configuring IP Limit...${plain}\n" echo -e "${green}Configuring IP Limit...${plain}\n"
#Check if jail.local exists #Check if jail.local exists
if ! test -f "/etc/fail2ban/jail.local"; then if ! test -f "/etc/fail2ban/jail.local"; then
if test -f "/etc/fail2ban/jail.conf" if test -f "/etc/fail2ban/jail.conf"; then
sudo cp /etc/fail2ban/jail.conf /etc/fail2ban/jail.local sudo cp /etc/fail2ban/jail.conf /etc/fail2ban/jail.local
else else
echo -e "${red}File /etc/fail2ban/jail.conf not found! Probably there is something wrong with your Fail2ban installation.\nInstallation of IP Limit failed.${plain}\n" echo -e "${red}File /etc/fail2ban/jail.conf not found! Probably there is something wrong with your Fail2ban installation.\nInstallation of IP Limit failed.${plain}\n"
@ -734,7 +733,7 @@ install_iplimit() {
#Check if [3x-ipl] jail exists #Check if [3x-ipl] jail exists
if grep -qw '3x-ipl' /etc/fail2ban/jail.local; then if grep -qw '3x-ipl' /etc/fail2ban/jail.local; then
if test -f "/etc/fail2ban/jail.conf" if test -f "/etc/fail2ban/jail.conf"; then
sudo cp /etc/fail2ban/jail.conf /etc/fail2ban/jail.local sudo cp /etc/fail2ban/jail.conf /etc/fail2ban/jail.local
else else
echo -e "${red}Found leftovers of previously installed IP Limit, but there's no jail.conf! Probably there is something wrong with your Fail2ban installation.\nInstallation of IP Limit failed.${plain}\n" echo -e "${red}Found leftovers of previously installed IP Limit, but there's no jail.conf! Probably there is something wrong with your Fail2ban installation.\nInstallation of IP Limit failed.${plain}\n"
@ -791,7 +790,7 @@ remove_iplimit(){
1) 1)
rm -f /etc/fail2ban/filter.d/3x-ipl.conf rm -f /etc/fail2ban/filter.d/3x-ipl.conf
rm -f /etc/fail2ban/action.d/3x-ipl.conf rm -f /etc/fail2ban/action.d/3x-ipl.conf
if test -f "/etc/fail2ban/jail.conf" if test -f "/etc/fail2ban/jail.conf"; then
sudo cp /etc/fail2ban/jail.conf /etc/fail2ban/jail.local sudo cp /etc/fail2ban/jail.conf /etc/fail2ban/jail.local
else else
echo -e "${red}File /etc/fail2ban/jail.conf not found! Please remove [3x-ipl] jail manually from /etc/fail2ban/jail.local.${plain}\n" echo -e "${red}File /etc/fail2ban/jail.conf not found! Please remove [3x-ipl] jail manually from /etc/fail2ban/jail.local.${plain}\n"
@ -804,23 +803,22 @@ remove_iplimit(){
rm -f /etc/fail2ban/action.d/3x-ipl.conf rm -f /etc/fail2ban/action.d/3x-ipl.conf
sudo systemctl stop fail2ban sudo systemctl stop fail2ban
sudo systemctl disable fail2ban sudo systemctl disable fail2ban
if [[ "$(cat /etc/os-release | grep -E '^ID=' | awk -F '=' '{print $2}')" == "ubuntu" ]]; then case "${release}" in
sudo apt-get remove fail2ban -y ubuntu|debian)
elif [[ "$(cat /etc/os-release | grep -E '^ID=' | awk -F '=' '{print $2}')" == "debian" ]]; then sudo apt-get remove fail2ban -y ;;
sudo apt-get remove fail2ban -y centos)
elif [[ "$(cat /etc/os-release | grep -E '^ID=' | awk -F '=' '{print $2}')" == "fedora" ]]; then sudo yum -y remove fail2ban ;;
sudo dnf -y remove fail2ban fedora)
elif [[ "$(cat /etc/os-release | grep -E '^ID=' | awk -F '=' '{print $2}')" == "centos" ]]; then sudo dnf -y remove fail2ban ;;
sudo yum -y remove fail2ban *)
else echo -e "${red}Unsupported operating system. Please uninstall Fail2ban manually.${plain}\n"
echo -e "${red}Unsupported operating system. Please uninstall Fail2ban manually.${plain}\n" exit 1 ;;
exit 1 esac
fi
echo -e "${green}Fail2ban and IP Limit removed successfully!${plain}\n" echo -e "${green}Fail2ban and IP Limit removed successfully!${plain}\n"
before_show_menu ;; before_show_menu ;;
*) *)
echo -e "${yellow}Cancelled.${plain}\n" echo -e "${yellow}Cancelled.${plain}\n"
show_menu ;; iplimit_main ;;
esac esac
} }