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

Update Server.js to serve the correct directory on "/"

pull/937/head
Daniil Isakov 3 years ago
committed by Sergei Birukov
parent
0a8b9e581f
commit
34b18b0692
1 changed files with 235 additions and 150 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. 385
      src/lib/Server.js

385
src/lib/Server.js
View File

@ -64,78 +64,99 @@ const isPasswordValid = (password) => {
}; };
module.exports = class Server { module.exports = class Server {
constructor() { constructor() {
const app = createApp(); const app = createApp();
this.app = app; this.app = app;
app.use(fromNodeMiddleware(expressSession({ app.use(
secret: crypto.randomBytes(256).toString('hex'), fromNodeMiddleware(
resave: true, expressSession({
saveUninitialized: true, secret: crypto.randomBytes(256).toString('hex'),
}))); resave: true,
saveUninitialized: true,
})
)
);
const router = createRouter(); const router = createRouter();
app.use(router); app.use(router);
router router
.get('/api/release', defineEventHandler((event) => { .get(
setHeader(event, 'Content-Type', 'application/json'); '/api/release',
return RELEASE; defineEventHandler((event) => {
})) setHeader(event, 'Content-Type', 'application/json');
return RELEASE;
.get('/api/lang', defineEventHandler((event) => { })
setHeader(event, 'Content-Type', 'application/json'); )
return `"${LANG}"`;
})) .get(
'/api/lang',
.get('/api/ui-traffic-stats', defineEventHandler((event) => { defineEventHandler((event) => {
setHeader(event, 'Content-Type', 'application/json'); setHeader(event, 'Content-Type', 'application/json');
return `"${UI_TRAFFIC_STATS}"`; return `"${LANG}"`;
})) })
)
.get('/api/ui-chart-type', defineEventHandler((event) => {
setHeader(event, 'Content-Type', 'application/json'); .get(
return `"${UI_CHART_TYPE}"`; '/api/ui-traffic-stats',
})) defineEventHandler((event) => {
setHeader(event, 'Content-Type', 'application/json');
return `"${UI_TRAFFIC_STATS}"`;
})
)
.get(
'/api/ui-chart-type',
defineEventHandler((event) => {
setHeader(event, 'Content-Type', 'application/json');
return `"${UI_CHART_TYPE}"`;
})
)
// Authentication // Authentication
.get('/api/session', defineEventHandler((event) => { .get(
const authenticated = requiresPassword '/api/session',
? !!(event.node.req.session && event.node.req.session.authenticated) defineEventHandler((event) => {
: true; const authenticated = requiresPassword
? !!(event.node.req.session && event.node.req.session.authenticated)
return { : true;
requiresPassword,
authenticated, return {
}; requiresPassword,
})) authenticated,
.post('/api/session', defineEventHandler(async (event) => { };
const { password } = await readBody(event); })
)
if (!requiresPassword) { .post(
// if no password is required, the API should never be called. '/api/session',
// Do not automatically authenticate the user. defineEventHandler(async (event) => {
throw createError({ const { password } = await readBody(event);
status: 401,
message: 'Invalid state', if (!requiresPassword) {
}); // if no password is required, the API should never be called.
} // Do not automatically authenticate the user.
throw createError({
status: 401,
message: 'Invalid state',
});
}
if (!isPasswordValid(password)) { if (!isPasswordValid(password)) {
throw createError({ throw createError({
status: 401, status: 401,
message: 'Incorrect Password', message: 'Incorrect Password',
}); });
} }
event.node.req.session.authenticated = true; event.node.req.session.authenticated = true;
event.node.req.session.save(); event.node.req.session.save();
debug(`New Session: ${event.node.req.session.id}`); debug(`New Session: ${event.node.req.session.id}`);
return { success: true }; return { success: true };
})); })
);
// WireGuard // WireGuard
app.use( app.use(
@ -160,87 +181,137 @@ module.exports = class Server {
return res.status(401).json({ return res.status(401).json({
error: 'Not Logged In', error: 'Not Logged In',
}); });
}), })
); );
const router2 = createRouter(); const router2 = createRouter();
app.use(router2); app.use(router2);
router2 router2
.delete('/api/session', defineEventHandler((event) => { .delete(
const sessionId = event.node.req.session.id; '/api/session',
defineEventHandler((event) => {
event.node.req.session.destroy(); const sessionId = event.node.req.session.id;
debug(`Deleted Session: ${sessionId}`); event.node.req.session.destroy();
return { success: true };
})) debug(`Deleted Session: ${sessionId}`);
.get('/api/wireguard/client', defineEventHandler(() => { return { success: true };
return WireGuard.getClients(); })
})) )
.get('/api/wireguard/client/:clientId/qrcode.svg', defineEventHandler(async (event) => { .get(
const clientId = getRouterParam(event, 'clientId'); '/api/wireguard/client',
const svg = await WireGuard.getClientQRCodeSVG({ clientId }); defineEventHandler(() => {
setHeader(event, 'Content-Type', 'image/svg+xml'); return WireGuard.getClients();
return svg; })
})) )
.get('/api/wireguard/client/:clientId/configuration', defineEventHandler(async (event) => { .get(
const clientId = getRouterParam(event, 'clientId'); '/api/wireguard/client/:clientId/qrcode.svg',
const client = await WireGuard.getClient({ clientId }); defineEventHandler(async (event) => {
const config = await WireGuard.getClientConfiguration({ clientId }); const clientId = getRouterParam(event, 'clientId');
const configName = client.name const svg = await WireGuard.getClientQRCodeSVG({ clientId });
.replace(/[^a-zA-Z0-9_=+.-]/g, '-') setHeader(event, 'Content-Type', 'image/svg+xml');
.replace(/(-{2,}|-$)/g, '-') return svg;
.replace(/-$/, '') })
.substring(0, 32); )
setHeader(event, 'Content-Disposition', `attachment; filename="${configName || clientId}.conf"`); .get(
setHeader(event, 'Content-Type', 'text/plain'); '/api/wireguard/client/:clientId/configuration',
return config; defineEventHandler(async (event) => {
})) const clientId = getRouterParam(event, 'clientId');
.post('/api/wireguard/client', defineEventHandler(async (event) => { const client = await WireGuard.getClient({ clientId });
const { name } = await readBody(event); const config = await WireGuard.getClientConfiguration({ clientId });
await WireGuard.createClient({ name }); const configName = client.name
return { success: true }; .replace(/[^a-zA-Z0-9_=+.-]/g, '-')
})) .replace(/(-{2,}|-$)/g, '-')
.delete('/api/wireguard/client/:clientId', defineEventHandler(async (event) => { .replace(/-$/, '')
const clientId = getRouterParam(event, 'clientId'); .substring(0, 32);
await WireGuard.deleteClient({ clientId }); setHeader(
return { success: true }; event,
})) 'Content-Disposition',
.post('/api/wireguard/client/:clientId/enable', defineEventHandler(async (event) => { `attachment; filename="${configName || clientId}.conf"`
const clientId = getRouterParam(event, 'clientId'); );
if (clientId === '__proto__' || clientId === 'constructor' || clientId === 'prototype') { setHeader(event, 'Content-Type', 'text/plain');
throw createError({ status: 403 }); return config;
} })
await WireGuard.enableClient({ clientId }); )
return { success: true }; .post(
})) '/api/wireguard/client',
.post('/api/wireguard/client/:clientId/disable', defineEventHandler(async (event) => { defineEventHandler(async (event) => {
const clientId = getRouterParam(event, 'clientId'); const { name } = await readBody(event);
if (clientId === '__proto__' || clientId === 'constructor' || clientId === 'prototype') { await WireGuard.createClient({ name });
throw createError({ status: 403 }); return { success: true };
} })
await WireGuard.disableClient({ clientId }); )
return { success: true }; .delete(
})) '/api/wireguard/client/:clientId',
.put('/api/wireguard/client/:clientId/name', defineEventHandler(async (event) => { defineEventHandler(async (event) => {
const clientId = getRouterParam(event, 'clientId'); const clientId = getRouterParam(event, 'clientId');
if (clientId === '__proto__' || clientId === 'constructor' || clientId === 'prototype') { await WireGuard.deleteClient({ clientId });
throw createError({ status: 403 }); return { success: true };
} })
const { name } = await readBody(event); )
await WireGuard.updateClientName({ clientId, name }); .post(
return { success: true }; '/api/wireguard/client/:clientId/enable',
})) defineEventHandler(async (event) => {
.put('/api/wireguard/client/:clientId/address', defineEventHandler(async (event) => { const clientId = getRouterParam(event, 'clientId');
const clientId = getRouterParam(event, 'clientId'); if (
if (clientId === '__proto__' || clientId === 'constructor' || clientId === 'prototype') { clientId === '__proto__' ||
throw createError({ status: 403 }); clientId === 'constructor' ||
} clientId === 'prototype'
const { address } = await readBody(event); ) {
await WireGuard.updateClientAddress({ clientId, address }); throw createError({ status: 403 });
return { success: true }; }
})); await WireGuard.enableClient({ clientId });
return { success: true };
})
)
.post(
'/api/wireguard/client/:clientId/disable',
defineEventHandler(async (event) => {
const clientId = getRouterParam(event, 'clientId');
if (
clientId === '__proto__' ||
clientId === 'constructor' ||
clientId === 'prototype'
) {
throw createError({ status: 403 });
}
await WireGuard.disableClient({ clientId });
return { success: true };
})
)
.put(
'/api/wireguard/client/:clientId/name',
defineEventHandler(async (event) => {
const clientId = getRouterParam(event, 'clientId');
if (
clientId === '__proto__' ||
clientId === 'constructor' ||
clientId === 'prototype'
) {
throw createError({ status: 403 });
}
const { name } = await readBody(event);
await WireGuard.updateClientName({ clientId, name });
return { success: true };
})
)
.put(
'/api/wireguard/client/:clientId/address',
defineEventHandler(async (event) => {
const clientId = getRouterParam(event, 'clientId');
if (
clientId === '__proto__' ||
clientId === 'constructor' ||
clientId === 'prototype'
) {
throw createError({ status: 403 });
}
const { address } = await readBody(event);
await WireGuard.updateClientAddress({ clientId, address });
return { success: true };
})
);
const safePathJoin = (base, target) => { const safePathJoin = (base, target) => {
// Manage web root (edge case) // Manage web root (edge case)
@ -270,17 +341,27 @@ module.exports = class Server {
app.use(router3); app.use(router3);
router3 router3
.get('/api/wireguard/backup', defineEventHandler(async (event) => { .get(
const config = await WireGuard.backupConfiguration(); '/api/wireguard/backup',
setHeader(event, 'Content-Disposition', 'attachment; filename="wg0.json"'); defineEventHandler(async (event) => {
setHeader(event, 'Content-Type', 'text/json'); const config = await WireGuard.backupConfiguration();
return config; setHeader(
})) event,
.put('/api/wireguard/restore', defineEventHandler(async (event) => { 'Content-Disposition',
const { file } = await readBody(event); 'attachment; filename="wg0.json"'
await WireGuard.restoreConfiguration(file); );
return { success: true }; setHeader(event, 'Content-Type', 'text/json');
})); return config;
})
)
.put(
'/api/wireguard/restore',
defineEventHandler(async (event) => {
const { file } = await readBody(event);
await WireGuard.restoreConfiguration(file);
return { success: true };
})
);
// Static assets // Static assets
const publicDir = '/app/www'; const publicDir = '/app/www';
@ -298,11 +379,16 @@ module.exports = class Server {
return; return;
} }
if (id.endsWith('.html')) setHeader(event, 'Content-Type', 'text/html'); if (id.endsWith('.html'))
if (id.endsWith('.js')) setHeader(event, 'Content-Type', 'application/javascript'); setHeader(event, 'Content-Type', 'text/html');
if (id.endsWith('.json')) setHeader(event, 'Content-Type', 'application/json'); if (id.endsWith('.js'))
if (id.endsWith('.css')) setHeader(event, 'Content-Type', 'text/css'); setHeader(event, 'Content-Type', 'application/javascript');
if (id.endsWith('.png')) setHeader(event, 'Content-Type', 'image/png'); if (id.endsWith('.json'))
setHeader(event, 'Content-Type', 'application/json');
if (id.endsWith('.css'))
setHeader(event, 'Content-Type', 'text/css');
if (id.endsWith('.png'))
setHeader(event, 'Content-Type', 'image/png');
return { return {
size: stats.size, size: stats.size,
@ -310,11 +396,10 @@ module.exports = class Server {
}; };
}, },
}); });
}), })
); );
createServer(toNodeListener(app)).listen(PORT, WEBUI_HOST); createServer(toNodeListener(app)).listen(PORT, WEBUI_HOST);
debug(`Listening on http://${WEBUI_HOST}:${PORT}`); debug(`Listening on http://${WEBUI_HOST}:${PORT}`);
} }
}; };

Write Preview
Loading…
Cancel
Save