Mirrors/BastilleBSD_bastille
1
0
Fork 1
mirror of https://github.com/BastilleBSD/bastille.git synced 2026-01-04 12:03:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1260 from BastilleBSD/rdr-multi

Browse Source
This commit is contained in:
tschettervictor
2025-10-07 18:11:40 -06:00
committed by GitHub
parent 19dd1c323e c628967232
commit 355dd0a436
1 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -169,8 +169,8 @@ persist_rdr_log_rule() {
load_rdr_rule() {
local inet="${1}"
local if_name="${2}"
local if="${bastille_network_pf_ext_if}"=\"${2}\"
local if_name="{ $(echo ${2} | sed 's/,/ /') }"
local if="${bastille_network_pf_ext_if}"=\"${if_name}\"
local src="${3}"
local dst="${4}"
local proto="${5}"
@@ -204,8 +204,8 @@ load_rdr_rule() {
load_rdr_log_rule() {
local inet="${1}"
local if_name="${2}"
local if="${bastille_network_pf_ext_if}"=\"${2}\"
local if_name="{ $(echo ${2} | sed 's/,/ /') }"
local if="${bastille_network_pf_ext_if}"=\"${if_name}\"
local src="${3}"
local dst="${4}"
local proto="${5}"
@@ -264,13 +264,14 @@ while [ "$#" -gt 0 ]; do
fi
;;
-i|--interface)
if ifconfig | grep -owq "${2}:"; then
OPTION_IF=1
RDR_IF="${2}"
shift 2
else
error_exit "[ERROR]: '${2}' is not a valid interface."
fi
for if in $(echo "${2}" | sed 's/,/ /'); do
if ! ifconfig | grep -owq "${if}:"; then
error_exit "[ERROR]: '${if}' is not a valid interface."
fi
done
OPTION_IF=1
RDR_IF="${2}"
shift 2
;;
-s|--source)
if echo "${2}" | grep -Eoq "([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+|.*:.*)"; then
@@ -320,7 +321,9 @@ set_target_single "${TARGET}"
while [ "$#" -gt 0 ]; do
case "${1}" in
list)
if [ "${OPTION_IF}" -eq 1 ] || [ "${OPTION_SRC}" -eq 1 ] || [ "${OPTION_DST}" -eq 1 ] || [ "${OPTION_INET_TYPE}" -eq 1 ];then
error_exit "[ERROR]: Command \"${1}\" cannot be used with options."
elif [ -n "${2}" ]; then
@@ -331,7 +334,9 @@ while [ "$#" -gt 0 ]; do
fi
shift
;;
clear)
if [ "${OPTION_IF}" -eq 1 ] || [ "${OPTION_SRC}" -eq 1 ] || [ "${OPTION_DST}" -eq 1 ] || [ "${OPTION_INET_TYPE}" -eq 1 ];then
error_exit "[ERROR]: Command \"${1}\" cannot be used with options."
elif [ -n "${2}" ]; then
@@ -342,7 +347,9 @@ while [ "$#" -gt 0 ]; do
fi
shift
;;
reset)
if [ "${OPTION_IF}" -eq 1 ] || [ "${OPTION_SRC}" -eq 1 ] || [ "${OPTION_DST}" -eq 1 ] || [ "${OPTION_INET_TYPE}" -eq 1 ];then
error_exit "[ERROR]: Command \"${1}\" cannot be used with options."
elif [ -n "${2}" ]; then
@@ -356,7 +363,9 @@ while [ "$#" -gt 0 ]; do
fi
shift
;;
tcp|udp)
if [ "$#" -lt 3 ]; then
usage
elif [ "${OPTION_SRC}" -eq 1 ] || [ "${OPTION_DST}" -eq 1 ] && [ "${OPTION_INET_TYPE}" -ne 1 ] && [ "${OPT_SRC_TABLE}" -eq 0 ];then
@@ -409,7 +418,9 @@ while [ "$#" -gt 0 ]; do
esac
fi
;;
*)
if [ "${1}" = "dual" ] || [ "${1}" = "ipv4" ] || [ "${1}" = "ipv6" ]; then
RDR_INET="${1}"
else