From c37421a3b4493c0b0f9afef15a4ea7b74d152067 Mon Sep 17 00:00:00 2001
From: Dan Engelbrecht <dan.engelbrecht@epicgames.com>
Date: Thu, 12 Feb 2026 10:58:41 +0100
Subject: add simple http client tests (#751)

* add simple http client tests and fix run loop of http server to not rely on application quit
---
 src/zenhttp/servers/httpnull.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/zenhttp/servers/httpnull.cpp')

diff --git a/src/zenhttp/servers/httpnull.cpp b/src/zenhttp/servers/httpnull.cpp
index 0ec1cb3c4..b770b97db 100644
--- a/src/zenhttp/servers/httpnull.cpp
+++ b/src/zenhttp/servers/httpnull.cpp
@@ -34,7 +34,8 @@ HttpNullServer::OnInitialize(int BasePort, std::filesystem::path DataDir)
 void
 HttpNullServer::OnRun(bool IsInteractiveSession)
 {
-	const int WaitTimeout = 1000;
+	const int WaitTimeout		= 1000;
+	bool	  ShutdownRequested = false;
 
 #if ZEN_PLATFORM_WINDOWS
 	if (IsInteractiveSession)
@@ -54,8 +55,8 @@ HttpNullServer::OnRun(bool IsInteractiveSession)
 			}
 		}
 
-		m_ShutdownEvent.Wait(WaitTimeout);
-	} while (!IsApplicationExitRequested());
+		ShutdownRequested = m_ShutdownEvent.Wait(WaitTimeout);
+	} while (!ShutdownRequested);
 #else
 	if (IsInteractiveSession)
 	{
@@ -64,8 +65,8 @@ HttpNullServer::OnRun(bool IsInteractiveSession)
 
 	do
 	{
-		m_ShutdownEvent.Wait(WaitTimeout);
-	} while (!IsApplicationExitRequested());
+		ShutdownRequested = m_ShutdownEvent.Wait(WaitTimeout);
+	} while (!ShutdownRequested);
 #endif
 }
 
-- 
cgit v1.2.3


From 3b5b777900d9f59ff32eb7cea79e3a72a08c67a6 Mon Sep 17 00:00:00 2001
From: Dan Engelbrecht <dan.engelbrecht@epicgames.com>
Date: Fri, 13 Feb 2026 13:27:08 +0100
Subject: add IHttpRequestFilter to allow server implementation to
 filter/reject requests (#753)

* add IHttpRequestFilter to allow server implementation to filter/reject requests
---
 src/zenhttp/servers/httpnull.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/zenhttp/servers/httpnull.cpp')

diff --git a/src/zenhttp/servers/httpnull.cpp b/src/zenhttp/servers/httpnull.cpp
index b770b97db..db360c5fb 100644
--- a/src/zenhttp/servers/httpnull.cpp
+++ b/src/zenhttp/servers/httpnull.cpp
@@ -24,6 +24,12 @@ HttpNullServer::OnRegisterService(HttpService& Service)
 	ZEN_UNUSED(Service);
 }
 
+void
+HttpNullServer::OnSetHttpRequestFilter(IHttpRequestFilter* RequestFilter)
+{
+	ZEN_UNUSED(RequestFilter);
+}
+
 int
 HttpNullServer::OnInitialize(int BasePort, std::filesystem::path DataDir)
 {
-- 
cgit v1.2.3


From 5e1e23e209eec75a396c18f8eee3d93a9e196bfc Mon Sep 17 00:00:00 2001
From: Dan Engelbrecht <dan.engelbrecht@epicgames.com>
Date: Tue, 17 Feb 2026 14:00:53 +0100
Subject: add http server root password protection (#757)

- Feature: Added `--security-config-path` option to zenserver to configure security settings
  - Expects a path to a .json file
  - Default is an empty path resulting in no extra security settings and legacy behavior
  - Current support is a top level filter of incoming http requests restricted to the `password` type
  - `password` type will check the `Authorization` header and match it to the selected authorization strategy
  - Currently the security settings is very basic and configured to a fixed username+password at startup

        {
            "http" {
                "root": {
                    "filter": {
                        "type": "password",
                        "config": {
	                          "password": {
	                              "username": "<username>",
	                              "password": "<password>"
	                          },
                            "protect-machine-local-requests": false,
	                          "unprotected-uris": [
	                              "/health/",
	                              "/health/info",
	                              "/health/version"
	                          ]
                        }
                    }
                }
            }
        }
---
 src/zenhttp/servers/httpnull.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/zenhttp/servers/httpnull.cpp')

diff --git a/src/zenhttp/servers/httpnull.cpp b/src/zenhttp/servers/httpnull.cpp
index db360c5fb..9bb7ef3bc 100644
--- a/src/zenhttp/servers/httpnull.cpp
+++ b/src/zenhttp/servers/httpnull.cpp
@@ -57,6 +57,7 @@ HttpNullServer::OnRun(bool IsInteractiveSession)
 
 			if (c == 27 || c == 'Q' || c == 'q')
 			{
+				m_ShutdownEvent.Set();
 				RequestApplicationExit(0);
 			}
 		}
-- 
cgit v1.2.3