From 33b4c3859df274240374602ec3250aec32664d75 Mon Sep 17 00:00:00 2001 From: Vadim Babadzhanyan Date: Sat, 7 Sep 2024 09:43:59 +0300 Subject: [PATCH 1/7] Fix onetimelink (#1367) * Russian translation * fix onetime link for android tv --------- Co-authored-by: Vadim Babadzhanyan --- src/lib/WireGuard.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/WireGuard.js b/src/lib/WireGuard.js index 1aaed9a..8ce325f 100644 --- a/src/lib/WireGuard.js +++ b/src/lib/WireGuard.js @@ -321,8 +321,8 @@ Endpoint = ${WG_HOST}:${WG_CONFIG_PORT}`; async eraseOneTimeLink({ clientId }) { const client = await this.getClient({ clientId }); - client.oneTimeLink = null; - client.oneTimeLinkExpiresAt = null; + // client.oneTimeLink = null; + client.oneTimeLinkExpiresAt = new Date(Date.now() + 10 * 1000); client.updatedAt = new Date(); await this.saveConfig(); } From f3324cbb28b0f6568d3f752c5d2e847089dff2e5 Mon Sep 17 00:00:00 2001 From: Xiwangly <59991942+xiwangly2@users.noreply.github.com> Date: Sun, 8 Sep 2024 14:21:26 +0800 Subject: [PATCH 2/7] Update i18n.js, add chs & cht translations (#1374) --- src/www/js/i18n.js | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/www/js/i18n.js b/src/www/js/i18n.js index 5f3d64d..b74c30a 100644 --- a/src/www/js/i18n.js +++ b/src/www/js/i18n.js @@ -496,10 +496,23 @@ const messages = { // eslint-disable-line no-unused-vars disableClient: '禁用客户端', enableClient: '启用客户端', noClients: '目前没有客户端。', + noPrivKey: '此客户端没有已知的私钥。无法创建配置。', showQR: '显示二维码', downloadConfig: '下载配置', madeBy: '由', donate: '捐赠', + toggleCharts: '显示/隐藏图表', + theme: { dark: '暗黑主题', light: '明亮主题', auto: '自动主题' }, + restore: '恢复', + backup: '备份', + titleRestoreConfig: '恢复您的配置', + titleBackupConfig: '备份您的配置', + rememberMe: '记住我', + titleRememberMe: '关闭浏览器后保持登录', + sort: '排序', + ExpireDate: '到期日期', + Permanent: '永久', + OneTimeLink: '生成一次性短链接', }, cht: { name: '名字', @@ -523,10 +536,23 @@ const messages = { // eslint-disable-line no-unused-vars disableClient: '停用使用者', enableClient: '啟用使用者', noClients: '目前沒有使用者。', + noPrivKey: '此使用者沒有已知的私鑰。無法創建配置。', showQR: '顯示 QR Code', downloadConfig: '下載 Config 檔', madeBy: '由', donate: '抖內', + toggleCharts: '顯示/隱藏圖表', + theme: { dark: '暗黑主題', light: '明亮主題', auto: '自動主題' }, + restore: '恢復', + backup: '備份', + titleRestoreConfig: '恢復您的配置', + titleBackupConfig: '備份您的配置', + rememberMe: '記住我', + titleRememberMe: '關閉瀏覽器後保持登錄', + sort: '排序', + ExpireDate: '到期日期', + Permanent: '永久', + OneTimeLink: '生成一次性短鏈接', }, it: { name: 'Nome', From c0fbc3f6474bd17b821589f83b1381c1c343018c Mon Sep 17 00:00:00 2001 From: "Philip H." <47042125+pheiduck@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:33:52 +0200 Subject: [PATCH 3/7] Update deploy.yml --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 1ae7ef8..fa3878f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -33,7 +33,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Set environment variables - run: echo RELEASE=$(cat ./src/package.json | jq -r .release | jq -r .version) >> $GITHUB_ENV + run: RELEASE=echo $(cat ./src/package.json | jq -r .release | jq -r .version) >> $GITHUB_ENV - name: Build & Publish Docker Image uses: docker/build-push-action@v6 From e2fe3b8b327d02f89864458c6a84ffe0f3a17080 Mon Sep 17 00:00:00 2001 From: "Philip H." <47042125+pheiduck@users.noreply.github.com> Date: Mon, 9 Sep 2024 15:31:18 +0200 Subject: [PATCH 4/7] fixup: deploy.yml echo moved by a mistake --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index fa3878f..1ae7ef8 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -33,7 +33,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Set environment variables - run: RELEASE=echo $(cat ./src/package.json | jq -r .release | jq -r .version) >> $GITHUB_ENV + run: echo RELEASE=$(cat ./src/package.json | jq -r .release | jq -r .version) >> $GITHUB_ENV - name: Build & Publish Docker Image uses: docker/build-push-action@v6 From 6e891ad9fb48cc6843782b82b4f9fc51e92c888b Mon Sep 17 00:00:00 2001 From: Vadim Babadzhanyan Date: Tue, 10 Sep 2024 19:46:09 +0300 Subject: [PATCH 5/7] Prometheus password fix (#1319) * Russian translation * Fix require prometheus password --------- Co-authored-by: Vadim Babadzhanyan --- src/lib/Server.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/lib/Server.js b/src/lib/Server.js index 08e7dc5..da2f6c9 100644 --- a/src/lib/Server.js +++ b/src/lib/Server.js @@ -336,10 +336,6 @@ module.exports = class Server { }); }; - // Prometheus Metrics API - const routerPrometheusMetrics = createRouter(); - app.use(routerPrometheusMetrics); - // Check Prometheus credentials app.use( fromNodeMiddleware((req, res, next) => { @@ -347,11 +343,10 @@ module.exports = class Server { return next(); } const user = basicAuth(req); - if (requiresPrometheusPassword && !user) { + if (!user) { res.statusCode = 401; return { error: 'Not Logged In' }; } - if (user.pass) { if (isPasswordValid(user.pass, PROMETHEUS_METRICS_PASSWORD)) { return next(); @@ -364,6 +359,10 @@ module.exports = class Server { }), ); + // Prometheus Metrics API + const routerPrometheusMetrics = createRouter(); + app.use(routerPrometheusMetrics); + // Prometheus Routes routerPrometheusMetrics .get('/metrics', defineEventHandler(async (event) => { From 31c59c1b268257f0cbe1413ac2f267dcaa890944 Mon Sep 17 00:00:00 2001 From: Tristan <39345534+MichelBaie@users.noreply.github.com> Date: Wed, 11 Sep 2024 09:05:32 +0200 Subject: [PATCH 6/7] Update README.md (#1390) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 37b158a..2b22e95 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ For **stable** versions instead of nightly or development please read **README** | tag | Branch | Example | Description | | - | - | - | - | | `latest` | production | `ghcr.io/wg-easy/wg-easy:latest` or `ghcr.io/wg-easy/wg-easy` | stable as possbile get bug fixes quickly when needed, deployed against `production`. | -| `13` | production | `ghcr.io/wg-easy/wg-easy:13` | same as latest, stick to a version tag. | +| `14` | production | `ghcr.io/wg-easy/wg-easy:14` | same as latest, stick to a version tag. | | `nightly` | master | `ghcr.io/wg-easy/wg-easy:nightly` | mostly unstable gets frequent package and code updates, deployed against `master`. | | `development` | pull requests | `ghcr.io/wg-easy/wg-easy:development` | used for development, testing code from PRs before landing into `master`. | From efe5cccb02c68dfb2b40c7be81af0082b6268ad1 Mon Sep 17 00:00:00 2001 From: "Philip H." <47042125+pheiduck@users.noreply.github.com> Date: Fri, 13 Sep 2024 18:24:41 +0200 Subject: [PATCH 7/7] index.html: Emile Nijssen's blog url changed --- src/www/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/www/index.html b/src/www/index.html index a35e81e..03f9356 100644 --- a/src/www/index.html +++ b/src/www/index.html @@ -685,7 +685,7 @@

WireGuard Easy © 2021-2024 by Emile Nijssen is licensed under Emile Nijssen is licensed under CC BY-NC-SA 4.0 · {{$t("donate")}}