Browse Source

Update src to match master

pull/937/head
Sergei Birukov 2 years ago
parent
commit
139fe395b9
  1. 1
      .prettierignore
  2. 341
      src/lib/Server.js

1
.prettierignore

@ -0,0 +1 @@
**

341
src/lib/Server.js

@ -39,18 +39,6 @@ module.exports = class Server {
const app = createApp(); const app = createApp();
this.app = app; this.app = app;
// Middleware to add CORS headers
app.use('*', defineEventHandler((event) => {
setHeader(event, 'Access-Control-Allow-Origin', '*'); // Allows all origins
setHeader(event, 'Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS'); // Allowed methods
setHeader(event, 'Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept'); // Allowed headers
// If the request method is OPTIONS, return an early response
if (event.req.method === 'OPTIONS') {
event.res.statusCode = 204;
return '';
}
}));
app.use(fromNodeMiddleware(expressSession({ app.use(fromNodeMiddleware(expressSession({
secret: crypto.randomBytes(256).toString('hex'), secret: crypto.randomBytes(256).toString('hex'),
resave: true, resave: true,
@ -61,80 +49,62 @@ module.exports = class Server {
app.use(router); app.use(router);
router router
.get( .get('/api/release', defineEventHandler((event) => {
'/api/release', setHeader(event, 'Content-Type', 'application/json');
defineEventHandler((event) => { return RELEASE;
setHeader(event, 'Content-Type', 'application/json'); }))
return RELEASE;
}) .get('/api/lang', defineEventHandler((event) => {
) setHeader(event, 'Content-Type', 'application/json');
return `"${LANG}"`;
.get( }))
'/api/lang',
defineEventHandler((event) => { .get('/api/ui-traffic-stats', defineEventHandler((event) => {
setHeader(event, 'Content-Type', 'application/json'); setHeader(event, 'Content-Type', 'application/json');
return `"${LANG}"`; return `"${UI_TRAFFIC_STATS}"`;
}) }))
)
.get('/api/ui-chart-type', defineEventHandler((event) => {
.get( setHeader(event, 'Content-Type', 'application/json');
'/api/ui-traffic-stats', return `"${UI_CHART_TYPE}"`;
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( .get('/api/session', defineEventHandler((event) => {
'/api/session', const requiresPassword = !!process.env.PASSWORD;
defineEventHandler((event) => { const authenticated = requiresPassword
const requiresPassword = !!process.env.PASSWORD; ? !!(event.node.req.session && event.node.req.session.authenticated)
const authenticated = requiresPassword : true;
? !!(event.node.req.session && event.node.req.session.authenticated)
: true; return {
requiresPassword,
return { authenticated,
requiresPassword, };
authenticated, }))
}; .post('/api/session', defineEventHandler(async (event) => {
}) const { password } = await readBody(event);
)
.post( if (typeof password !== 'string') {
'/api/session', throw createError({
defineEventHandler(async (event) => { status: 401,
const { password } = await readBody(event); message: 'Missing: Password',
});
if (typeof password !== 'string') { }
throw createError({
status: 401,
message: 'Missing: Password',
});
}
if (password !== PASSWORD) { if (password !== 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 { succcess: true }; return { succcess: true };
}) }));
);
// WireGuard // WireGuard
app.use( app.use(
@ -148,12 +118,7 @@ module.exports = class Server {
} }
if (req.url.startsWith('/api/') && req.headers['authorization']) { if (req.url.startsWith('/api/') && req.headers['authorization']) {
if ( if (bcrypt.compareSync(req.headers['authorization'], bcrypt.hashSync(PASSWORD, 10))) {
bcrypt.compareSync(
req.headers['authorization'],
bcrypt.hashSync(PASSWORD, 10)
)
) {
return next(); return next();
} }
return res.status(401).json({ return res.status(401).json({
@ -164,140 +129,90 @@ 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( .delete('/api/session', defineEventHandler((event) => {
'/api/session', const sessionId = event.node.req.session.id;
defineEventHandler((event) => {
const sessionId = event.node.req.session.id; event.node.req.session.destroy();
event.node.req.session.destroy(); debug(`Deleted Session: ${sessionId}`);
return { success: true };
debug(`Deleted Session: ${sessionId}`); }))
return { success: true }; .get('/api/wireguard/client', defineEventHandler(() => {
}) return WireGuard.getClients();
) }))
.get( .get('/api/wireguard/client/:clientId/qrcode.svg', defineEventHandler(async (event) => {
'/api/wireguard/client', const clientId = getRouterParam(event, 'clientId');
defineEventHandler(() => { const svg = await WireGuard.getClientQRCodeSVG({ clientId });
return WireGuard.getClients(); setHeader(event, 'Content-Type', 'image/svg+xml');
}) return svg;
) }))
.get( .get('/api/wireguard/client/:clientId/configuration', defineEventHandler(async (event) => {
'/api/wireguard/client/:clientId/qrcode.svg', const clientId = getRouterParam(event, 'clientId');
defineEventHandler(async (event) => { const client = await WireGuard.getClient({ clientId });
const clientId = getRouterParam(event, 'clientId'); const config = await WireGuard.getClientConfiguration({ clientId });
const svg = await WireGuard.getClientQRCodeSVG({ clientId }); const configName = client.name
setHeader(event, 'Content-Type', 'image/svg+xml'); .replace(/[^a-zA-Z0-9_=+.-]/g, '-')
return svg; .replace(/(-{2,}|-$)/g, '-')
}) .replace(/-$/, '')
) .substring(0, 32);
.get( setHeader(event, 'Content-Disposition', `attachment; filename="${configName || clientId}.conf"`);
'/api/wireguard/client/:clientId/configuration', setHeader(event, 'Content-Type', 'text/plain');
defineEventHandler(async (event) => { return config;
const clientId = getRouterParam(event, 'clientId'); }))
const client = await WireGuard.getClient({ clientId }); .post('/api/wireguard/client', defineEventHandler(async (event) => {
const config = await WireGuard.getClientConfiguration({ clientId }); const { name } = await readBody(event);
const configName = client.name await WireGuard.createClient({ name });
.replace(/[^a-zA-Z0-9_=+.-]/g, '-') return { success: true };
.replace(/(-{2,}|-$)/g, '-') }))
.replace(/-$/, '') .delete('/api/wireguard/client/:clientId', defineEventHandler(async (event) => {
.substring(0, 32); const clientId = getRouterParam(event, 'clientId');
setHeader( await WireGuard.deleteClient({ clientId });
event, return { success: true };
'Content-Disposition', }))
`attachment; filename="${configName || clientId}.conf"` .post('/api/wireguard/client/:clientId/enable', defineEventHandler(async (event) => {
); const clientId = getRouterParam(event, 'clientId');
setHeader(event, 'Content-Type', 'text/plain'); if (clientId === '__proto__' || clientId === 'constructor' || clientId === 'prototype') {
return config; throw createError({ status: 403 });
}) }
) await WireGuard.enableClient({ clientId });
.post( return { success: true };
'/api/wireguard/client', }))
defineEventHandler(async (event) => { .post('/api/wireguard/client/:clientId/disable', defineEventHandler(async (event) => {
const { name } = await readBody(event); const clientId = getRouterParam(event, 'clientId');
await WireGuard.createClient({ name }); if (clientId === '__proto__' || clientId === 'constructor' || clientId === 'prototype') {
return { success: true }; throw createError({ status: 403 });
}) }
) await WireGuard.disableClient({ clientId });
.delete( return { success: true };
'/api/wireguard/client/:clientId', }))
defineEventHandler(async (event) => { .put('/api/wireguard/client/:clientId/name', defineEventHandler(async (event) => {
const clientId = getRouterParam(event, 'clientId'); const clientId = getRouterParam(event, 'clientId');
await WireGuard.deleteClient({ clientId }); if (clientId === '__proto__' || clientId === 'constructor' || clientId === 'prototype') {
return { success: true }; throw createError({ status: 403 });
}) }
) const { name } = await readBody(event);
.post( await WireGuard.updateClientName({ clientId, name });
'/api/wireguard/client/:clientId/enable', return { success: true };
defineEventHandler(async (event) => { }))
const clientId = getRouterParam(event, 'clientId'); .put('/api/wireguard/client/:clientId/address', defineEventHandler(async (event) => {
if ( const clientId = getRouterParam(event, 'clientId');
clientId === '__proto__' || if (clientId === '__proto__' || clientId === 'constructor' || clientId === 'prototype') {
clientId === 'constructor' || throw createError({ status: 403 });
clientId === 'prototype' }
) { const { address } = await readBody(event);
throw createError({ status: 403 }); await WireGuard.updateClientAddress({ clientId, address });
} 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 };
})
);
// Static assets // Static assets
const publicDir = '/app/www'; const publicDir = 'www';
app.use( app.use(
defineEventHandler((event) => { defineEventHandler((event) => {
return serveStatic(event, { return serveStatic(event, {
@ -326,7 +241,7 @@ module.exports = class Server {
}; };
}, },
}); });
}) }),
); );
createServer(toNodeListener(app)).listen(PORT, WEBUI_HOST); createServer(toNodeListener(app)).listen(PORT, WEBUI_HOST);

Loading…
Cancel
Save