Prometheus password fix (#1319)

* Russian translation * Fix require prometheus password --------- Co-authored-by: Vadim Babadzhanyan <[email protected]>
wg-easy · Sep 10, 2024 · 6e891ad · 6e891ad
1 parent e2fe3b8
commit 6e891ad
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/lib/Server.js b/src/lib/Server.js
@@ -336,22 +336,17 @@ module.exports = class Server {
       });
     };
 
-    // Prometheus Metrics API
-    const routerPrometheusMetrics = createRouter();
-    app.use(routerPrometheusMetrics);
-
     // Check Prometheus credentials
     app.use(
       fromNodeMiddleware((req, res, next) => {
         if (!requiresPrometheusPassword || !req.url.startsWith('/metrics')) {
           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) => {