Skip to content

feat: Validate user port configuration #907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 14, 2025
Merged

feat: Validate user port configuration #907

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e548707
fix: Validate user ports
kroese Oct 14, 2025
a26f8da
Update network.sh
kroese Oct 14, 2025
7f4768d
feat: Validate user port configuration
kroese Oct 14, 2025
9272b95
feat: Validate user port configuration
kroese Oct 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 53 additions & 9 deletions src/network.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,9 @@ compat() {

getHostPorts() {

local list="$1"
local list="${HOST_PORTS:-}"
list=$(echo "${list// /}" | sed 's/,*$//g')
list="${list//,,/,}"

if [[ "${DISPLAY,,}" == "web" ]]; then
[ -z "$list" ] && list="$WSS_PORT" || list+=",$WSS_PORT"
Expand All @@ -228,21 +229,62 @@ getHostPorts() {
[ -z "$list" ] && list="$WSD_PORT" || list+=",$WSD_PORT"
fi

# Remove duplicates
list=$(echo "$list," | awk 'BEGIN{RS=ORS=","} !seen[$0]++' | sed 's/,*$//g')

echo "$list"
return 0
}

getUserPorts() {

local args=""
local list=$1
local list="${USER_PORTS:-}"
list=$(echo "${list// /}" | sed 's/,*$//g')

local ssh="22"
[[ "${BOOT_MODE:-}" == "windows"* ]] && ssh="3389"
[ -z "$list" ] && list="$ssh" || list+=",$ssh"

list="${list//,,/,}"
list="${list//,/ }"
list="${list## }"
list="${list%% }"

echo "$list"
local exclude
exclude=$(getHostPorts)
exclude="${exclude//,/ }"
exclude="${exclude## }"
exclude="${exclude%% }"

local ports=""

for userport in $list; do

local num="${userport///tcp}"
num="${num///udp}"
[ -z "$num" ] && continue

for hostport in $exclude; do

local val="${hostport///tcp}"

if [[ "$num" == "${val///udp}" ]]; then
num=""
warn "Could not assign port ${val///udp} to \"USER_PORTS\" because it is already in \"HOST_PORTS\"!"
fi

done

if [ -n "$num" ]; then
[ -z "$ports" ] && ports="$userport" || ports+=",$userport"
fi

done

# Remove duplicates
ports=$(echo "$ports," | awk 'BEGIN{RS=ORS=","} !seen[$0]++' | sed 's/,*$//g')

echo "$ports"
return 0
}

Expand All @@ -251,15 +293,15 @@ getSlirp() {
local args=""
local list=""

list=$(getUserPorts "${USER_PORTS:-}")
list=$(getUserPorts)
list="${list//,/ }"
list="${list## }"
list="${list%% }"

for port in $list; do

proto="tcp"
num="${port%/tcp}"
local proto="tcp"
local num="${port%/tcp}"

if [[ "$port" == *"/udp" ]]; then
proto="udp"
Expand All @@ -273,6 +315,8 @@ getSlirp() {
args+="hostfwd=$proto::$num-$VM_NET_IP:$num,"
done

args=$(echo "$args" | sed 's/,*$//g')

echo "${args%?}"
return 0
}
Expand Down Expand Up @@ -341,7 +385,7 @@ configurePasst() {
[ -n "$PASST_MTU" ] && PASST_OPTS+=" -m $PASST_MTU"

local forward=""
forward=$(getUserPorts "${USER_PORTS:-}")
forward=$(getUserPorts)
forward="${forward///tcp}"
forward="${forward///udp}"

Expand Down Expand Up @@ -492,7 +536,7 @@ configureNAT() {
update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy > /dev/null
fi

exclude=$(getHostPorts "$HOST_PORTS")
exclude=$(getHostPorts)

if [ -n "$exclude" ]; then
if [[ "$exclude" != *","* ]]; then
Expand Down