1 files changed, 86 insertions, 20 deletions

diff --git a/src/zenserver/storage/admin/admin.cpp b/src/zenserver/storage/admin/admin.cpp
index 34d9e570e..1de5f74fe 100644
--- a/src/zenserver/storage/admin/admin.cpp
+++ b/src/zenserver/storage/admin/admin.cpp
@@ -26,6 +26,60 @@
 
 namespace zen {
 
+#if ZEN_WITH_TRACE
+namespace {
+	// Accept only loopback destinations for admin-triggered trace streams. Handles
+	// "localhost", "127.0.0.1", "::1", and bracketed IPv6 ("[::1]"), each optionally
+	// followed by ":<digits>". Rejects any control characters so the value is also
+	// safe to log.
+	bool IsLoopbackTraceHost(std::string_view Host)
+	{
+		if (Host.empty())
+		{
+			return false;
+		}
+		for (char C : Host)
+		{
+			if (static_cast<unsigned char>(C) < 0x20 || C == 0x7F)
+			{
+				return false;
+			}
+		}
+
+		std::string_view HostOnly = Host;
+		if (HostOnly.front() == '[')
+		{
+			const size_t Close = HostOnly.find(']');
+			if (Close == std::string_view::npos)
+			{
+				return false;
+			}
+			const std::string_view Tail = HostOnly.substr(Close + 1);
+			if (!Tail.empty())
+			{
+				if (Tail.front() != ':' || Tail.size() < 2 || Tail.find_first_not_of("0123456789", 1) != std::string_view::npos)
+				{
+					return false;
+				}
+			}
+			HostOnly = HostOnly.substr(1, Close - 1);
+		}
+		else if (const size_t Colon = HostOnly.find(':');
+				 Colon != std::string_view::npos && HostOnly.find(':', Colon + 1) == std::string_view::npos)
+		{
+			const std::string_view Port = HostOnly.substr(Colon + 1);
+			if (Port.empty() || Port.find_first_not_of("0123456789") != std::string_view::npos)
+			{
+				return false;
+			}
+			HostOnly = HostOnly.substr(0, Colon);
+		}
+
+		return HostOnly == "localhost" || HostOnly == "127.0.0.1" || HostOnly == "::1";
+	}
+}  // namespace
+#endif	// ZEN_WITH_TRACE
+
 struct DirStats
 {
 	uint64_t FileCount = 0;
@@ -149,17 +203,13 @@ HttpAdminService::HttpAdminService(GcScheduler&			   Scheduler,
 		[&](HttpRouterRequest& Req) {
 			const auto&				JobIdString = Req.GetCapture(1);
 			std::optional<uint64_t> JobIdArg	= ParseInt<uint64_t>(JobIdString);
-			if (!JobIdArg)
-			{
-				Req.ServerRequest().WriteResponse(HttpResponseCode::BadRequest);
-			}
-			JobId Id{.Id = JobIdArg.value_or(0)};
-			if (Id.Id == 0)
+			if (!JobIdArg || JobIdArg.value() == 0)
 			{
 				return Req.ServerRequest().WriteResponse(HttpResponseCode::BadRequest,
 														 ZenContentType::kText,
-														 fmt::format("Invalid Job Id: {}", Id.Id));
+														 fmt::format("Invalid Job Id: '{}'", JobIdString));
 			}
+			const JobId Id{.Id = JobIdArg.value()};
 
 			std::optional<JobQueue::JobDetails> CurrentState = m_BackgroundJobQueue.Get(Id);
 			if (!CurrentState)
@@ -271,11 +321,13 @@ HttpAdminService::HttpAdminService(GcScheduler&			   Scheduler,
 		[&](HttpRouterRequest& Req) {
 			const auto&				JobIdString = Req.GetCapture(1);
 			std::optional<uint64_t> JobIdArg	= ParseInt<uint64_t>(JobIdString);
-			if (!JobIdArg)
+			if (!JobIdArg || JobIdArg.value() == 0)
 			{
-				Req.ServerRequest().WriteResponse(HttpResponseCode::BadRequest);
+				return Req.ServerRequest().WriteResponse(HttpResponseCode::BadRequest,
+														 ZenContentType::kText,
+														 fmt::format("Invalid Job Id: '{}'", JobIdString));
 			}
-			JobId Id{.Id = JobIdArg.value_or(0)};
+			const JobId Id{.Id = JobIdArg.value()};
 			if (m_BackgroundJobQueue.CancelJob(Id))
 			{
 				Req.ServerRequest().WriteResponse(HttpResponseCode::OK);
@@ -610,11 +662,6 @@ HttpAdminService::HttpAdminService(GcScheduler&			   Scheduler,
 			const HttpServerRequest::QueryParams Params	 = HttpReq.GetQueryParams();
 			TraceOptions						 TraceOptions;
 
-			if (!IsTracing())
-			{
-				TraceInit("zenserver");
-			}
-
 			if (auto Channels = Params.GetValue("channels"); Channels.empty() == false)
 			{
 				TraceOptions.Channels = Channels;
@@ -622,22 +669,41 @@ HttpAdminService::HttpAdminService(GcScheduler&			   Scheduler,
 
 			if (auto File = Params.GetValue("file"); File.empty() == false)
 			{
-				TraceOptions.File = File;
+				const std::filesystem::path			 TracesRoot = m_ServerOptions.DataDir / "traces";
+				std::optional<std::filesystem::path> Resolved	= ResolveSafeRelativePath(TracesRoot, File);
+				if (!Resolved)
+				{
+					ZEN_WARN("admin trace/start rejected unsafe 'file' parameter '{}'", File);
+					return HttpReq.WriteResponse(HttpResponseCode::BadRequest, HttpContentType::kText, "Invalid 'file' parameter"sv);
+				}
+				TraceOptions.File = Resolved->string();
 			}
 			else if (auto Host = Params.GetValue("host"); Host.empty() == false)
 			{
+				if (!IsLoopbackTraceHost(Host))
+				{
+					ZEN_WARN("admin trace/start rejected non-loopback 'host' parameter '{}'", Host);
+					return HttpReq.WriteResponse(HttpResponseCode::BadRequest,
+												 HttpContentType::kText,
+												 "Invalid 'host' parameter (must be a loopback address)"sv);
+				}
 				TraceOptions.Host = Host;
 			}
 			else
 			{
-				return Req.ServerRequest().WriteResponse(HttpResponseCode::BadRequest,
-														 HttpContentType::kText,
-														 "Invalid trace type, use `file` or `host`"sv);
+				return HttpReq.WriteResponse(HttpResponseCode::BadRequest,
+											 HttpContentType::kText,
+											 "Invalid trace type, use `file` or `host`"sv);
+			}
+
+			if (!IsTracing())
+			{
+				TraceInit("zenserver");
 			}
 
 			TraceConfigure(TraceOptions);
 
-			return Req.ServerRequest().WriteResponse(HttpResponseCode::OK, HttpContentType::kText, "Tracing started");
+			return HttpReq.WriteResponse(HttpResponseCode::OK, HttpContentType::kText, "Tracing started");
 		},
 		HttpVerb::kPost);