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 src to match master

pull/937/head
Sergei Birukov 2 years ago
parent
0c0dcca842
commit
be7ed25d9a
2 changed files with 107 additions and 183 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      .prettierignore
  2. 289
      src/lib/Server.js

1
.prettierignore
View File

@ -0,0 +1 @@
**

289
src/lib/Server.js
View File

@ -68,18 +68,6 @@ module.exports = class Server {
const app = createApp();
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({
secret: crypto.randomBytes(256).toString('hex'),
resave: true,
@ -90,37 +78,25 @@ module.exports = class Server {
app.use(router);
router
.get(
'/api/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/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}"`;
})
)
.get('/api/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/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
.get(
@ -130,16 +106,13 @@ module.exports = class Server {
? !!(event.node.req.session && event.node.req.session.authenticated)
: true;
return {
requiresPassword,
authenticated,
};
})
)
.post(
'/api/session',
defineEventHandler(async (event) => {
const { password } = await readBody(event);
return {
requiresPassword,
authenticated,
};
}))
.post('/api/session', defineEventHandler(async (event) => {
const { password } = await readBody(event);
if (!requiresPassword) {
// if no password is required, the API should never be called.
@ -157,10 +130,10 @@ module.exports = class Server {
});
}
event.node.req.session.authenticated = true;
event.node.req.session.save();
event.node.req.session.authenticated = true;
event.node.req.session.save();
debug(`New Session: ${event.node.req.session.id}`);
debug(`New Session: ${event.node.req.session.id}`);
return { success: true };
})
@ -189,137 +162,87 @@ module.exports = class Server {
return res.status(401).json({
error: 'Not Logged In',
});
})
}),
);
const router2 = createRouter();
app.use(router2);
router2
.delete(
'/api/session',
defineEventHandler((event) => {
const sessionId = event.node.req.session.id;
event.node.req.session.destroy();
debug(`Deleted Session: ${sessionId}`);
return { success: true };
})
)
.get(
'/api/wireguard/client',
defineEventHandler(() => {
return WireGuard.getClients();
})
)
.get(
'/api/wireguard/client/:clientId/qrcode.svg',
defineEventHandler(async (event) => {
const clientId = getRouterParam(event, 'clientId');
const svg = await WireGuard.getClientQRCodeSVG({ clientId });
setHeader(event, 'Content-Type', 'image/svg+xml');
return svg;
})
)
.get(
'/api/wireguard/client/:clientId/configuration',
defineEventHandler(async (event) => {
const clientId = getRouterParam(event, 'clientId');
const client = await WireGuard.getClient({ clientId });
const config = await WireGuard.getClientConfiguration({ clientId });
const configName = client.name
.replace(/[^a-zA-Z0-9_=+.-]/g, '-')
.replace(/(-{2,}|-$)/g, '-')
.replace(/-$/, '')
.substring(0, 32);
setHeader(
event,
'Content-Disposition',
`attachment; filename="${configName || clientId}.conf"`
);
setHeader(event, 'Content-Type', 'text/plain');
return config;
})
)
.post(
'/api/wireguard/client',
defineEventHandler(async (event) => {
const { name } = await readBody(event);
await WireGuard.createClient({ name });
return { success: true };
})
)
.delete(
'/api/wireguard/client/:clientId',
defineEventHandler(async (event) => {
const clientId = getRouterParam(event, 'clientId');
await WireGuard.deleteClient({ clientId });
return { success: true };
})
)
.post(
'/api/wireguard/client/:clientId/enable',
defineEventHandler(async (event) => {
const clientId = getRouterParam(event, 'clientId');
if (
clientId === '__proto__' ||
clientId === 'constructor' ||
clientId === 'prototype'
) {
throw createError({ status: 403 });
}
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 };
})
);
.delete('/api/session', defineEventHandler((event) => {
const sessionId = event.node.req.session.id;
event.node.req.session.destroy();
debug(`Deleted Session: ${sessionId}`);
return { success: true };
}))
.get('/api/wireguard/client', defineEventHandler(() => {
return WireGuard.getClients();
}))
.get('/api/wireguard/client/:clientId/qrcode.svg', defineEventHandler(async (event) => {
const clientId = getRouterParam(event, 'clientId');
const svg = await WireGuard.getClientQRCodeSVG({ clientId });
setHeader(event, 'Content-Type', 'image/svg+xml');
return svg;
}))
.get('/api/wireguard/client/:clientId/configuration', defineEventHandler(async (event) => {
const clientId = getRouterParam(event, 'clientId');
const client = await WireGuard.getClient({ clientId });
const config = await WireGuard.getClientConfiguration({ clientId });
const configName = client.name
.replace(/[^a-zA-Z0-9_=+.-]/g, '-')
.replace(/(-{2,}|-$)/g, '-')
.replace(/-$/, '')
.substring(0, 32);
setHeader(event, 'Content-Disposition', `attachment; filename="${configName || clientId}.conf"`);
setHeader(event, 'Content-Type', 'text/plain');
return config;
}))
.post('/api/wireguard/client', defineEventHandler(async (event) => {
const { name } = await readBody(event);
await WireGuard.createClient({ name });
return { success: true };
}))
.delete('/api/wireguard/client/:clientId', defineEventHandler(async (event) => {
const clientId = getRouterParam(event, 'clientId');
await WireGuard.deleteClient({ clientId });
return { success: true };
}))
.post('/api/wireguard/client/:clientId/enable', defineEventHandler(async (event) => {
const clientId = getRouterParam(event, 'clientId');
if (clientId === '__proto__' || clientId === 'constructor' || clientId === 'prototype') {
throw createError({ status: 403 });
}
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) => {
// Manage web root (edge case)
@ -372,7 +295,7 @@ module.exports = class Server {
);
// Static assets
const publicDir = '/app/www';
const publicDir = 'www';
app.use(
defineEventHandler((event) => {
return serveStatic(event, {
@ -404,7 +327,7 @@ module.exports = class Server {
};
},
});
})
}),
);
createServer(toNodeListener(app)).listen(PORT, WEBUI_HOST);

Write Preview
Loading…
Cancel
Save