deleted wg-connect-handling.sh

added status
added ifname support
2023-08-17 13:34:58 +03:00 · 2023-08-17 13:33:21 +03:00 · 2023-08-17 13:00:10 +03:00 · 2023-08-17 09:36:42 +03:00
3 changed files with 67 additions and 85 deletions
--- a/README.md
+++ b/README.md
@ -76,17 +76,35 @@ ____

 |  POSITION | PARAMETERS   |       DESCRIPTION      |    DEFAULT    |
 |-----------|--------------|------------------------|---------------|
-|     1     |**add\|del**|add or delete client config|**REQUIRED**|
-|     2     |**\<username\>**|client username|**REQUIRED**|
-|     3     |**\<address\>**|client ip address|**REQUIRED**|
-|     4     |**[-f]**,**[--force]**|service will restart after add\|del username||
+|     1     |**\<ifname\>**|wireguard interface name|**REQUIRED**|
+|     2     |**add\|del**|add or delete client config|**REQUIRED**|
+|     3     |**\<username\>**|client username|**REQUIRED**|
+|     4     |**\<address\>**|client ip address|**REQUIRED**|
+|     5     |**[-f]**,**[--force]**|service will restart after add\|del username||

 Example usage:  

+```bash
+# create client config template
+sudo tee /etc/wireguard/client.conf.default > /dev/null <<'EOF'
+[Interface]
+  Address = clientaddr/32
+  PrivateKey = clientprivkey
+  DNS = 1.1.1.1,8.8.8.8                       # edit this line!
+[Peer]
+  PublicKey = serverpublkey
+  AllowedIPs = 10.0.0.0/8,192.168.0.0/16      # edit this line!
+  Endpoint = server.public.address:51820      # edit this line!
+  PersistentKeepalive = 5
+EOF
+```
+
 ```bash
 # download
 sudo wget https://git.hmp.today/pavel.muhortov/wireguard-management/raw/branch/master/wg-client-management.sh -O /etc/wireguard/wg-client-management.sh
 sudo chmod +x /etc/wireguard/wg-client-management.sh
+# create log directory
+sudo mkdir /var/log/wireguard
 ```

 ```bash
@ -96,12 +114,12 @@ ln -s /etc/wireguard/wg-client-management.sh ./wg

 ```bash
 # create client
-sudo ./wg add username address
+sudo ./wg wg0 add username address
 ```

 ```bash
 # delete client and restart service
-sudo  ./wg del username address -f
+sudo  ./wg wg0 del username address -f
 ```

 ```bash
@ -111,55 +129,6 @@ tail -f /var/log/wireguard/wg.log

 ____

-## `wg-connect-handling`.sh
-
-**Description:**  
-> Handling client connection and preparing stats for monitoring.  
-
-**Dependencies:**  
->
-> * privileged rights
-> * [jq](https://github.com/stedolan/jq) (tested version 1.6 on [Debian GNU/Linux 11](http://ftp.debian.org/debian/dists/bullseye/))
-> * [grepcidr](https://github.com/ryantig/grepcidr) (tested version 2.0 on [Debian GNU/Linux 11](http://ftp.debian.org/debian/dists/bullseye/))
-> * [Python 3](https://www.python.org/downloads/) (tested version 3.9.5 on [Debian GNU/Linux 11](http://ftp.debian.org/debian/dists/bullseye/))
-> * existing [/usr/local/bin/sendmail.py](https://git.hmp.today/pavel.muhortov/utils#sendmail-py)
-> * [bash](https://www.gnu.org/software/bash/) (tested versions: 5.1.4 on [Debian GNU/Linux 11](http://ftp.debian.org/debian/dists/bullseye/), 5.0.17 on [Ubuntu 20](https://wiki.ubuntu.com/FocalFossa/ReleaseNotes), 4.2.46 on [CentOS 7](https://wiki.centos.org/Manuals/ReleaseNotes/CentOS7.2009))
-
-|  POSITION | PARAMETERS   |       DESCRIPTION      |    DEFAULT    |
-|-----------|--------------|------------------------|---------------|
-|     1     |**</path/to/dir>**|root path for counter, names, log|**REQUIRED**|
-|     2     |**[mail]**|send email notification||
-|     3     |**[geo]**|check client address geolocation||
-
-Example usage:  
-
-```bash
-# download
-sudo wget https://git.hmp.today/pavel.muhortov/wireguard-management/raw/branch/master/wg-connect-handling.sh -O /etc/wireguard/wg-connect-handling.sh
-sudo chmod +x /etc/wireguard/wg-connect-handling.sh
-```
-
-```bash
-# create root path for counter, names, log
-sudo mkdir /var/log/wireguard
-sudo chown -R root:root /var/log/wireguard
-sudo chmod -R 755 /var/log/wireguard
-```
-
-```bash
-# sudo crontab -e
-* * * * * bash /etc/wireguard/wg-connect-handling.sh /var/log/wireguard mail geo
-```
-
-```bash
-# check counter and names
-watch cat /var/log/wireguard/wg-counts.log
-# check journal
-tail -f /var/log/wireguard/wg-connect-handling.log
-```
-
-____
-
 ## `wg-heavy@wg1`.service

 **Description:**  
--- a/wg-client-management.sh
+++ b/wg-client-management.sh
@ -113,7 +113,7 @@ createcert() {
  wg genkey | tee "/etc/wireguard/pki/${clientname}-private.key" | wg pubkey > "/etc/wireguard/pki/${clientname}-public.key"
  clientpublkey=$(cat "/etc/wireguard/pki/${clientname}-public.key")
  clientprivkey=$(cat "/etc/wireguard/pki/${clientname}-private.key")
-  wg set wg0 peer "${clientpublkey}" \
+  wg set "${iface_name}" peer "${clientpublkey}" \
             allowed-ips "${clientaddr}/32" \
             persistent-keepalive 5
  {
@ -121,8 +121,8 @@ createcert() {
    echo -e "  PublicKey = ${clientpublkey}"
    echo -e "  AllowedIPs = ${clientaddr}/32"
    echo -e "  PersistentKeepalive = 5"
-  } >> ${servercfgname}
-  ip -4 route add "${clientaddr}/32" dev wg0
+  } >> "${servercfgname}"
+  ip -4 route add "${clientaddr}/32" dev "${iface_name}"
 }

 #######################################
@ -173,19 +173,19 @@ END
 deletecert() {
  clientpublkey=$(cat "/etc/wireguard/pki/${clientname}-public.key")
  clientprivkey=$(cat "/etc/wireguard/pki/${clientname}-private.key")
-  wg set wg0 peer "${clientpublkey}" remove
+  wg set "${iface_name}" peer "${clientpublkey}" remove
  rm -f "/etc/wireguard/pki/${clientname}-public.key"
  rm -f "/etc/wireguard/pki/${clientname}-private.key"
  # PublicKey =
-  s2=$(grep -n "${clientpublkey}" ${servercfgname} | cut -d":" -f1)
+  s2=$(grep -n "${clientpublkey}" "${servercfgname}" | cut -d":" -f1)
  # [Peer]
  s1=$(( s2 - 1 ))
  # AllowedIPs =
  s3=$(( s2 + 1 ))
-  # PersistentKeepalive = 
+  # PersistentKeepalive =
  s4=$(( s2 + 2 ))
-  sed -i "${s1}d;${s2}d;${s3}d;${s4}d" ${servercfgname}
-  ip -4 route del "${clientaddr}/32" dev wg0
+  sed -i "${s1}d;${s2}d;${s3}d;${s4}d" "${servercfgname}"
+  ip -4 route del "${clientaddr}/32" dev "${iface_name}"
 }

 #######################################
@ -214,9 +214,10 @@ deleteinfo() {
 # VARIABLES:
 #

-clienttodo=$1
-clientname=$2
-clientaddr=$3
+iface_name=$1
+clienttodo=$2
+clientname=$3
+clientaddr=$4

 resetforce=0
 for argument in "${@}"; do
@ -244,7 +245,7 @@ fi

 if checkroot; then
  serverpublkey=$(cat /etc/wireguard/pki/server-public.key)
-  servercfgname="/etc/wireguard/wg0.conf"
+  servercfgname="/etc/wireguard/${iface_name}.conf"
  clientpublkey=''
  clientprivkey=''
  clientconfdef="/etc/wireguard/client.conf.default"
@ -254,7 +255,7 @@ if checkroot; then
     [ -n "${clientname}" ] && \
     grepcidr "0.0.0.0/0" <(echo "${clientaddr}") >/dev/null; then
    if [ -f "/etc/wireguard/${clientname}.conf" ] || \
-      grep -q -w "${clientaddr}/32" ${servercfgname}; then
+      grep -q -w "${clientaddr}/32" "${servercfgname}"; then
      execerror "wireguard config exist or address used, exit"
    else
      createcert && addtologs "created certificate for ${clientname}"
@ -263,8 +264,8 @@ if checkroot; then
      startsendmail
    fi
    if [ "${resetforce}" -eq 1 ];then
-      addtologs "restarting wg-quick@wg0..."
-      systemctl restart wg-quick@wg0
+      addtologs "restarting wg-quick@${iface_name}..."
+      systemctl restart "wg-quick@${iface_name}"
    fi
  elif [ "${clienttodo}" == "del" ] && \
     [ -n "${clientname}" ] && \
@ -275,16 +276,16 @@ if checkroot; then
    if [ -f "/etc/wireguard/${clientname}.png" ]; then
      deleteinfo && addtologs "deleted info file for ${clientname}"
    fi
-    if grep -q -w "${clientaddr}/32" ${servercfgname}; then
+    if grep -q -w "${clientaddr}/32" "${servercfgname}"; then
      deletecert && addtologs "deleted certificate for ${clientname}"
    fi
    if [ "${resetforce}" -eq 1 ];then
-      addtologs "restarting wg-quick@wg0..."
-      systemctl restart wg-quick@wg0
+      addtologs "restarting wg-quick@${iface_name}..."
+      systemctl "restart wg-quick@${iface_name}"
    fi
  else
-    printf "%s\n" "Usage example: $0 'add' 'username(surname)' 'address(ww.xx.yy.zz) -f'"
-    printf "%s\n" "Usage example: $0 'del' 'username(surname)' 'address(ww.xx.yy.zz)'"
+    printf "%s\n" "Usage example: $0 'wg0' 'add' 'username(surname)' 'address(ww.xx.yy.zz) -f'"
+    printf "%s\n" "Usage example: $0 'wg0' 'del' 'username(surname)' 'address(ww.xx.yy.zz)'"
  fi
 else
  execerror "Restart this as root!"
--- a/wg-heavy@wg1.service
+++ b/wg-heavy@wg1.service
@ -1,13 +1,13 @@
 #! /bin/sh
-# chkconfig: 2345 20 80
+# chkconfig:         2345 20 80

 ### BEGIN INIT INFO
-# Provides:				wireguard
-# Required-Start:		$all
-# Required-Stop:	
-# Default-Start:		2 3 4 5
-# Default-Stop:		
-# Short-Description:	Launch Wireguard without creating route table
+# Provides:          wireguard
+# Required-Start:    $all
+# Required-Stop:
+# Default-Start:     2 3 4 5
+# Default-Stop:
+# Short-Description: Launch Wireguard without creating route table
 ### END INIT INFO

 wifname=$(basename -s .service "$0" | cut -d'@' -f2)
@ -41,7 +41,15 @@ stop() {
  rm -f "/etc/wireguard/${wifname}.key"
 }

-case "$1" in 
+status() {
+  if ip a grep -q -w "${wifname}"; then
+    ip a | grep -w "${wifname}"
+  else
+    echo "${wifname} down"
+  fi
+}
+
+case "$1" in
    start)
       start
       ;;
@ -50,10 +58,14 @@ case "$1" in
       ;;
    restart)
       stop
+       sleep 1
       start
       ;;
+    status)
+       status
+       ;;
    *)
-       echo "Usage: $0 {start|stop|restart}"
+       echo "Usage: $0 {start|stop|restart|status}"
 esac

-exit 0
+exit 0
Author	SHA1	Message	Date
Pavel Muhortov	ec2defdec5	deleted wg-connect-handling.sh	2023-08-17 13:34:58 +03:00
Pavel Muhortov	1c1b787d54	added status	2023-08-17 13:33:21 +03:00
Pavel Muhortov	d773f2bd66	added ifname support	2023-08-17 13:00:10 +03:00
Pavel Muhortov	55c12bbb16	add client config template	2023-08-17 09:36:42 +03:00