🚑 Fixes CIDR for automated handling of AllowedIPs

This commit is contained in:
Franck Nijhof 2019-08-30 18:52:42 +02:00
parent a2ab6a1b45
commit ba1f26a445
No known key found for this signature in database
GPG key ID: D62583BA8AB11CA3

View file

@ -225,16 +225,20 @@ for peer in $(bashio::config 'peers|keys'); do
# Determine allowed IPs for server side config, by default use # Determine allowed IPs for server side config, by default use
# peer defined addresses. # peer defined addresses.
allowed_ips="${addresses}" list=()
if bashio::config.has_value "peers[${peer}].allowed_ips"; then if bashio::config.has_value "peers[${peer}].allowed_ips"; then
# Use allowed IP's defined by the user. # Use allowed IP's defined by the user.
list=()
for address in $(bashio::config "peers[${peer}].allowed_ips"); do for address in $(bashio::config "peers[${peer}].allowed_ips"); do
[[ "${address}" == *"/"* ]] || address="${address}/24" [[ "${address}" == *"/"* ]] || address="${address}/32"
list+=("${address}")
done
else
for address in $(bashio::config "peers[${peer}].addresses"); do
[[ "${address}" == *"/"* ]] || address="${address}/32"
list+=("${address}") list+=("${address}")
done done
allowed_ips=$(IFS=", "; echo "${list[*]}")
fi fi
allowed_ips=$(IFS=", "; echo "${list[*]}")
# Determine persistent keep alive # Determine persistent keep alive
keep_alive=25 keep_alive=25