commit 90d2d1e887e68c70f8e5923eb69c3c9356dae547
author Jiaqing Zhao <jiaqing.zhao@intel.com> Wed Apr 13 17:01:57 2022 +0800
committer Ed Tanous <ed@tanous.net> Fri Apr 15 15:13:08 2022 +0000
tree ac7ecadb55fd81beef111d3a98c6593fcaafaa3c
parent 6f581ec3584cd9b4556a114d30f7a39c63ec64ec

CertificateService: Enhance error handling for ReplaceCertificate

Current implementation of the ReplaceCertificate API always returns
ResourceNotFound if any error occurs when calling DBus, regardless of
whether the certificate to be replaced exists or not. This patch checks
the error code and only return ResourceNotFound when the object path
does not exist, otherwise returns InternalError.

Tested:
* Replace HTTPS certificate at /redfish/v1/Managers/bmc/NetworkProtocol
  /HTTPS/Certificates/0 (Invalid URL) returns ResourceNotFound.
* Replace HTTPS certificate at /redfish/v1/Managers/bmc/NetworkProtocol
  /HTTPS/Certificates/1 with CertificateString not containing private
  key returns InternalError.

Change-Id: I67f6014c3856c192b4141e6a92f173a9a8c8189e
Signed-off-by: Jiaqing Zhao <jiaqing.zhao@intel.com>

redfish-core/lib/certificate_service.hpp

diff --git a/redfish-core/lib/certificate_service.hpp b/redfish-core/lib/certificate_service.hpp
index 9bea9b9..ccf5e9a 100644
--- a/redfish-core/lib/certificate_service.hpp
+++ b/redfish-core/lib/certificate_service.hpp
@@ -3,6 +3,7 @@
 #include <app.hpp>
 #include <boost/convert.hpp>
 #include <boost/convert/strtol.hpp>
+#include <boost/system/linux_error.hpp>
 #include <dbus_utility.hpp>
 #include <query.hpp>
 #include <registries/privilege_registry.hpp>
@@ -780,8 +781,14 @@
                     if (ec)
                     {
                         BMCWEB_LOG_ERROR << "DBUS response error: " << ec;
-                        messages::resourceNotFound(asyncResp->res, name,
-                                                   std::to_string(id));
+                        if (ec.value() ==
+                            boost::system::linux_error::bad_request_descriptor)
+                        {
+                            messages::resourceNotFound(asyncResp->res, name,
+                                                       std::to_string(id));
+                            return;
+                        }
+                        messages::internalError(asyncResp->res);
                         return;
                     }
                     getCertificateProperties(asyncResp, objectPath, service, id,