Marown
/
wireguard-install
mirror of https://github.com/hwdsl2/wireguard-install.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve feature for specifying client IP 

- Improve feature for allowing users to specify a client IP.
  Ref: #34.
This commit is contained in:
hwdsl2 2024-03-26 00:15:21 -05:00
parent a935b6ec72
commit 342fbd59b9
1 changed files with 43 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
wireguard-install.sh
View File

@ -413,34 +413,48 @@ get_export_dir() {
fi fi
} }
select_client_ip() {
# Given a list of the assigned internal IPv4 addresses, obtain the lowest still
# available octet. Important to start looking at 2, because 1 is our gateway.
octet=2
while grep AllowedIPs /etc/wireguard/wg0.conf | cut -d "." -f 4 | cut -d "/" -f 1 | grep -q "$octet"; do
(( octet++ ))
done
# Don't break the WireGuard configuration in case the address space is full
if [[ "$octet" -eq 255 ]]; then
exiterr "253 clients are already configured. The WireGuard internal subnet is full!"
fi
}
new_client_setup() { new_client_setup() {
get_export_dir select_client_ip
read -p "Do you want to specify an IP address for the new client? (y/n): " specify_ip specify_ip=n
if [ "$1" = "add_client" ]; then
# Check user's choice echo
if [[ "$specify_ip" =~ ^[Yy]$ ]]; then read -rp "Do you want to specify an internal IP address for the new client? [y/N]: " specify_ip
read -p "Enter the desired IP address for the new client (e.g., 10.7.0.X): " client_ip until [[ "$specify_ip" =~ ^[yYnN]*$ ]]; do
# Validate the user input IP address echo "$specify_ip: invalid selection."
if [[ ! $client_ip =~ ^10\.7\.0\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]?)$ ]]; then read -rp "Do you want to specify an internal IP address for the new client? [y/N]: " specify_ip
exiterr "Invalid IP address. Please enter an IP address within the range 10.7.0.2 to 10.7.0.255." done
fi if [[ ! "$specify_ip" =~ ^[yY]$ ]]; then
octet=$(echo "$client_ip" | cut -d "." -f 4) echo "Using auto assigned IP address 10.7.0.$octet."
# Check if the IP is already in use fi
if grep AllowedIPs /etc/wireguard/wg0.conf | cut -d "." -f 4 | cut -d "/" -f 1 | grep -q "$octet"; then fi
exiterr "The IP address is already in use. Please choose another one." if [[ "$specify_ip" =~ ^[yY]$ ]]; then
fi echo
else read -rp "Enter IP address for the new client (e.g. 10.7.0.X): " client_ip
# Automatically select an unused IP address octet=$(printf '%s' "$client_ip" | cut -d "." -f 4)
octet=2 until [[ $client_ip =~ ^10\.7\.0\.([2-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-4])$ ]] \
while grep AllowedIPs /etc/wireguard/wg0.conf | cut -d "." -f 4 | cut -d "/" -f 1 | grep -q "$octet"; do && ! grep AllowedIPs /etc/wireguard/wg0.conf | cut -d "." -f 4 | cut -d "/" -f 1 | grep -q "$octet"; do
(( octet++ )) if [[ ! $client_ip =~ ^10\.7\.0\.([2-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-4])$ ]]; then
done echo "Invalid IP address. Must be within the range 10.7.0.2 to 10.7.0.254."
# Don't break the WireGuard configuration in case the address space is full else
if [[ "$octet" -eq 255 ]]; then echo "The IP address is already in use. Please choose another one."
exiterr "253 clients are already configured. The WireGuard internal subnet is full!" fi
fi read -rp "Enter IP address for the new client (e.g. 10.7.0.X): " client_ip
fi octet=$(printf '%s' "$client_ip" | cut -d "." -f 4)
done
fi
key=$(wg genkey) key=$(wg genkey)
psk=$(wg genpsk) psk=$(wg genpsk)
# Configure client in the server # Configure client in the server
@ -453,6 +467,7 @@ AllowedIPs = 10.7.0.$octet/32$(grep -q 'fddd:2c4:2c4:2c4::1' /etc/wireguard/wg0.
# END_PEER $client # END_PEER $client
EOF EOF
# Create client configuration # Create client configuration
get_export_dir
cat << EOF > "$export_dir$client".conf cat << EOF > "$export_dir$client".conf
[Interface] [Interface]
Address = 10.7.0.$octet/24$(grep -q 'fddd:2c4:2c4:2c4::1' /etc/wireguard/wg0.conf && echo ", fddd:2c4:2c4:2c4::$octet/64") Address = 10.7.0.$octet/24$(grep -q 'fddd:2c4:2c4:2c4::1' /etc/wireguard/wg0.conf && echo ", fddd:2c4:2c4:2c4::$octet/64")
@ -836,7 +851,7 @@ else
set_client_name set_client_name
done done
new_client_dns new_client_dns
new_client_setup new_client_setup add_client
# Append new client configuration to the WireGuard interface # Append new client configuration to the WireGuard interface
wg addconf wg0 <(sed -n "/^# BEGIN_PEER $client/,/^# END_PEER $client/p" /etc/wireguard/wg0.conf) wg addconf wg0 <(sed -n "/^# BEGIN_PEER $client/,/^# END_PEER $client/p" /etc/wireguard/wg0.conf)
echo echo