diff --git a/src/config.js b/src/config.js index 9b3fdfa..6855db6 100644 --- a/src/config.js +++ b/src/config.js @@ -6,3 +6,4 @@ module.exports.WG_PATH = process.env.WG_PATH || '/etc/wireguard/'; module.exports.WG_HOST = process.env.WG_HOST || '127.0.0.1'; module.exports.WG_PORT = process.env.WG_PORT || 51820; module.exports.WG_DEFAULT_ADDRESS = process.env.WG_DEFAULT_ADDRESS || '10.6.0.1/32'; +module.exports.WG_DEFAULT_DNS = process.env.WG_DEFAULT_DNS || '1.1.1.1'; diff --git a/src/lib/Server.js b/src/lib/Server.js index fb50400..c0d95cc 100644 --- a/src/lib/Server.js +++ b/src/lib/Server.js @@ -15,11 +15,13 @@ const { PASSWORD, } = require('../config'); +WireGuard.getClients().then(console.log); module.exports = class Server { constructor() { // Express this.app = express() + .disable('etag') .use('/', express.static(path.join(__dirname, '..', 'www'))) .use(express.json()) .use(expressSession({ diff --git a/src/lib/WireGuard.js b/src/lib/WireGuard.js index e4fcb7e..62c71a5 100644 --- a/src/lib/WireGuard.js +++ b/src/lib/WireGuard.js @@ -5,58 +5,58 @@ const path = require('path'); const QRCode = require('qrcode'); +const Util = require('./Util'); const ServerError = require('./ServerError'); const { WG_PATH, WG_HOST, WG_PORT, + WG_DEFAULT_DNS, WG_DEFAULT_ADDRESS, } = require('../config'); module.exports = class WireGuard { - constructor() { - Promise.resolve().then(async () => { - try { - const config = await fs.readFile(path.join(WG_PATH, 'wg0.json'), 'utf8'); - this.config = JSON.parse(config); - } catch (err) { - this.config = { - // TODO: Generate new config - server: { - address: WG_DEFAULT_ADDRESS, - }, - clients: {}, - }; - // TODO: Save JSON config - } + async getConfig() { + if (!this.__configPromise) { + this.__configPromise = Promise.resolve().then(async () => { + let config; + try { + config = await fs.readFile(path.join(WG_PATH, 'wg0.json'), 'utf8'); + config = JSON.parse(config); + } catch (err) { + config = { + server: { + // TODO: Generate new config + address: WG_DEFAULT_ADDRESS, + dns: WG_DEFAULT_DNS, + }, + clients: {}, + }; + } - console.log('this.config', this.config); + return config; + }); + } - await this.saveConfig(); - }).catch(err => { - // eslint-disable-next-line no-console - console.error(err); - - // eslint-disable-next-line no-process-exit - process.exit(1); - }); + return this.__configPromise; } async saveConfig() { + const config = await this.getConfig(); let result = ` # Note: Do not edit this file directly. # Your changes will be overwritten! # Server [Interface] -PrivateKey = ${this.config.server.privateKey} -Address = ${this.config.server.address} -ListenPort = ${this.config.server.port} -DNS = ${this.config.server.dns}`; +PrivateKey = ${config.server.privateKey} +Address = ${config.server.address} +ListenPort = ${config.server.port} +DNS = ${config.server.dns}`; - for (const [clientId, client] of Object.entries(this.config.clients)) { + for (const [clientId, client] of Object.entries(config.clients)) { if (!client.enabled) continue; result += ` @@ -68,44 +68,70 @@ PresharedKey = ${client.preSharedKey} AllowedIPs = ${client.allowedIPs}`; } - await fs.writeFile(path.join(WG_PATH, 'wg0.json'), JSON.stringify(this.config, false, 2)); + await fs.writeFile(path.join(WG_PATH, 'wg0.json'), JSON.stringify(config, false, 2)); await fs.writeFile(path.join(WG_PATH, 'wg0.conf'), result); } async getClients() { - return Object.entries(this.config.clients).map(([clientId, client]) => ({ + const config = await this.getConfig(); + const clients = Object.entries(config.clients).map(([clientId, client]) => ({ id: clientId, name: client.name, enabled: client.enabled, publicKey: client.publicKey, - createdAt: client.createdAt, - updatedAt: client.updatedAt, + createdAt: new Date(client.createdAt), + updatedAt: new Date(client.updatedAt), allowedIPs: client.allowedIPs, - // TODO: - latestHandshake: new Date(), - transferRx: 0, - transferTx: 0, + persistentKeepalive: null, + latestHandshakeAt: null, + transferRx: null, + transferTx: null, })); - // const { stdout } = await Util.exec('sudo cat /etc/wireguard/configs/clients.txt'); - // return stdout - // .trim() - // .split('\n') - // .filter(line => { - // return line.length > 0; - // }) - // .map(line => { - // const [ name, publicKey, createdAt ] = line.split(' '); - // return { - // name, - // publicKey, - // createdAt: new Date(Number(createdAt + '000')), - // }; - // }); + + // Loop WireGuard status + // const clientsDump = await Util.exec('wg show wg0 dump'); + const clientsDump = `iOQJS7OUUGPYATsX6nqlL+sOODoiWiN5IOE8Msfw/0o= BkdntwYazhYZzEEHhcYayq6TGw9/YUDQ251s+5bTgC0= 51820 off +i8xWKqicnDkNL14I4B+I1zlB8od/booA1joIosWn7X4= MzplKtOQ44/IaAKri2VKqCoIlg4XiVH7TCp5bcYRTQU= 172.17.0.1:60475 10.8.0.2/32 1621679257 7920 7440 off`; + clientsDump + .trim() + .split('\n') + .slice(1) + .forEach(line => { + const [ + publicKey, + preSharedKey, + endpoint, + allowedIps, + latestHandshakeAt, + transferRx, + transferTx, + persistentKeepalive, + ] = line.split('\t'); + + const client = clients.find(client => client.publicKey === publicKey); + console.log({ publicKey, client }); + if (!client) return; + + client.endpoint = endpoint === '(none)' + ? null + : endpoint; + client.latestHandshakeAt = latestHandshakeAt === '0' + ? null + : new Date(Number(`${latestHandshakeAt}000`)); + client.transferRx = Number(transferRx); + client.transferTx = Number(transferTx); + client.persistentKeepalive = persistentKeepalive; + }); + + console.log('clients', clients); + + return clients; } async getClient({ clientId }) { - const client = this.config.clients[clientId]; + const config = await this.getConfig(); + const client = config.clients[clientId]; if (!client) { throw new ServerError(`Client Not Found: ${clientId}`, 404); } @@ -114,13 +140,14 @@ AllowedIPs = ${client.allowedIPs}`; } async getClientConfiguration({ clientId }) { + const config = await this.getConfig(); const client = await this.getClient({ clientId }); return ` [Interface] PrivateKey = ${client.privateKey} Address = ${client.address} -DNS = ${this.config.server.dns} +DNS = ${config.server.dns} [Peer] PublicKey = ${client.publicKey} @@ -160,8 +187,10 @@ Endpoint = ${WG_HOST}:${WG_PORT}`; } async deleteClient({ clientId }) { - if (this.config.clients[clientId]) { - delete this.config.clients[clientId]; + const config = await this.getConfig(); + + if (config.clients[clientId]) { + delete config.clients[clientId]; await this.saveConfig(); } } diff --git a/src/www/index.html b/src/www/index.html index 43b99b8..5b7a7a9 100644 --- a/src/www/index.html +++ b/src/www/index.html @@ -51,7 +51,8 @@ -
+
@@ -60,8 +61,7 @@
{{client.name}}
-
{{client.iface}} - · {{client.allowedIps.split('/')[0]}} +
{{client.allowedIPs.split('/')[0]}} · {{client.transferRx | bytes}} - - · {{new Date(client.latestHandshake) | timeago}} + + · {{new Date(client.latestHandshakeAt) | timeago}}
diff --git a/src/www/js/api.js b/src/www/js/api.js index e239b9c..c7edae0 100644 --- a/src/www/js/api.js +++ b/src/www/js/api.js @@ -55,7 +55,14 @@ class API { return this.call({ method: 'get', path: '/wireguard/client', - }); + }).then(clients => clients.map(client => ({ + ...client, + createdAt: new Date(client.createdAt), + updatedAt: new Date(client.updatedAt), + latestHandshakeAt: client.latestHandshakeAt !== null + ? new Date(client.latestHandshakeAt) + : null, + }))); } async createClient({ name }) { diff --git a/src/www/js/app.js b/src/www/js/app.js index 39ab56d..aecfadc 100644 --- a/src/www/js/app.js +++ b/src/www/js/app.js @@ -39,6 +39,8 @@ new Vue({ return client; }); + + console.log(clients); }, login(e) { e.preventDefault();