mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-02-27 04:41:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

rc.scripts: prevent service binding on '0' addresses

Browse Source
This commit is contained in:
bergware
2023-10-16 11:04:30 +02:00
parent e7abf704c5
commit 9f65dedda9
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
etc/rc.d/rc.library.source
View File

@@ -199,10 +199,10 @@ check(){
[[ ${NET:0:2} == wg && $(grep -Pom1 '^TYPE:1="\K[^"]+' $WIREGUARD/$NET.cfg) == 8 ]] && continue
NET1=$(sub ${NET[1]})
if [[ "avahi show" =~ "$CALLER" ]]; then
[[ -n $NET && -n $NET1 && -z $(good $NET $NET1) ]] && BIND+=($NET)
[[ -n $NET1 ]] && IPV4=yes NETS+=($NET1)
[[ -n $NET && -n $NET1 && $NET != '0' && $NET1 != '0' && -z $(good $NET $NET1) ]] && BIND+=($NET)
[[ -n $NET1 && $NET1 != '0' ]] && IPV4=yes NETS+=($NET1)
else
[[ -n $NET1 && -z $(good $NET1) ]] && IPV4=yes BIND+=($NET1)
[[ -n $NET1 && $NET1 != '0' && -z $(good $NET1) ]] && IPV4=yes BIND+=($NET1)
fi
done <<< $(ip -br -4 addr show scope global | awk '/^(br|bond|eth|wg)[0-9]+(\.[0-9]+)?/ {print $1,$3}' | sort)
# active IPV6 interfaces (including wireguard)
@@ -215,10 +215,10 @@ check(){
[[ ${NET:0:2} == wg && $(grep -Pom1 '^TYPE:1="\K[^"]+' $WIREGUARD/$NET.cfg) == 8 ]] && continue
NET1=$(sub $(main ${NET[@]}))
if [[ "avahi show" =~ "$CALLER" ]]; then
[[ -n $NET && -n $NET1 && -z $(good $NET $NET1) ]] && BIND+=($NET)
[[ -n $NET1 ]] && IPV6=yes NETS+=($NET1)
[[ -n $NET && -n $NET1 && $NET != '0' && $NET1 != '0' && -z $(good $NET $NET1) ]] && BIND+=($NET)
[[ -n $NET1 && $NET1 != '0' ]] && IPV6=yes NETS+=($NET1)
else
[[ -z $DENY6 && -n $NET1 && -z $(good $NET1) ]] && IPV6=yes BIND+=($NET1)
[[ -z $DENY6 && -n $NET1 && $NET1 != '0' && -z $(good $NET1) ]] && IPV6=yes BIND+=($NET1)
fi
done <<< $(ip -br -6 addr show scope global | awk '/^(br|bond|eth|wg)[0-9]+(\.[0-9]+)?/{$2="";print}' | sort)
# add loopback interface

4
etc/rc.d/rc.ntpd
View File

@@ -34,8 +34,8 @@ ntpd_build(){
[[ $IPV4 == no ]] && echo "interface ignore ipv4" >>$CONF
[[ $IPV6 == no ]] && echo "interface ignore ipv6" >>$CONF
# add listen interfaces
for net in $BIND; do
echo "interface listen $net # $(show $net)" >>$CONF
for NET in $BIND; do
echo "interface listen $NET # $(show $NET)" >>$CONF
done
fi
# add configured NTP servers