Mirrors/hackacad
2
0
Fork 0
mirror of https://github.com/hackacad/bastille.git synced 2025-12-22 10:10:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

rdr: fix _jail > TARGET + alphabetical option order

Browse Source
This commit is contained in:
tschettervictor
2025-01-08 10:25:15 -07:00
committed by GitHub
parent 2da817e0d4
commit eee99a3b79
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,6 +47,8 @@ EOF
}
check_jail_validity() {
# Validate jail network type and set IP4/6
if [ "$( bastille config ${TARGET} get vnet )" != 'enabled' ]; then
_ip4_interfaces="$(bastille config ${TARGET} get ip4.addr | sed 's/,/ /g')"
_ip6_interfaces="$(bastille config ${TARGET} get ip6.addr | sed 's/,/ /g')"
@@ -218,6 +220,15 @@ while [ "$#" -gt 0 ]; do
-h|--help|help)
usage
;;
-d|--destination)
if ifconfig | grep -owq "inet ${2}"; then
OPTION_DST=1
RDR_DST="${2}"
shift 2
else
error_exit "${2} is not an IP on this system."
fi
;;
-i|--interface)
if ifconfig | grep -owq "${2}:"; then
OPTION_IF=1
@@ -233,15 +244,6 @@ while [ "$#" -gt 0 ]; do
RDR_SRC="${2}"
shift 2
;;
-d|--destination)
if ifconfig | grep -owq "inet ${2}"; then
OPTION_DST=1
RDR_DST="${2}"
shift 2
else
error_exit "${2} is not an IP on this system."
fi
;;
-t|--type)
if [ "${2}" != "ipv4" ] && [ "${2}" != "ipv6" ]; then
error_exit "[-t|--type] must be [ipv4|ipv6]"
@@ -296,8 +298,8 @@ while [ "$#" -gt 0 ]; do
usage
else
check_jail_validity
echo "${_jail} redirects:"
pfctl -a "rdr/${_jail}" -Fn
echo "${TARGET} redirects:"
pfctl -a "rdr/${TARGET}" -Fn
fi
shift
;;
@@ -308,10 +310,10 @@ while [ "$#" -gt 0 ]; do
usage
else
check_jail_validity
echo "${_jail} redirects:"
pfctl -a "rdr/${_jail}" -Fn
echo "${TARGET} redirects:"
pfctl -a "rdr/${TARGET}" -Fn
if rm -f "${bastille_jailsdir}/${_jail}/rdr.conf"; then
info "[${_jail}]: rdr.conf removed"
info "[${TARGET}]: rdr.conf removed"
fi
fi
shift