From 2dc7ba6708a860177bd2d0c8a691dda72a3fced4 Mon Sep 17 00:00:00 2001 From: Bernd Storath <999999bst@gmail.com> Date: Wed, 12 Feb 2025 09:34:57 +0100 Subject: [PATCH] show error for old env vars --- src/server/routes/cnf/[oneTimeLink].ts | 1 + src/server/utils/WireGuard.ts | 10 ++++++++++ src/server/utils/config.ts | 7 +++++++ 3 files changed, 18 insertions(+) diff --git a/src/server/routes/cnf/[oneTimeLink].ts b/src/server/routes/cnf/[oneTimeLink].ts index a7e6497b..966ae1e5 100644 --- a/src/server/routes/cnf/[oneTimeLink].ts +++ b/src/server/routes/cnf/[oneTimeLink].ts @@ -6,6 +6,7 @@ export default defineEventHandler(async (event) => { validateZod(OneTimeLinkGetSchema, event) ); const clients = await WireGuard.getAllClients(); + // TODO: filter on the database level const client = clients.find( (client) => client.oneTimeLink?.oneTimeLink === oneTimeLink ); diff --git a/src/server/utils/WireGuard.ts b/src/server/utils/WireGuard.ts index 8616ba2e..629c03fb 100644 --- a/src/server/utils/WireGuard.ts +++ b/src/server/utils/WireGuard.ts @@ -243,4 +243,14 @@ class WireGuard { } } +if (OLD_ENV.PASSWORD || OLD_ENV.PASSWORD_HASH) { + // TODO: change url before release + throw new Error( + ` +You are using an invalid Configuration for wg-easy +Please follow the instructions on https://wg-easy.github.io/wg-easy/ to migrate +` + ); +} + export default new WireGuard(); diff --git a/src/server/utils/config.ts b/src/server/utils/config.ts index 5636e59b..480186d9 100644 --- a/src/server/utils/config.ts +++ b/src/server/utils/config.ts @@ -4,3 +4,10 @@ import packageJson from '@@/package.json'; export const RELEASE = 'v' + packageJson.version; export const SERVER_DEBUG = debug('Server'); + +export const OLD_ENV = { + /** @deprecated Only for migration purposes */ + PASSWORD: process.env.PASSWORD, + /** @deprecated Only for migration purposes */ + PASSWORD_HASH: process.env.PASSWORD_HASH, +};