From 6e891ad9fb48cc6843782b82b4f9fc51e92c888b Mon Sep 17 00:00:00 2001 From: Vadim Babadzhanyan Date: Tue, 10 Sep 2024 19:46:09 +0300 Subject: [PATCH] Prometheus password fix (#1319) * Russian translation * Fix require prometheus password --------- Co-authored-by: Vadim Babadzhanyan --- src/lib/Server.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/lib/Server.js b/src/lib/Server.js index 08e7dc5e..da2f6c9d 100644 --- a/src/lib/Server.js +++ b/src/lib/Server.js @@ -336,10 +336,6 @@ module.exports = class Server { }); }; - // Prometheus Metrics API - const routerPrometheusMetrics = createRouter(); - app.use(routerPrometheusMetrics); - // Check Prometheus credentials app.use( fromNodeMiddleware((req, res, next) => { @@ -347,11 +343,10 @@ module.exports = class Server { return next(); } const user = basicAuth(req); - if (requiresPrometheusPassword && !user) { + if (!user) { res.statusCode = 401; return { error: 'Not Logged In' }; } - if (user.pass) { if (isPasswordValid(user.pass, PROMETHEUS_METRICS_PASSWORD)) { return next(); @@ -364,6 +359,10 @@ module.exports = class Server { }), ); + // Prometheus Metrics API + const routerPrometheusMetrics = createRouter(); + app.use(routerPrometheusMetrics); + // Prometheus Routes routerPrometheusMetrics .get('/metrics', defineEventHandler(async (event) => {