mirror
/
wg-easy
mirror of https://github.com/wg-easy/wg-easy
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fixup: lint errors

pull/781/head
Philip H. 3 years ago
committed by GitHub
parent
3a486b444c
commit
8bcb5d06ca
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
6 changed files with 18 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      src/config.js
  2. 2
      src/lib/Server.js
  3. 2
      src/lib/Util.js
  4. 12
      src/lib/WireGuard.js
  5. 1
      src/www/js/api.js
  6. 2
      src/www/js/app.js

16
src/config.js
View File

@ -1,7 +1,7 @@
'use strict'; 'use strict';
const { release } = require('./package.json');
const childProcess = require('child_process'); const childProcess = require('child_process');
const { release } = require('./package.json');
module.exports.RELEASE = release; module.exports.RELEASE = release;
module.exports.PORT = process.env.PORT || 51821; module.exports.PORT = process.env.PORT || 51821;
@ -26,22 +26,22 @@ module.exports.WG_ALLOWED_IPS = process.env.WG_ALLOWED_IPS || '0.0.0.0/0, ::/0';
// Set WG_POST_UP to allow IPv6 NAT and forwarding only if the required kernel module is available // Set WG_POST_UP to allow IPv6 NAT and forwarding only if the required kernel module is available
const modules = childProcess.execSync('lsmod', { const modules = childProcess.execSync('lsmod', {
shell: 'bash', shell: 'bash',
}) });
module.exports.WG_POST_UP = process.env.WG_POST_UP module.exports.WG_POST_UP = process.env.WG_POST_UP;
if (!process.env.WG_POST_UP) { if (!process.env.WG_POST_UP) {
module.exports.WG_POST_UP = ` module.exports.WG_POST_UP = `
iptables -t nat -A POSTROUTING -s ${module.exports.WG_DEFAULT_ADDRESS.replace('x', '0')}/24 -o eth0 -j MASQUERADE; iptables -t nat -A POSTROUTING -s ${module.exports.WG_DEFAULT_ADDRESS.replace('x', '0')}/24 -o eth0 -j MASQUERADE;
iptables -A INPUT -p udp -m udp --dport 51820 -j ACCEPT; iptables -A INPUT -p udp -m udp --dport 51820 -j ACCEPT;
iptables -A FORWARD -i wg0 -j ACCEPT; iptables -A FORWARD -i wg0 -j ACCEPT;
iptables -A FORWARD -o wg0 -j ACCEPT;` iptables -A FORWARD -o wg0 -j ACCEPT;`;
if (modules.includes("ip6table_nat")) { if (modules.includes('ip6table_nat')) {
module.exports.WG_POST_UP += `ip6tables -t nat -A POSTROUTING -s ${module.exports.WG_DEFAULT_ADDRESS6.replace('x', '0')}/64 -o eth0 -j MASQUERADE; module.exports.WG_POST_UP += `ip6tables -t nat -A POSTROUTING -s ${module.exports.WG_DEFAULT_ADDRESS6.replace('x', '0')}/64 -o eth0 -j MASQUERADE;
ip6tables -A INPUT -p udp -m udp --dport 51820 -j ACCEPT; ip6tables -A INPUT -p udp -m udp --dport 51820 -j ACCEPT;
ip6tables -A FORWARD -i wg0 -j ACCEPT; ip6tables -A FORWARD -i wg0 -j ACCEPT;
ip6tables -A FORWARD -o wg0 -j ACCEPT;` ip6tables -A FORWARD -o wg0 -j ACCEPT;`;
} }
module.exports.WG_POST_UP = module.exports.WG_POST_UP.split('\n').join(' '); module.exports.WG_POST_UP = module.exports.WG_POST_UP.split('\n').join(' ');
} }

2
src/lib/Server.js
View File

@ -158,7 +158,7 @@ module.exports = class Server {
const { name } = req.body; const { name } = req.body;
return WireGuard.updateClientName({ clientId, name }); return WireGuard.updateClientName({ clientId, name });
})) }))
.put('/api/wireguard/client/:clientId/address6', Util.promisify(async req => { .put('/api/wireguard/client/:clientId/address6', Util.promisify(async (req) => {
const { clientId } = req.params; const { clientId } = req.params;
const { address6 } = req.body; const { address6 } = req.body;
return WireGuard.updateClientAddress6({ clientId, address6 }); return WireGuard.updateClientAddress6({ clientId, address6 });

2
src/lib/Util.js
View File

@ -19,7 +19,7 @@ module.exports = class Util {
static isValidIPv6(str) { static isValidIPv6(str) {
// Regex source : https://stackoverflow.com/a/17871737 // Regex source : https://stackoverflow.com/a/17871737
const regex = new RegExp('^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$'); const regex = new RegExp('^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$');
const matches = str.match(regex); const matches = str.match(regex);
return !!matches; return !!matches;
} }

12
src/lib/WireGuard.js
View File

@ -48,14 +48,14 @@ module.exports = class WireGuard {
log: 'echo ***hidden*** | wg pubkey', log: 'echo ***hidden*** | wg pubkey',
}); });
const address = WG_DEFAULT_ADDRESS.replace('x', '1'); const address = WG_DEFAULT_ADDRESS.replace('x', '1');
const address6 = WG_DEFAULT_ADDRESS6.replace('x', '1'); const address6 = WG_DEFAULT_ADDRESS6.replace('x', '1');
config = { config = {
server: { server: {
privateKey, privateKey,
publicKey, publicKey,
address, address,
address6, address6,
}, },
clients: {}, clients: {},
}; };
@ -79,7 +79,7 @@ module.exports = class WireGuard {
// await Util.exec('ip6tables -A INPUT -p udp -m udp --dport 51820 -j ACCEPT'); // await Util.exec('ip6tables -A INPUT -p udp -m udp --dport 51820 -j ACCEPT');
// await Util.exec('ip6tables -A FORWARD -i wg0 -j ACCEPT'); // await Util.exec('ip6tables -A FORWARD -i wg0 -j ACCEPT');
// await Util.exec('ip6tables -A FORWARD -o wg0 -j ACCEPT'); // await Util.exec('ip6tables -A FORWARD -o wg0 -j ACCEPT');
await this.__syncConfig(); await this.__syncConfig();
return config; return config;
}); });
@ -119,7 +119,7 @@ PostDown = ${WG_POST_DOWN}
[Peer] [Peer]
PublicKey = ${client.publicKey} PublicKey = ${client.publicKey}
PresharedKey = ${client.preSharedKey} PresharedKey = ${client.preSharedKey}
AllowedIPs = ${client.address}/32, ${client.address6}/128`; AllowedIPs = ${client.address}/32, ${client.address6}/128`;
} }
debug('Config saving...'); debug('Config saving...');
@ -205,7 +205,7 @@ AllowedIPs = ${client.address}/32, ${client.address6}/128`;
const config = await this.getConfig(); const config = await this.getConfig();
const client = await this.getClient({ clientId }); const client = await this.getClient({ clientId });
const isDnsSet = WG_DEFAULT_DNS || WG_DEFAULT_DNS6; const isDnsSet = WG_DEFAULT_DNS || WG_DEFAULT_DNS6;
const dnsServers = [WG_DEFAULT_DNS, WG_DEFAULT_DNS6].filter(item => !!item).join(', ') const dnsServers = [WG_DEFAULT_DNS, WG_DEFAULT_DNS6].filter((item) => !!item).join(', ');
return ` return `
[Interface] [Interface]
@ -260,7 +260,7 @@ Endpoint = ${WG_HOST}:${WG_PORT}`;
let address6; let address6;
for (let i = 2; i < 255; i++) { for (let i = 2; i < 255; i++) {
const client = Object.values(config.clients).find(client => { const client = Object.values(config.clients).find((client) => {
return client.address6 === WG_DEFAULT_ADDRESS6.replace('x', i.toString(16)); return client.address6 === WG_DEFAULT_ADDRESS6.replace('x', i.toString(16));
}); });

1
src/www/js/api.js
View File

@ -131,4 +131,5 @@ class API {
body: { address6 }, body: { address6 },
}); });
} }
} }

2
src/www/js/app.js
View File

@ -252,7 +252,7 @@ new Vue({
}, },
updateClientAddress6(client, address6) { updateClientAddress6(client, address6) {
this.api.updateClientAddress6({ clientId: client.id, address6 }) this.api.updateClientAddress6({ clientId: client.id, address6 })
.catch(err => alert(err.message || err.toString())) .catch((err) => alert(err.message || err.toString()))
.finally(() => this.refresh().catch(console.error)); .finally(() => this.refresh().catch(console.error));
}, },
toggleTheme() { toggleTheme() {

Write Preview
Loading…
Cancel
Save