diff --git a/src/lib/Util.js b/src/lib/Util.js index cf846ac..bb6f8fe 100644 --- a/src/lib/Util.js +++ b/src/lib/Util.js @@ -19,7 +19,7 @@ module.exports = class Util { static promisify(fn) { // eslint-disable-next-line func-names - return function(req, res) { + return function (req, res) { Promise.resolve().then(async () => fn(req, res)) .then(result => { if (res.headersSent) return; @@ -52,9 +52,16 @@ module.exports = class Util { }; } - static async exec(cmd) { - // eslint-disable-next-line no-console - console.log(`$ ${cmd}`); + static async exec(cmd, { + log = true, + } = {}) { + if (typeof log === 'string') { + // eslint-disable-next-line no-console + console.log(`$ ${log}`); + } else if (log === true) { + // eslint-disable-next-line no-console + console.log(`$ ${cmd}`); + } if (process.platform !== 'linux') { return ''; diff --git a/src/lib/WireGuard.js b/src/lib/WireGuard.js index 18d51c4..d37455d 100644 --- a/src/lib/WireGuard.js +++ b/src/lib/WireGuard.js @@ -37,7 +37,9 @@ module.exports = class WireGuard { debug('Configuration loaded.'); } catch (err) { const privateKey = await Util.exec('wg genkey'); - const publicKey = await Util.exec(`echo ${privateKey} | wg pubkey`); + const publicKey = await Util.exec(`echo ${privateKey} | wg pubkey`, { + log: `echo ***hidden*** | wg pubkey` + }); const address = WG_DEFAULT_ADDRESS.replace('x', '1'); config = { @@ -52,7 +54,7 @@ module.exports = class WireGuard { } await this.__saveConfig(config); - await Util.exec('wg-quick down wg0').catch(() => {}); + await Util.exec('wg-quick down wg0').catch(() => { }); await Util.exec('wg-quick up wg0'); await Util.exec(`iptables -t nat -A POSTROUTING -s ${WG_DEFAULT_ADDRESS.replace('x', '0')}/24 -o eth0 -j MASQUERADE`); await Util.exec('iptables -A INPUT -p udp -m udp --dport 51820 -j ACCEPT'); @@ -127,7 +129,9 @@ AllowedIPs = ${client.address}/32`; })); // Loop WireGuard status - const dump = await Util.exec('wg show wg0 dump'); + const dump = await Util.exec('wg show wg0 dump', { + log: false, + }); dump .trim() .split('\n')