GeneralBots/botserver
2
1
Fork 0
Code Issues Pull requests 1 Projects Releases 323 Packages Wiki Activity Actions

fix(core.gbapp): /logs working again.

Browse source
This commit is contained in:
rodrigorodriguez 2023-03-27 10:07:28 -03:00
parent 0c443618a6
commit d08e11fef4
1 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/app.ts
View file

@ -212,24 +212,6 @@ export class GBServer {
await minService.buildMin(instances); await minService.buildMin(instances);
if (process.env.ENABLE_WEBLOG) { if (process.env.ENABLE_WEBLOG) {
const admins = {
admin: { password: process.env.ADMIN_PASS }
};
// ... some not authenticated middlewares
server.use(async (req, res, next) => {
if (req.originalUrl.startsWith('/logs')) {
const user = auth(req);
if (!user || !admins[user.name] || admins[user.name].password !== user.pass) {
res.set('WWW-Authenticate', 'Basic realm="example"');
return res.status(401).send();
}
} else {
return next();
}
});
// If global log enabled, reorders transports adding web logging. // If global log enabled, reorders transports adding web logging.
const loggers = GBLog.getLogger(); const loggers = GBLog.getLogger();
@ -237,7 +219,24 @@ export class GBServer {
} }
server.get('*', async (req, res, next) => { server.get('*', async (req, res, next) => {
if (req.originalUrl.startsWith('/logs')) {
if (process.env.ENABLE_WEBLOG) {
const admins = {
admin: { password: process.env.ADMIN_PASS }
};
// ... some not authenticated middlewares.
const user = auth(req);
if (!user || !admins[user.name] || admins[user.name].password !== user.pass) {
res.set('WWW-Authenticate', 'Basic realm="example"');
return res.status(401).send();
}
} else {
await GBSSR.ssrFilter(req, res, next); await GBSSR.ssrFilter(req, res, next);
}
} else {
await GBSSR.ssrFilter(req, res, next);
}
}); });
GBLog.info(`The Bot Server is in RUNNING mode...`); GBLog.info(`The Bot Server is in RUNNING mode...`);