fix: ensure HTTP 404 or 500 is returned when image file is missing or unreadable

Author: eduardomozart

src/confighttp.cpp

@@ -874,6 +874,11 @@ namespace confighttp {
     print_req(request);
 
     std::ifstream in(WEB_DIR "images/sunshine.ico", std::ios::binary);
+    if (!in.is_open()) {
+      response->write(SimpleWeb::StatusCode::client_error_not_found);
+      response->close_connection_after_response = true;
+      return;
+    }
     SimpleWeb::CaseInsensitiveMultimap headers;
     headers.emplace("Content-Type", "image/x-icon");
     headers.emplace("X-Frame-Options", "DENY");
@@ -892,6 +897,11 @@ namespace confighttp {
     print_req(request);
 
     std::ifstream in(WEB_DIR "images/logo-sunshine-45.png", std::ios::binary);
+    if (!in.is_open()) {
+      response->write(SimpleWeb::StatusCode::client_error_not_found);
+      response->close_connection_after_response = true;
+      return;
+    }
     SimpleWeb::CaseInsensitiveMultimap headers;
     headers.emplace("Content-Type", "image/png");
     headers.emplace("X-Frame-Options", "DENY");

src/nvhttp.cpp

@@ -1241,6 +1241,16 @@ namespace nvhttp {
     auto app_image = proc::proc.get_app_image((int) util::from_view(get_arg(args, "appid")));
 
     std::ifstream in(app_image, std::ios::binary);
+    if (!in.is_open()) {
+      std::error_code ec;
+      if (std::filesystem::exists(app_image, ec)) {
+        response->write(SimpleWeb::StatusCode::server_error_internal_server_error);
+      } else {
+        response->write(SimpleWeb::StatusCode::client_error_not_found);
+      }
+      response->close_connection_after_response = true;
+      return;
+    }
     SimpleWeb::CaseInsensitiveMultimap headers;
     headers.emplace("Content-Type", "image/png");
     response->write(SimpleWeb::StatusCode::success_ok, in, headers);