Hardened message handling by adding handling for StringConversionException and std::exception in message_callback of OCPP1.6 (#1018)

Signed-off-by: Piet Gömpel <[email protected]>

Author: Pietfried

lib/ocpp/v16/charge_point_impl.cpp

@@ -1288,6 +1288,10 @@ void ChargePointImpl::message_callback(const std::string& message) {
         EVLOG_error << "runtime_error during reception of message: " << e.what();
         this->message_dispatcher->dispatch_call_error(CallError(MessageId("-1"), "GenericError", e.what(), json({})));
         return;
+    } catch (const std::exception& e) {
+        EVLOG_error << "Exception during reception of message: " << e.what();
+        this->message_dispatcher->dispatch_call_error(CallError(MessageId("-1"), "GenericError", e.what(), json({})));
+        return;
     }
 
     auto json_message = enhanced_message.message;
@@ -1366,8 +1370,8 @@ void ChargePointImpl::message_callback(const std::string& message) {
         }
     } catch (json::exception& e) {
         EVLOG_error << "JSON exception during handling of message: " << e.what();
-        this->securityEventNotification(ocpp::security_events::INVALIDMESSAGES, std::optional<CiString<255>>(message),
-                                        true);
+        this->securityEventNotification(ocpp::security_events::INVALIDMESSAGES,
+                                        CiString<255>(message, StringTooLarge::Truncate), true);
         if (enhanced_message.messageTypeId != MessageTypeId::CALL) {
             return; // CALLERROR shall only follow on a CALL message
         }
@@ -1377,13 +1381,29 @@ void ChargePointImpl::message_callback(const std::string& message) {
         }
     } catch (const EnumConversionException& e) {
         EVLOG_error << "EnumConversionException during handling of message: " << e.what();
-        this->securityEventNotification(ocpp::security_events::INVALIDMESSAGES, std::optional<CiString<255>>(message),
-                                        true);
+        this->securityEventNotification(ocpp::security_events::INVALIDMESSAGES,
+                                        CiString<255>(message, StringTooLarge::Truncate), true);
+        if (enhanced_message.messageTypeId != MessageTypeId::CALL) {
+            return; // CALLERROR shall only follow on a CALL message
+        }
+        auto call_error = CallError(enhanced_message.uniqueId, "FormationViolation", e.what(), json({}, true));
+        this->message_dispatcher->dispatch_call_error(call_error);
+    } catch (const StringConversionException& e) {
+        EVLOG_error << "StringConversionException during handling of message: " << e.what();
+        this->securityEventNotification(ocpp::security_events::INVALIDMESSAGES,
+                                        CiString<255>(message, StringTooLarge::Truncate), true);
         if (enhanced_message.messageTypeId != MessageTypeId::CALL) {
             return; // CALLERROR shall only follow on a CALL message
         }
         auto call_error = CallError(enhanced_message.uniqueId, "FormationViolation", e.what(), json({}, true));
         this->message_dispatcher->dispatch_call_error(call_error);
+    } catch (const std::exception& e) {
+        EVLOG_error << "Exception during handling of message: " << e.what();
+        if (enhanced_message.messageTypeId != MessageTypeId::CALL) {
+            return; // CALLERROR shall only follow on a CALL message
+        }
+        auto call_error = CallError(enhanced_message.uniqueId, "GenericError", e.what(), json({}, true));
+        this->message_dispatcher->dispatch_call_error(call_error);
     }
 }