From 4ba7dc244c30b3728ad24d9690652e06875b9b1a Mon Sep 17 00:00:00 2001 From: Bernd Storath <32197462+kaaax0815@users.noreply.github.com> Date: Wed, 4 Sep 2024 18:37:11 +0200 Subject: [PATCH] early fail if old password variable (#1350) --- docker-compose.dev.yml | 2 +- src/config.js | 2 ++ src/lib/Server.js | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index bd4a836dd..d1b7cf668 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -13,5 +13,5 @@ services: - NET_ADMIN - SYS_MODULE environment: - # - PASSWORD=p + # - PASSWORD_HASH=p - WG_HOST=192.168.1.233 diff --git a/src/config.js b/src/config.js index 01f0ce20a..72314ae1a 100644 --- a/src/config.js +++ b/src/config.js @@ -5,6 +5,8 @@ const { release: { version } } = require('./package.json'); module.exports.RELEASE = version; module.exports.PORT = process.env.PORT || '51821'; module.exports.WEBUI_HOST = process.env.WEBUI_HOST || '0.0.0.0'; +/** This is only kept for migration purpose. DO NOT USE! */ +module.exports.PASSWORD = process.env.PASSWORD; module.exports.PASSWORD_HASH = process.env.PASSWORD_HASH; module.exports.MAX_AGE = parseInt(process.env.MAX_AGE, 10) * 1000 * 60 || 0; module.exports.WG_PATH = process.env.WG_PATH || '/etc/wireguard/'; diff --git a/src/lib/Server.js b/src/lib/Server.js index 17e5058ba..08e7dc5eb 100644 --- a/src/lib/Server.js +++ b/src/lib/Server.js @@ -29,6 +29,7 @@ const { PORT, WEBUI_HOST, RELEASE, + PASSWORD, PASSWORD_HASH, MAX_AGE, LANG, @@ -428,6 +429,10 @@ module.exports = class Server { }), ); + if (PASSWORD) { + throw new Error('DO NOT USE PASSWORD ENVIRONMENT VARIABLE. USE PASSWORD_HASH INSTEAD.\nSee https://github.com/wg-easy/wg-easy/blob/master/How_to_generate_an_bcrypt_hash.md'); + } + createServer(toNodeListener(app)).listen(PORT, WEBUI_HOST); debug(`Listening on http://${WEBUI_HOST}:${PORT}`);