hub instance dashboard proxy (#914)

- Feature: Hub dashboard proxy - instance dashboards are accessible through the hub server at `/hub/proxy/{port}/` without requiring direct port access

1 files changed, 57 insertions, 1 deletions

diff --git a/src/zenserver/hub/httphubservice.cpp b/src/zenserver/hub/httphubservice.cpp
index d52da5ae7..eba816793 100644
--- a/src/zenserver/hub/httphubservice.cpp
+++ b/src/zenserver/hub/httphubservice.cpp
@@ -2,6 +2,7 @@
 
 #include "httphubservice.h"
 
+#include "httpproxyhandler.h"
 #include "hub.h"
 #include "storageserverinstance.h"
 
@@ -43,10 +44,11 @@ namespace {
 	}
 }  // namespace
 
-HttpHubService::HttpHubService(Hub& Hub, HttpStatsService& StatsService, HttpStatusService& StatusService)
+HttpHubService::HttpHubService(Hub& Hub, HttpProxyHandler& Proxy, HttpStatsService& StatsService, HttpStatusService& StatusService)
 : m_Hub(Hub)
 , m_StatsService(StatsService)
 , m_StatusService(StatusService)
+, m_Proxy(Proxy)
 {
 	using namespace std::literals;
 
@@ -67,6 +69,23 @@ HttpHubService::HttpHubService(Hub& Hub, HttpStatsService& StatsService, HttpSta
 		return true;
 	});
 
+	m_Router.AddMatcher("port", [](std::string_view Str) -> bool {
+		if (Str.empty())
+		{
+			return false;
+		}
+		for (const auto C : Str)
+		{
+			if (!std::isdigit(C))
+			{
+				return false;
+			}
+		}
+		return true;
+	});
+
+	m_Router.AddMatcher("proxypath", [](std::string_view Str) -> bool { return !Str.empty(); });
+
 	m_Router.RegisterRoute(
 		"status",
 		[this](HttpRouterRequest& Req) {
@@ -232,6 +251,25 @@ HttpHubService::HttpHubService(Hub& Hub, HttpStatsService& StatsService, HttpSta
 		},
 		HttpVerb::kPost);
 
+	m_Router.RegisterRoute(
+		"proxy/{port}/{proxypath}",
+		[this](HttpRouterRequest& Req) {
+			std::string_view PortStr = Req.GetCapture(1);
+
+			// Use RelativeUriWithExtension to preserve the file extension that the
+			// router's URI parser strips (e.g. ".css", ".js") - the upstream server
+			// needs the full path including the extension.
+			std::string_view FullUri = Req.ServerRequest().RelativeUriWithExtension();
+			std::string_view Prefix	 = "proxy/";
+
+			// FullUri is "proxy/{port}/{path...}" - skip past "proxy/{port}/"
+			size_t			 PathStart = Prefix.size() + PortStr.size() + 1;
+			std::string_view PathTail  = (PathStart < FullUri.size()) ? FullUri.substr(PathStart) : std::string_view{};
+
+			m_Proxy.HandleProxyRequest(Req.ServerRequest(), PortStr, PathTail);
+		},
+		HttpVerb::kGet | HttpVerb::kPost | HttpVerb::kPut | HttpVerb::kDelete | HttpVerb::kHead);
+
 	m_StatsService.RegisterHandler("hub", *this);
 	m_StatusService.RegisterHandler("hub", *this);
 }
@@ -392,4 +430,22 @@ HttpHubService::HandleModuleDelete(HttpServerRequest& Request, std::string_view
 	Request.WriteResponse(HttpResponseCode::OK, Obj.Save());
 }
 
+void
+HttpHubService::OnWebSocketOpen(Ref<WebSocketConnection> Connection, std::string_view RelativeUri)
+{
+	m_Proxy.OnWebSocketOpen(std::move(Connection), RelativeUri);
+}
+
+void
+HttpHubService::OnWebSocketMessage(WebSocketConnection& Conn, const WebSocketMessage& Msg)
+{
+	m_Proxy.OnWebSocketMessage(Conn, Msg);
+}
+
+void
+HttpHubService::OnWebSocketClose(WebSocketConnection& Conn, uint16_t Code, std::string_view Reason)
+{
+	m_Proxy.OnWebSocketClose(Conn, Code, Reason);
+}
+
 }  // namespace zen