diff options
| author | Simon Rettberg | 2021-02-23 11:35:36 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2021-02-23 11:35:36 +0100 |
| commit | 54aa004fbabb95f331d0863d4eb19870b0b0c87f (patch) | |
| tree | b571ccc779c3a6c282ad9c3ab84d8e52d480e234 | |
| parent | [run-virt] Add LDAP servers to firewall exceptions (diff) | |
| download | mltk-54aa004fbabb95f331d0863d4eb19870b0b0c87f.tar.gz mltk-54aa004fbabb95f331d0863d4eb19870b0b0c87f.tar.xz mltk-54aa004fbabb95f331d0863d4eb19870b0b0c87f.zip | |
[run-virt] set-firewall: Support port in add_ips, add conntrack RELATED
| -rw-r--r-- | core/modules/run-virt/data/opt/openslx/vmchooser/scripts/set-firewall | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/scripts/set-firewall b/core/modules/run-virt/data/opt/openslx/vmchooser/scripts/set-firewall index 5283927a..96256515 100644 --- a/core/modules/run-virt/data/opt/openslx/vmchooser/scripts/set-firewall +++ b/core/modules/run-virt/data/opt/openslx/vmchooser/scripts/set-firewall @@ -31,8 +31,8 @@ for TOOL in iptables ip6tables; do if ! $TOOL -w -C FORWARD -o br0 -j runvirt-OUTPUT; then $TOOL -w -A FORWARD -o br0 -j runvirt-OUTPUT fi - $TOOL -A runvirt-INPUT -m conntrack --ctstate ESTABLISHED -j ACCEPT - $TOOL -A runvirt-OUTPUT -m conntrack --ctstate ESTABLISHED -j ACCEPT + $TOOL -A runvirt-INPUT -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT + $TOOL -A runvirt-OUTPUT -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT done declare -rg AUTORULES=$(mktemp) @@ -55,10 +55,17 @@ parse_uri () { add_ips () { # add_ips "IN/OUT" "IP1 IP2 IPn" "PORT" "ACCEPT/REJECT" - local IP - [ -z "$1" -o -z "$2" -o -z "$3" -o -z "$4" ] && return 1 - for IP in $2; do - echo "$1 $IP $3 $4" >> "${AUTORULES}" + local ip port port_def + port_def="$3" + [ -z "$1" -o -z "$2" -o -z "$port_def" -o -z "$4" ] && return 1 + for ip in $2; do + port="${ip#*:}" + if (( port > 0 && port < 65536 )); then + ip="${ip%:*}" + else + port="$port_def" + fi + echo "$1 ${ip} ${port} $4" >> "${AUTORULES}" done } |