HttpServer fix: return 400 bad request instead of no response (#18)

sergiye · sergiye · commit 163c04396e04 · 2026-03-30T11:34:45.000+03:00
diff --git a/OpenHardwareMonitor/Utilities/HttpServer.cs b/OpenHardwareMonitor/Utilities/HttpServer.cs
@@ -251,21 +251,21 @@ private void HandleSensorRequest(HttpListenerRequest request, Dictionary<string,
     {
         IDictionary<string, string> dict = ToDictionary(HttpUtility.ParseQueryString(request.Url.Query));
 
-        if (dict.ContainsKey("action"))
+        if (dict.TryGetValue("action", out string action))
         {
-            if (dict.ContainsKey("id"))
+            if (dict.TryGetValue("id", out string identifier))
             {
-                SensorNode sNode = FindSensor(_root, dict["id"])
-                    ?? throw new ArgumentException("Unknown id " + dict["id"] + " specified");
-                if (dict["action"] == "ResetMinMax")
+                SensorNode sNode = FindSensor(_root, identifier)
+                    ?? throw new ArgumentException("Unknown id " + identifier + " specified");
+                if (action == "ResetMinMax")
                 {
                     // Reset Min/Max, then return Sensor values...
                     sNode.Sensor.ResetMin();
                     sNode.Sensor.ResetMax();
-                    dict["action"] = "Get";
+                    action = "Get";
                 }
 
-                switch (dict["action"])
+                switch (action)
                 {
                     case "Set" when dict.ContainsKey("value"):
                         SetSensorControlValue(sNode, dict["value"]);
@@ -279,7 +279,7 @@ private void HandleSensorRequest(HttpListenerRequest request, Dictionary<string,
                         result["format"] = sNode.Format;
                         break;
                     default:
-                        throw new ArgumentException("Unknown action type " + dict["action"]);
+                        throw new ArgumentException("Unknown action type " + action);
                 }
             }
             else
@@ -341,6 +341,8 @@ private async Task HandleContextAsync(HttpListenerContext context)
             }
         }
 
+        try
+        {
         if (authenticated)
         {
             switch (request.HttpMethod)
@@ -422,15 +424,23 @@ private async Task HandleContextAsync(HttpListenerContext context)
             await SendResponseAsync(context.Response, responseString, "text/html");
         }
 
-        try
+        context.Response.Close();
+        }
+        catch(ArgumentException ex)
         {
+            context.Response.StatusCode = 400;
+            string responseString = @$"<HTML><HEAD><TITLE>400 Bad Request</TITLE></HEAD>
+    <BODY><H4>400 Bad Request</H4>
+    {ex.Message}</BODY></HTML> ";
+            await SendResponseAsync(context.Response, responseString, "text/html");
             context.Response.Close();
         }
         catch
         {
             // client closed connection before the content was sent
         }
     }
+
     private async Task ServeResourceFileAsync(HttpListenerResponse response, string name, string ext)
     {
         // resource names do not support the hyphen

Original file line number	Diff line number	Diff line change
`@@ -251,21 +251,21 @@ private void HandleSensorRequest(HttpListenerRequest request, Dictionary<string,`
`251`	`251`	`{`
`252`	`252`	`IDictionary<string, string> dict = ToDictionary(HttpUtility.ParseQueryString(request.Url.Query));`
`253`	`253`
`254`		`- if (dict.ContainsKey("action"))`
	`254`	`+ if (dict.TryGetValue("action", out string action))`
`255`	`255`	`{`
`256`		`- if (dict.ContainsKey("id"))`
	`256`	`+ if (dict.TryGetValue("id", out string identifier))`
`257`	`257`	`{`
`258`		`- SensorNode sNode = FindSensor(_root, dict["id"])`
`259`		`- ?? throw new ArgumentException("Unknown id " + dict["id"] + " specified");`
`260`		`- if (dict["action"] == "ResetMinMax")`
	`258`	`+ SensorNode sNode = FindSensor(_root, identifier)`
	`259`	`+ ?? throw new ArgumentException("Unknown id " + identifier + " specified");`
	`260`	`+ if (action == "ResetMinMax")`
`261`	`261`	`{`
`262`	`262`	`// Reset Min/Max, then return Sensor values...`
`263`	`263`	`sNode.Sensor.ResetMin();`
`264`	`264`	`sNode.Sensor.ResetMax();`
`265`		`- dict["action"] = "Get";`
	`265`	`+ action = "Get";`
`266`	`266`	`}`
`267`	`267`
`268`		`- switch (dict["action"])`
	`268`	`+ switch (action)`
`269`	`269`	`{`
`270`	`270`	`case "Set" when dict.ContainsKey("value"):`
`271`	`271`	`SetSensorControlValue(sNode, dict["value"]);`
`@@ -279,7 +279,7 @@ private void HandleSensorRequest(HttpListenerRequest request, Dictionary<string,`
`279`	`279`	`result["format"] = sNode.Format;`
`280`	`280`	`break;`
`281`	`281`	`default:`
`282`		`- throw new ArgumentException("Unknown action type " + dict["action"]);`
	`282`	`+ throw new ArgumentException("Unknown action type " + action);`
`283`	`283`	`}`
`284`	`284`	`}`
`285`	`285`	`else`
`@@ -341,6 +341,8 @@ private async Task HandleContextAsync(HttpListenerContext context)`
`341`	`341`	`}`
`342`	`342`	`}`
`343`	`343`
	`344`	`+ try`
	`345`	`+ {`
`344`	`346`	`if (authenticated)`
`345`	`347`	`{`
`346`	`348`	`switch (request.HttpMethod)`
`@@ -422,15 +424,23 @@ private async Task HandleContextAsync(HttpListenerContext context)`
`422`	`424`	`await SendResponseAsync(context.Response, responseString, "text/html");`
`423`	`425`	`}`
`424`	`426`
`425`		`- try`
	`427`	`+ context.Response.Close();`
	`428`	`+ }`
	`429`	`+ catch(ArgumentException ex)`
`426`	`430`	`{`
	`431`	`+ context.Response.StatusCode = 400;`
	`432`	`+ string responseString = @$"<HTML><HEAD><TITLE>400 Bad Request</TITLE></HEAD>`
	`433`	`+ <BODY><H4>400 Bad Request</H4>`
	`434`	`+ {ex.Message}</BODY></HTML> ";`
	`435`	`+ await SendResponseAsync(context.Response, responseString, "text/html");`
`427`	`436`	`context.Response.Close();`
`428`	`437`	`}`
`429`	`438`	`catch`
`430`	`439`	`{`
`431`	`440`	`// client closed connection before the content was sent`
`432`	`441`	`}`
`433`	`442`	`}`
	`443`	`+`
`434`	`444`	`private async Task ServeResourceFileAsync(HttpListenerResponse response, string name, string ext)`
`435`	`445`	`{`
`436`	`446`	`// resource names do not support the hyphen`