Merge remote-tracking branch 'origin/main' into sb/threadpool

1 files changed, 151 insertions, 19 deletions

diff --git a/src/zenhttp/httpserver.cpp b/src/zenhttp/httpserver.cpp
index 761665c30..69000dd8e 100644
--- a/src/zenhttp/httpserver.cpp
+++ b/src/zenhttp/httpserver.cpp
@@ -2,6 +2,8 @@
 
 #include <zenhttp/httpserver.h>
 
+#include <zencore/filesystem.h>
+
 #include "servers/httpasio.h"
 #include "servers/httpmulti.h"
 #include "servers/httpnull.h"
@@ -23,10 +25,12 @@
 #include <zencore/logging.h>
 #include <zencore/stream.h>
 #include <zencore/string.h>
+#include <zencore/system.h>
 #include <zencore/testing.h>
 #include <zencore/thread.h>
 #include <zenhttp/packageformat.h>
 #include <zentelemetry/otlptrace.h>
+#include <zentelemetry/stats.h>
 
 #include <charconv>
 #include <mutex>
@@ -745,6 +749,10 @@ HttpRequestRouter::RegisterRoute(const char* UriPattern, HttpRequestRouter::Hand
 				{
 					if (UriPattern[i] == '}')
 					{
+						if (i == PatternStart)
+						{
+							throw std::runtime_error(fmt::format("matcher pattern is empty in URI pattern '{}'", UriPattern));
+						}
 						std::string_view Pattern(&UriPattern[PatternStart], i - PatternStart);
 						if (auto it = m_MatcherNameMap.find(std::string(Pattern)); it != m_MatcherNameMap.end())
 						{
@@ -910,8 +918,9 @@ HttpRequestRouter::HandleRequest(zen::HttpServerRequest& Request)
 
 			CapturedSegments.emplace_back(Uri);
 
-			for (int MatcherIndex : Matchers)
+			for (size_t MatcherOffset = 0; MatcherOffset < Matchers.size(); MatcherOffset++)
 			{
+				int MatcherIndex = Matchers[MatcherOffset];
 				if (UriPos >= UriLen)
 				{
 					IsMatch = false;
@@ -921,9 +930,9 @@ HttpRequestRouter::HandleRequest(zen::HttpServerRequest& Request)
 				if (MatcherIndex < 0)
 				{
 					// Literal match
-					int				   LitIndex = -MatcherIndex - 1;
-					const std::string& LitStr	= m_Literals[LitIndex];
-					size_t			   LitLen	= LitStr.length();
+					int				 LitIndex = -MatcherIndex - 1;
+					std::string_view LitStr	  = m_Literals[LitIndex];
+					size_t			 LitLen	  = LitStr.length();
 
 					if (Uri.substr(UriPos, LitLen) == LitStr)
 					{
@@ -939,9 +948,18 @@ HttpRequestRouter::HandleRequest(zen::HttpServerRequest& Request)
 				{
 					// Matcher function
 					size_t SegmentStart = UriPos;
-					while (UriPos < UriLen && Uri[UriPos] != '/')
+
+					if (MatcherOffset == (Matchers.size() - 1))
 					{
-						++UriPos;
+						// Last matcher, use the remaining part of the uri
+						UriPos = UriLen;
+					}
+					else
+					{
+						while (UriPos < UriLen && Uri[UriPos] != '/')
+						{
+							++UriPos;
+						}
 					}
 
 					std::string_view Segment = Uri.substr(SegmentStart, UriPos - SegmentStart);
@@ -1014,7 +1032,31 @@ HttpRequestRouter::HandleRequest(zen::HttpServerRequest& Request)
 int
 HttpServer::Initialize(int BasePort, std::filesystem::path DataDir)
 {
-	return OnInitialize(BasePort, std::move(DataDir));
+	m_EffectivePort = OnInitialize(BasePort, std::move(DataDir));
+	m_ExternalHost	= OnGetExternalHost();
+	return m_EffectivePort;
+}
+
+std::string
+HttpServer::OnGetExternalHost() const
+{
+	return GetMachineName();
+}
+
+std::string
+HttpServer::GetServiceUri(const HttpService* Service) const
+{
+	const char* Scheme = (m_EffectiveHttpsPort > 0) ? "https" : "http";
+	int			Port   = (m_EffectiveHttpsPort > 0) ? m_EffectiveHttpsPort : m_EffectivePort;
+
+	if (Service)
+	{
+		return fmt::format("{}://{}:{}{}", Scheme, m_ExternalHost, Port, Service->BaseUri());
+	}
+	else
+	{
+		return fmt::format("{}://{}:{}", Scheme, m_ExternalHost, Port);
+	}
 }
 
 void
@@ -1058,6 +1100,39 @@ HttpServer::SetHttpRequestFilter(IHttpRequestFilter* RequestFilter)
 	OnSetHttpRequestFilter(RequestFilter);
 }
 
+CbObject
+HttpServer::CollectStats()
+{
+	CbObjectWriter Cbo;
+
+	metrics::EmitSnapshot("requests", m_RequestMeter, Cbo);
+
+	Cbo.BeginObject("bytes");
+	{
+		Cbo << "received" << GetTotalBytesReceived();
+		Cbo << "sent" << GetTotalBytesSent();
+	}
+	Cbo.EndObject();
+
+	Cbo.BeginObject("websockets");
+	{
+		Cbo << "active_connections" << GetActiveWebSocketConnectionCount();
+		Cbo << "frames_received" << m_WsFramesReceived.load(std::memory_order_relaxed);
+		Cbo << "frames_sent" << m_WsFramesSent.load(std::memory_order_relaxed);
+		Cbo << "bytes_received" << m_WsBytesReceived.load(std::memory_order_relaxed);
+		Cbo << "bytes_sent" << m_WsBytesSent.load(std::memory_order_relaxed);
+	}
+	Cbo.EndObject();
+
+	return Cbo.Save();
+}
+
+void
+HttpServer::HandleStatsRequest(HttpServerRequest& Request)
+{
+	Request.WriteResponse(HttpResponseCode::OK, CollectStats());
+}
+
 //////////////////////////////////////////////////////////////////////////
 
 HttpRpcHandler::HttpRpcHandler()
@@ -1082,9 +1157,13 @@ CreateHttpServerClass(const std::string_view ServerClass, const HttpServerConfig
 	if (ServerClass == "asio"sv)
 	{
 		ZEN_INFO("using asio HTTP server implementation")
-		return CreateHttpAsioServer(AsioConfig{.ThreadCount		  = Config.ThreadCount,
-											   .ForceLoopback	  = Config.ForceLoopback,
-											   .IsDedicatedServer = Config.IsDedicatedServer});
+		return CreateHttpAsioServer(AsioConfig {
+			.ThreadCount = Config.ThreadCount, .ForceLoopback = Config.ForceLoopback, .IsDedicatedServer = Config.IsDedicatedServer,
+			.NoNetwork = Config.NoNetwork, .UnixSocketPath = PathToUtf8(Config.UnixSocketPath),
+#if ZEN_USE_OPENSSL
+			.HttpsPort = Config.HttpsPort, .CertFile = Config.CertFile, .KeyFile = Config.KeyFile,
+#endif
+		});
 	}
 #if ZEN_WITH_HTTPSYS
 	else if (ServerClass == "httpsys"sv)
@@ -1096,7 +1175,11 @@ CreateHttpServerClass(const std::string_view ServerClass, const HttpServerConfig
 													.IsRequestLoggingEnabled = Config.HttpSys.IsRequestLoggingEnabled,
 													.IsDedicatedServer		 = Config.IsDedicatedServer,
 													.ForceLoopback			 = Config.ForceLoopback,
-													.UseExplicitIoThreadPool = Config.HttpSys.UseExplicitIoThreadPool}));
+													.UseExplicitIoThreadPool = Config.HttpSys.UseExplicitIoThreadPool,
+													.HttpsPort				 = Config.HttpSys.HttpsPort,
+													.CertThumbprint			 = Config.HttpSys.CertThumbprint,
+													.CertStoreName			 = Config.HttpSys.CertStoreName,
+													.HttpsOnly				 = Config.HttpSys.HttpsOnly}));
 	}
 #endif
 	else if (ServerClass == "null"sv)
@@ -1301,6 +1384,8 @@ HandlePackageOffers(HttpService& Service, HttpServerRequest& Request, Ref<IHttpP
 
 #if ZEN_WITH_TESTS
 
+TEST_SUITE_BEGIN("http.httpserver");
+
 TEST_CASE("http.common")
 {
 	using namespace std::literals;
@@ -1406,20 +1491,33 @@ TEST_CASE("http.common")
 
 	SUBCASE("router-matcher")
 	{
-		bool					 HandledA	  = false;
-		bool					 HandledAA	  = false;
-		bool					 HandledAB	  = false;
-		bool					 HandledAandB = false;
+		bool					 HandledA		 = false;
+		bool					 HandledAA		 = false;
+		bool					 HandledAB		 = false;
+		bool					 HandledAandB	 = false;
+		bool					 HandledAandPath = false;
 		std::vector<std::string> Captures;
 		auto					 Reset = [&] {
-			HandledA = HandledAA = HandledAB = HandledAandB = false;
+			HandledA = HandledAA = HandledAB = HandledAandB = HandledAandPath = false;
 			Captures.clear();
 		};
 
 		TestHttpService	  Service;
 		HttpRequestRouter r;
-		r.AddMatcher("a", [](std::string_view In) -> bool { return In.length() % 2 == 0; });
-		r.AddMatcher("b", [](std::string_view In) -> bool { return In.length() % 3 == 0; });
+
+		r.AddMatcher("a", [](std::string_view In) -> bool { return In.length() % 2 == 0 && In.find('/') == std::string_view::npos; });
+		r.AddMatcher("b", [](std::string_view In) -> bool { return In.length() % 3 == 0 && In.find('/') == std::string_view::npos; });
+		static constexpr AsciiSet ValidPathCharactersSet{"abcdefghijklmnopqrstuvwxyz0123456789/_.,;$~{}+-[]%()]ABCDEFGHIJKLMNOPQRSTUVWXYZ"};
+		r.AddMatcher("path", [](std::string_view Str) -> bool { return !Str.empty() && AsciiSet::HasOnly(Str, ValidPathCharactersSet); });
+
+		r.RegisterRoute(
+			"path/{a}/{path}",
+			[&](auto& Req) {
+				HandledAandPath = true;
+				Captures		= {std::string(Req.GetCapture(1)), std::string(Req.GetCapture(2))};
+			},
+			HttpVerb::kGet);
+
 		r.RegisterRoute(
 			"{a}",
 			[&](auto& Req) {
@@ -1448,7 +1546,6 @@ TEST_CASE("http.common")
 				Captures	 = {std::string(Req.GetCapture(1)), std::string(Req.GetCapture(2))};
 			},
 			HttpVerb::kGet);
-
 		{
 			Reset();
 			TestHttpServerRequest req{Service, "ab"sv};
@@ -1456,6 +1553,7 @@ TEST_CASE("http.common")
 			CHECK(HandledA);
 			CHECK(!HandledAA);
 			CHECK(!HandledAB);
+			CHECK(!HandledAandPath);
 
 			REQUIRE_EQ(Captures.size(), 1);
 			CHECK_EQ(Captures[0], "ab"sv);
@@ -1468,6 +1566,7 @@ TEST_CASE("http.common")
 			CHECK(!HandledA);
 			CHECK(!HandledAA);
 			CHECK(HandledAB);
+			CHECK(!HandledAandPath);
 			REQUIRE_EQ(Captures.size(), 2);
 			CHECK_EQ(Captures[0], "ab"sv);
 			CHECK_EQ(Captures[1], "def"sv);
@@ -1481,6 +1580,7 @@ TEST_CASE("http.common")
 			CHECK(!HandledAA);
 			CHECK(!HandledAB);
 			CHECK(HandledAandB);
+			CHECK(!HandledAandPath);
 			REQUIRE_EQ(Captures.size(), 2);
 			CHECK_EQ(Captures[0], "ab"sv);
 			CHECK_EQ(Captures[1], "def"sv);
@@ -1493,6 +1593,7 @@ TEST_CASE("http.common")
 			CHECK(!HandledA);
 			CHECK(!HandledAA);
 			CHECK(!HandledAB);
+			CHECK(!HandledAandPath);
 		}
 
 		{
@@ -1502,6 +1603,35 @@ TEST_CASE("http.common")
 			CHECK(HandledA);
 			CHECK(!HandledAA);
 			CHECK(!HandledAB);
+			CHECK(!HandledAandPath);
+			REQUIRE_EQ(Captures.size(), 1);
+			CHECK_EQ(Captures[0], "a123"sv);
+		}
+
+		{
+			Reset();
+			TestHttpServerRequest req{Service, "path/ab/simple_path.txt"sv};
+			r.HandleRequest(req);
+			CHECK(!HandledA);
+			CHECK(!HandledAA);
+			CHECK(!HandledAB);
+			CHECK(HandledAandPath);
+			REQUIRE_EQ(Captures.size(), 2);
+			CHECK_EQ(Captures[0], "ab"sv);
+			CHECK_EQ(Captures[1], "simple_path.txt"sv);
+		}
+
+		{
+			Reset();
+			TestHttpServerRequest req{Service, "path/ab/directory/and/path.txt"sv};
+			r.HandleRequest(req);
+			CHECK(!HandledA);
+			CHECK(!HandledAA);
+			CHECK(!HandledAB);
+			CHECK(HandledAandPath);
+			REQUIRE_EQ(Captures.size(), 2);
+			CHECK_EQ(Captures[0], "ab"sv);
+			CHECK_EQ(Captures[1], "directory/and/path.txt"sv);
 		}
 	}
 
@@ -1519,6 +1649,8 @@ TEST_CASE("http.common")
 	}
 }
 
+TEST_SUITE_END();
+
 void
 http_forcelink()
 {