From 79c44e3223c2bb9c6c49ccefa9cae71f1f2af336 Mon Sep 17 00:00:00 2001
From: Dan Engelbrecht <dan@engelbrecht.com>
Date: Mon, 5 Feb 2024 12:29:43 +0100
Subject: respond with BadRequest result instead of throwing exception on bad
 request input (#648)

---
 src/zenserver/projectstore/projectstore.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'src/zenserver/projectstore/projectstore.cpp')

diff --git a/src/zenserver/projectstore/projectstore.cpp b/src/zenserver/projectstore/projectstore.cpp
index 6bb543d63..ea219f9b0 100644
--- a/src/zenserver/projectstore/projectstore.cpp
+++ b/src/zenserver/projectstore/projectstore.cpp
@@ -2838,8 +2838,18 @@ ProjectStore::Rpc(HttpServerRequest&	 HttpReq,
 			}
 			break;
 		case HttpContentType::kCbPackage:
-			Package = ParsePackageMessage(Payload);
-			Cb		= Package.GetObject();
+			try
+			{
+				Package = ParsePackageMessage(Payload);
+				Cb		= Package.GetObject();
+			}
+			catch (const std::invalid_argument& ex)
+			{
+				HttpReq.WriteResponse(HttpResponseCode::BadRequest,
+									  HttpContentType::kText,
+									  fmt::format("Failed to parse package request, reason: '{}'", ex.what()));
+				return false;
+			}
 			if (!Cb)
 			{
 				HttpReq.WriteResponse(HttpResponseCode::BadRequest,
-- 
cgit v1.2.3