[FEAT] Enable SERVER_ALLOWEDIPS_PEER_ declaration by comma

[thalesmaoa]

Is this a new feature request?

• I have searched the existing issues

Wanted change

I'm using .env file to declare peer as follows:

# Define 1 PEER
PEER="client1"
PEERS_CLIENT="$PEERS_CLIENT,$PEER"

# Define 2 PEER
PEER="client2"
PEERS_CLIENT="$PEERS_CLIENT,$PEER"
PEER_ALLOWEDIP="SERVER_ALLOWEDIPS_PEER_$PEER=110.254.11.0/24"

# Define 3 PEER
PEER="client3"
PEERS_CLIENT="$PEERS_CLIENT,$PEER"
PEER_ALLOWEDIP="$PEER_ALLOWEDIP,SERVER_ALLOWEDIPS_PEER_$PEER=120.254.23.0/24"

Reason for change

SERVER_ALLOWEDIPS_PEER_ variable is not identified for multiple peers:

[Peer]
# peer_client2
PublicKey = 
PresharedKey = 
AllowedIPs = 11.254.254.4/32,10.254.1.0/24,SERVER_ALLOWEDIPS_PEER_client3=xx.xx.xx.x/24,SERVER_ALLOWEDIPS_PEER_client2=xx.xx.xx.x/24

Proposed code change

No response

[github-actions]

Thanks for opening your first issue here! Be sure to follow the relevant issue templates, or risk having this issue marked as invalid.

[aptalca]

No idea what that .env is meant to accomplish but the variable is explained here: https://github.com/linuxserver/docker-wireguard?tab=readme-ov-file#site-to-site-vpn

[thalesmaoa]

Sure, this is a feature request.

The .env file is supported by docker to add enviromental variables during docker deploy. Docker .env doc.

For now, to make a site-to-site, there must be individuals calls for each client:

SERVER_ALLOWEDIPS_PEER_laptop="192.168.1.0/24,192.168.2.0/24"
SERVER_ALLOWEDIPS_PEER_smartphone="192.168.1.0/24,192.168.3.0/24"
SERVER_ALLOWEDIPS_PEER_desktop="192.168.1.0/24,192.168.4.0/24"

For 3 clients, this is ok to admin. When this number grows a bit, it is kind of difficult to track.

My suggestion is to make like peer declaration, by comma separated.

PEERS_CLIENT="laptop,smartphone,desktop"

The problem is that subnets are comma separated.

docker-wireguard/root/etc/s6-overlay/s6-rc.d/init-wireguard-confs/run

Line 93 in b90ca22

SERVER_ALLOWEDIPS=SERVER_ALLOWEDIPS_PEER_${i}

Is is possible to reimplement this line to identify different clients with dot-comma?

In other words, map like peers:

docker-wireguard/root/etc/s6-overlay/s6-rc.d/init-wireguard-confs/run

Line 142 in b90ca22

mapfile -t PEERS_ARRAY < <(seq 1 "${PEERS}")

[aptalca]

so instead of setting

SERVER_ALLOWEDIPS_PEER_laptop="192.168.1.0/24,192.168.2.0/24"
SERVER_ALLOWEDIPS_PEER_smartphone="192.168.1.0/24,192.168.3.0/24"
SERVER_ALLOWEDIPS_PEER_desktop="192.168.1.0/24,192.168.4.0/24"

you want to set

SERVER_ALLOWEDIPS='laptop="192.168.1.0/24,192.168.2.0/24",smartphone="192.168.1.0/24,192.168.3.0/24",desktop="192.168.1.0/24,192.168.4.0/24"'

?
that barely saves any keystrokes, and the ones saved are all copy/pasteable. It would add a significant complication to the algorithm for virtually no gain.

[drizuid]

IMHO this FR would only add complexity that we have to support. I am not in favor.

[thalesmaoa]

My suggestion is to keep the original var, but remap it as an array breaking by substring.

I will try to make some code for suggestions to clarify.

[thalesmaoa]

As an example:

I just want to merge all SERVER_ALLOWEDIPS_PEER_ in one variable as follows:

PEER_ALLOWEDIP="SERVER_ALLOWEDIPS_PEER_client1=10.254.1.0/24,SERVER_ALLOWEDIPS_PEER_client2=101.54.13.0/24,SERVER_ALLOWEDIPS_PEER_client3=110.254.11.0/24"

$ echo $PEER_ALLOWEDIP
SERVER_ALLOWEDIPS_PEER_client1=10.254.1.0/24,SERVER_ALLOWEDIPS_PEER_client2=101.54.13.0/24,SERVER_ALLOWEDIPS_PEER_client3=110.254.11.0/24

Now, I just need to extract the corresponding peer information:

PEER="client1"
substring=$(echo "$PEER_ALLOWEDIP" | grep -o "\bSERVER_ALLOWEDIPS_PEER_${PEER}=[^,]*")
echo "Substring for $PEER: $substring"

Substring for client1: SERVER_ALLOWEDIPS_PEER_client1=10.254.1.0/24

SERVER_ALLOWEDIPS in

docker-wireguard/root/etc/s6-overlay/s6-rc.d/init-wireguard-confs/run

Line 93 in b90ca22

SERVER_ALLOWEDIPS=SERVER_ALLOWEDIPS_PEER_${i}

can be replaced by substring.

Of course my code is not good and is just to present a point.

If the variable is not defined, it looks for this new pattern, take the substring and change nothing else.

[aptalca]

The way you describe it actually doesn't even save any keystrokes. I see no benefit to this, but a bunch of risk and development cost.

Plus, your suggestion would break if you try to add multiple comma separated ranges for a single peer.

Anyway, this is not something we will add due to high cost to benefit ratio.

[thalesmaoa]

Sure, thx anyway. I will try to find another way to fix my problem.