From e9503474a45bb70a61987fab4e3f90fabd06f04c Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Fri, 21 Apr 2023 09:27:32 -0700 Subject: [PATCH] put /metrics endpoint behind auth --- service/OneService.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/service/OneService.cpp b/service/OneService.cpp index 2993cbc09..2d3cfdf2e 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -1673,7 +1673,15 @@ public: } else scode = 404; _node->freeQueryResult((void *)pl); - } else scode = 500; + } else scode = 500;\ + } else if (ps[0] == "metrics") { + std::string statspath = _homePath + ZT_PATH_SEPARATOR + "metrics.prom"; + if (!OSUtils::readFile(statspath.c_str(), responseBody)) { + scode = 500; + } else { + scode = 200; + responseContentType = "text/plain"; + } } else { if (_controller) { scode = _controller->handleControlPlaneHttpGET(std::vector(ps.begin()+1,ps.end()),urlArgs,headers,body,responseBody,responseContentType); @@ -1751,14 +1759,6 @@ public: scode = 404; } #endif - } else if (ps[0] == "metrics") { - std::string statspath = _homePath + ZT_PATH_SEPARATOR + "metrics.prom"; - if (!OSUtils::readFile(statspath.c_str(), responseBody)) { - scode = 500; - } else { - scode = 200; - responseContentType = "text/plain"; - } } else { scode = 401; // isAuth == false && !sso }