From 557e13a953e0949ef600795713ed1b10ae8a463d Mon Sep 17 00:00:00 2001 From: crazyracer98 <8631139+crazyracer98@users.noreply.github.com> Date: Sat, 29 Jan 2022 00:46:21 +0100 Subject: [PATCH 01/12] expose server interface PreUp and PreDown to environment variable --- README.md | 6 ++++-- docker-compose.yml | 6 +++++- src/config.js | 2 ++ src/lib/WireGuard.js | 4 ++++ 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6ae66b35..298d6c3c 100644 --- a/README.md +++ b/README.md @@ -88,8 +88,10 @@ These options can be configured by setting environment variables using `-e KEY=" | `WG_DEFAULT_ADDRESS` | `10.8.0.x` | `10.6.0.x` | Clients IP address range. | | `WG_DEFAULT_DNS` | `1.1.1.1` | `8.8.8.8, 8.8.4.4` | DNS server clients will use. | | `WG_ALLOWED_IPS` | `0.0.0.0/0, ::/0` | `192.168.15.0/24, 10.0.1.0/24` | Allowed IPs clients will use. | -| `WG_POST_UP` | `...` | `iptables ...` | See [config.js](https://github.com/WeeJeWel/wg-easy/blob/master/src/config.js#L19) for the default value. | -| `WG_POST_DOWN` | `...` | `iptables ...` | See [config.js](https://github.com/WeeJeWel/wg-easy/blob/master/src/config.js#L26) for the default value. | +| `WG_PRE_UP` | `...` | - | See [config.js](https://github.com/WeeJeWel/wg-easy/blob/master/src/config.js#L19) for the default value. | +| `WG_POST_UP` | `...` | `iptables ...` | See [config.js](https://github.com/WeeJeWel/wg-easy/blob/master/src/config.js#L20) for the default value. | +| `WG_PRE_DOWN` | `...` | - | See [config.js](https://github.com/WeeJeWel/wg-easy/blob/master/src/config.js#L27) for the default value. | +| `WG_POST_DOWN` | `...` | `iptables ...` | See [config.js](https://github.com/WeeJeWel/wg-easy/blob/master/src/config.js#L28) for the default value. | > If you change `WG_PORT`, make sure to also change the exposed port. diff --git a/docker-compose.yml b/docker-compose.yml index 0a13accc..6ba41efd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ services: environment: # ⚠️ Required: # Change this to your host's public address - - WG_HOST=raspberrypi.local + - WG_HOST=192.168.178.46 # Optional: # - PASSWORD=foobar123 @@ -13,6 +13,10 @@ services: # - WG_DEFAULT_DNS=1.1.1.1 # - WG_MTU=1420 # - WG_ALLOWED_IPS=192.168.15.0/24, 10.0.1.0/24 + # - WG_PRE_UP=echo "Pre Up" > /etc/wireguard/pre-up.txt + # - WG_POST_UP=echo "Post Up" > /etc/wireguard/post-up.txt + # - WG_PRE_DOWN=echo "Pre Down" > /etc/wireguard/pre-down.txt + # - WG_POST_DOWN=echo "Post Down" > /etc/wireguard/post-down.txt image: weejewel/wg-easy container_name: wg-easy diff --git a/src/config.js b/src/config.js index a08aab3b..28c9fc5a 100644 --- a/src/config.js +++ b/src/config.js @@ -16,6 +16,7 @@ module.exports.WG_DEFAULT_DNS = typeof process.env.WG_DEFAULT_DNS === 'string' : '1.1.1.1'; module.exports.WG_ALLOWED_IPS = process.env.WG_ALLOWED_IPS || '0.0.0.0/0, ::/0'; +module.exports.WG_PRE_UP = process.env.WG_PRE_UP || ''; module.exports.WG_POST_UP = process.env.WG_POST_UP || ` iptables -t nat -A POSTROUTING -s ${module.exports.WG_DEFAULT_ADDRESS.replace('x', '0')}/24 -o eth0 -j MASQUERADE; iptables -A INPUT -p udp -m udp --dport 51820 -j ACCEPT; @@ -23,4 +24,5 @@ iptables -A FORWARD -i wg0 -j ACCEPT; iptables -A FORWARD -o wg0 -j ACCEPT; `.split('\n').join(' '); +module.exports.WG_PRE_DOWN = process.env.WG_PRE_DOWN || ''; module.exports.WG_POST_DOWN = process.env.WG_POST_DOWN || ''; diff --git a/src/lib/WireGuard.js b/src/lib/WireGuard.js index 032854f1..441d71cb 100644 --- a/src/lib/WireGuard.js +++ b/src/lib/WireGuard.js @@ -19,7 +19,9 @@ const { WG_DEFAULT_ADDRESS, WG_PERSISTENT_KEEPALIVE, WG_ALLOWED_IPS, + WG_PRE_UP, WG_POST_UP, + WG_PRE_DOWN, WG_POST_DOWN, } = require('../config'); @@ -94,7 +96,9 @@ module.exports = class WireGuard { PrivateKey = ${config.server.privateKey} Address = ${config.server.address}/24 ListenPort = 51820 +PreUp = ${WG_PRE_UP} PostUp = ${WG_POST_UP} +PreDown = ${WG_PRE_DOWN} PostDown = ${WG_POST_DOWN} `; From 67119ce42e817781483c0f786c5d13a0f8b71f91 Mon Sep 17 00:00:00 2001 From: crazyracer98 <8631139+crazyracer98@users.noreply.github.com> Date: Sat, 29 Jan 2022 00:49:21 +0100 Subject: [PATCH 02/12] revert WG_Host variable --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 6ba41efd..9842b26f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ services: environment: # ⚠️ Required: # Change this to your host's public address - - WG_HOST=192.168.178.46 + - WG_HOST=raspberrypi.local # Optional: # - PASSWORD=foobar123 From 8f66d11e3f99e313f5faf49ab3be24d199d1992b Mon Sep 17 00:00:00 2001 From: Danil Shaymurzin Date: Sun, 6 Mar 2022 00:38:46 +0500 Subject: [PATCH 03/12] feat(WireGuard): return client data by createClient. --- src/lib/WireGuard.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/WireGuard.js b/src/lib/WireGuard.js index 032854f1..ba2b6831 100644 --- a/src/lib/WireGuard.js +++ b/src/lib/WireGuard.js @@ -261,6 +261,8 @@ Endpoint = ${WG_HOST}:${WG_PORT}`; config.clients[clientId] = client; await this.saveConfig(); + + return client; } async deleteClient({ clientId }) { From b146ba1d86067bb717de0ae50026792ea127e0e9 Mon Sep 17 00:00:00 2001 From: Anton Grouchtchak Date: Wed, 18 May 2022 17:14:05 -0400 Subject: [PATCH 04/12] Wait for Vue to finish loading before showing HTML This prevents flashing static HTML elements (icons, modals) on reload. --- src/www/index.html | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/www/index.html b/src/www/index.html index 4080c51a..c84bb1bc 100644 --- a/src/www/index.html +++ b/src/www/index.html @@ -10,12 +10,18 @@ + +
-
+
-

Made by Made by Emile Nijssen · Donate · GitHub

@@ -482,4 +488,4 @@ - \ No newline at end of file + From c663d02a365c66c881d55eed5d4661dbd0f1b195 Mon Sep 17 00:00:00 2001 From: Anton Grouchtchak Date: Wed, 18 May 2022 17:18:30 -0400 Subject: [PATCH 05/12] Fix typo Change `Created/Last seen at` to `Created/Last seen on`. --- src/www/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/www/index.html b/src/www/index.html index c84bb1bc..6e99ca2d 100644 --- a/src/www/index.html +++ b/src/www/index.html @@ -107,7 +107,7 @@
-
+
+ :title="'Last seen on ' + dateTime(new Date(client.latestHandshakeAt))"> · {{new Date(client.latestHandshakeAt) | timeago}}
From 4a63bd95986a749dfa7cd87ccc11f31a7aa85255 Mon Sep 17 00:00:00 2001 From: FlyinPancake <36113055+FlyinPancake@users.noreply.github.com> Date: Wed, 25 May 2022 19:20:18 +0000 Subject: [PATCH 06/12] docs: :memo: added keepalive explanation --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6ae66b35..13ffb7c4 100644 --- a/README.md +++ b/README.md @@ -84,7 +84,7 @@ These options can be configured by setting environment variables using `-e KEY=" | `WG_HOST` | - | `vpn.myserver.com` | The public hostname of your VPN server. | | `WG_PORT` | `51820` | `12345` | The public UDP port of your VPN server. WireGuard will always listen on `51820` inside the Docker container. | | `WG_MTU` | `null` | `1420` | The MTU the clients will use. Server uses default WG MTU. | -| `WG_PERSISTENT_KEEPALIVE` | `0` | `25` | Value in seconds to keep the "connection" open. | +| `WG_PERSISTENT_KEEPALIVE` | `0` | `25` | Value in seconds to keep the "connection" open. If this value is 0, then connections won't be kept alive. | | `WG_DEFAULT_ADDRESS` | `10.8.0.x` | `10.6.0.x` | Clients IP address range. | | `WG_DEFAULT_DNS` | `1.1.1.1` | `8.8.8.8, 8.8.4.4` | DNS server clients will use. | | `WG_ALLOWED_IPS` | `0.0.0.0/0, ::/0` | `192.168.15.0/24, 10.0.1.0/24` | Allowed IPs clients will use. | From 0da7ee1c684b519d8ecbd86c47aaaf5b4d4e97fb Mon Sep 17 00:00:00 2001 From: Emile Nijssen Date: Sun, 12 Jun 2022 22:07:28 +0200 Subject: [PATCH 07/12] Update README.md --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6ae66b35..a1168133 100644 --- a/README.md +++ b/README.md @@ -93,7 +93,7 @@ These options can be configured by setting environment variables using `-e KEY=" > If you change `WG_PORT`, make sure to also change the exposed port. -# Updating +## Updating To update to the latest version, simply run: @@ -103,4 +103,8 @@ docker rm wg-easy docker pull weejewel/wg-easy ``` -And then run the `docker run -d \ ...` command above again. \ No newline at end of file +And then run the `docker run -d \ ...` command above again. + +## Common Use Cases + +* [Using WireGuard-Easy with Pi-Hole](https://github.com/WeeJeWel/wg-easy/wiki/Using-WireGuard-Easy-with-Pi-Hole) From e7f4cc2d56fe83e629166795db432ea203e635fd Mon Sep 17 00:00:00 2001 From: Emile Nijssen Date: Sun, 12 Jun 2022 22:10:50 +0200 Subject: [PATCH 08/12] use relative paths --- src/www/js/api.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/www/js/api.js b/src/www/js/api.js index accbb579..84885f17 100644 --- a/src/www/js/api.js +++ b/src/www/js/api.js @@ -6,7 +6,7 @@ class API { async call({ method, path, body }) { - const res = await fetch(`/api${path}`, { + const res = await fetch(`./api${path}`, { method, headers: { 'Content-Type': 'application/json', From a72029d7e5dd0e7ac26acdd93e6aee939c6b8a52 Mon Sep 17 00:00:00 2001 From: Emile Nijssen Date: Sun, 12 Jun 2022 22:48:30 +0200 Subject: [PATCH 09/12] improve chart --- src/www/index.html | 15 +++++---------- src/www/js/app.js | 45 ++++++++++++++++++++++++--------------------- 2 files changed, 29 insertions(+), 31 deletions(-) diff --git a/src/www/index.html b/src/www/index.html index 6e99ca2d..7e443de8 100644 --- a/src/www/index.html +++ b/src/www/index.html @@ -10,7 +10,7 @@ - +