Mirrors/hackacad
2
0
Fork 0
mirror of https://github.com/hackacad/bastille.git synced 2026-01-05 20:24:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
tschettervictor
2024-12-16 23:00:20 -07:00
committed by GitHub
parent 2669d8126b
commit fd4c5111b5
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
usr/local/share/bastille/rdr.sh
View File

@@ -225,7 +225,6 @@ load_rdr_log_rule() {
RDR_IF="$(grep "^[[:space:]]*${bastille_network_pf_ext_if}[[:space:]]*=" ${bastille_pf_conf} | awk -F'"' '{print $2}')" RDR_IF="$(grep "^[[:space:]]*${bastille_network_pf_ext_if}[[:space:]]*=" ${bastille_pf_conf} | awk -F'"' '{print $2}')"
RDR_SRC="any" RDR_SRC="any"
RDR_DST="any" RDR_DST="any"
OPTION="0"
RDR_INET="dual" RDR_INET="dual"
OPTION_IF=0 OPTION_IF=0
OPTION_SRC=0 OPTION_SRC=0
@@ -260,7 +259,7 @@ while [ "$#" -gt 0 ]; do
if [ -z "${2}" ] || [ -z "${3}" ]; then if [ -z "${2}" ] || [ -z "${3}" ]; then
usage usage
elif ifconfig | grep -owq "inet ${2}"; then elif ifconfig | grep -owq "inet ${2}"; then
OPTION_DST=1 OPTION_DST=1
RDR_DST="${2}" RDR_DST="${2}"
shift 2 shift 2
else else
@@ -279,9 +278,9 @@ while [ "$#" -gt 0 ]; do
fi fi
;; ;;
list) list)
if [ "${OPTION_IF}" -eq 1 ] || [ "${OPTION_SRC}" -eq 1 ] || [ "${OPTION_DST}" -eq 1 ] || [ "${OPTION_INET_TYPE}" -eq 1 ];then if [ "${OPTION_IF}" -eq 1 ] || [ "${OPTION_SRC}" -eq 1 ] || [ "${OPTION_DST}" -eq 1 ] || [ "${OPTION_INET_TYPE}" -eq 1 ]; then
error_exit "Command \"${1}\" cannot be used with options." error_exit "Command \"${1}\" cannot be used with options."
elif [ -n "${2}" ]; then elif [ -n "${2}" ]; then
usage usage
elif [ "${TARGET}" = 'ALL' ]; then elif [ "${TARGET}" = 'ALL' ]; then
for JAIL_NAME in $(ls "${bastille_jailsdir}" | sed "s/\n//g"); do for JAIL_NAME in $(ls "${bastille_jailsdir}" | sed "s/\n//g"); do
@@ -295,7 +294,7 @@ while [ "$#" -gt 0 ]; do
shift shift
;; ;;
clear) clear)
if [ "${OPTION_IF}" -eq 1 ] || [ "${OPTION_SRC}" -eq 1 ] || [ "${OPTION_DST}" -eq 1 ] || [ "${OPTION_INET_TYPE}" -eq 1 ];then if [ "${OPTION_IF}" -eq 1 ] || [ "${OPTION_SRC}" -eq 1 ] || [ "${OPTION_DST}" -eq 1 ] || [ "${OPTION_INET_TYPE}" -eq 1 ]; then
error_exit "Command \"${1}\" cannot be used with options." error_exit "Command \"${1}\" cannot be used with options."
elif [ -n "${2}" ]; then elif [ -n "${2}" ]; then
usage usage
@@ -311,7 +310,7 @@ while [ "$#" -gt 0 ]; do
shift shift
;; ;;
reset) reset)
if [ "${OPTION_IF}" -eq 1 ] || [ "${OPTION_SRC}" -eq 1 ] || [ "${OPTION_DST}" -eq 1 ] || [ "${OPTION_INET_TYPE}" -eq 1 ];then if [ "${OPTION_IF}" -eq 1 ] || [ "${OPTION_SRC}" -eq 1 ] || [ "${OPTION_DST}" -eq 1 ] || [ "${OPTION_INET_TYPE}" -eq 1 ]; then
error_exit "Command \"${1}\" cannot be used with options." error_exit "Command \"${1}\" cannot be used with options."
elif [ -n "${2}" ]; then elif [ -n "${2}" ]; then
usage usage
@@ -335,7 +334,7 @@ while [ "$#" -gt 0 ]; do
tcp|udp) tcp|udp)
if [ $# -lt 3 ]; then if [ $# -lt 3 ]; then
usage usage
elif [ "${OPTION_SRC}" -eq 1 ] || [ "${OPTION_DST}" -eq 1 ] && [ "${OPTION_INET_TYPE}" -ne 1 ];then elif [ "${OPTION_SRC}" -eq 1 ] || [ "${OPTION_DST}" -eq 1 ] && [ "${OPTION_INET_TYPE}" -ne 1 ]; then
error_exit "[-t|--type] must be set when using [-s|--source] or [-d|--destination]" error_exit "[-t|--type] must be set when using [-s|--source] or [-d|--destination]"
elif [ $# -eq 3 ]; then elif [ $# -eq 3 ]; then
check_jail_validity check_jail_validity