Merge pull request #863 from EVerest/857-certificates-handling-over-a…

…n-unsecure-connection-in-ocpp201-should-not-be-allowed 857 certificates handling over an unsecure connection in ocpp201 should not be allowed
EVerest · Nov 18, 2024 · 0fbecf4 · 0fbecf4
2 parents 925e9cd + 7f3ce1f
commit 0fbecf4
Show file tree

Hide file tree

Showing 5 changed files with 90 additions and 11 deletions.
diff --git a/config/v201/component_config/standardized/InternalCtrlr.json b/config/v201/component_config/standardized/InternalCtrlr.json
@@ -770,6 +770,38 @@
           "minimum": 1,
           "default": "60",
           "type": "integer"
+      },
+      "AllowCSMSRootCertInstallWithUnsecureConnection": {
+        "variable_name": "AllowCSMSRootCertInstallWithUnsecureConnection",
+        "characteristics": {
+          "supportsMonitoring": true,
+          "dataType": "boolean"
+        },
+        "attributes": [
+          {
+            "type": "Actual",
+            "mutability": "ReadOnly"
+          }
+        ],
+        "description": "The flag that indicates if installation of CSMSRootCertificate is allowed when security profile is 1.",
+        "default": true,
+        "type": "boolean"
+      },
+      "AllowMFRootCertInstallWithUnsecureConnection": {
+        "variable_name": "AllowMFRootCertInstallWithUnsecureConnection",
+        "characteristics": {
+          "supportsMonitoring": true,
+          "dataType": "boolean"
+        },
+        "attributes": [
+          {
+            "type": "Actual",
+            "mutability": "ReadOnly"
+          }
+        ],
+        "description": "The flag that indicates if installation of ManufacturerRootCertificate is allowed when security profile is 1.",
+        "default": true,
+        "type": "boolean"
       }
   },
   "required": [

diff --git a/include/ocpp/v201/charge_point.hpp b/include/ocpp/v201/charge_point.hpp
@@ -789,6 +789,11 @@ class ChargePoint : public ChargePointInterface, private ocpp::ChargingStationBa
     /// If \param persist is set to true, the change will be persisted across a reboot
     void execute_change_availability_request(ChangeAvailabilityRequest request, bool persist);
 
+    /// \brief Helper function to determine if a certificate installation should be allowed
+    /// \param cert_type is the certificate type to be checked
+    /// \return true if it should be allowed
+    bool should_allow_certificate_install(InstallCertificateUseEnum cert_type) const;
+
 protected:
     std::shared_ptr<SmartChargingHandlerInterface> smart_charging_handler;
 

diff --git a/include/ocpp/v201/ctrlr_component_variables.hpp b/include/ocpp/v201/ctrlr_component_variables.hpp
@@ -201,6 +201,8 @@ extern const ComponentVariable& MaxCertificateChainSize;
 extern const ComponentVariable& UpdateCertificateSymlinks;
 extern const RequiredComponentVariable& OrganizationName;
 extern const RequiredComponentVariable& SecurityProfile;
+extern const ComponentVariable& AllowCSMSRootCertInstallWithUnsecureConnection;
+extern const ComponentVariable& AllowMFRootCertInstallWithUnsecureConnection;
 extern const ComponentVariable& ACPhaseSwitchingSupported;
 extern const ComponentVariable& SmartChargingCtrlrAvailable;
 extern const ComponentVariable& SmartChargingCtrlrEnabled;

diff --git a/lib/ocpp/v201/charge_point.cpp b/lib/ocpp/v201/charge_point.cpp
@@ -3601,24 +3601,50 @@ void ChargePoint::handle_get_installed_certificate_ids_req(Call<GetInstalledCert
     this->message_dispatcher->dispatch_call_result(call_result);
 }
 
+bool ChargePoint::should_allow_certificate_install(InstallCertificateUseEnum cert_type) const {
+    const int security_profile = this->device_model->get_value<int>(ControllerComponentVariables::SecurityProfile);
+
+    if (security_profile > 1) {
+        return true;
+    }
+    switch (cert_type) {
+    case InstallCertificateUseEnum::CSMSRootCertificate:
+        return this->device_model
+            ->get_optional_value<bool>(ControllerComponentVariables::AllowCSMSRootCertInstallWithUnsecureConnection)
+            .value_or(true);
+
+    case InstallCertificateUseEnum::ManufacturerRootCertificate:
+        return this->device_model
+            ->get_optional_value<bool>(ControllerComponentVariables::AllowMFRootCertInstallWithUnsecureConnection)
+            .value_or(true);
+    default:
+        return true;
+    }
+}
+
 void ChargePoint::handle_install_certificate_req(Call<InstallCertificateRequest> call) {
     EVLOG_debug << "Received InstallCertificateRequest: " << call.msg << "\nwith messageId: " << call.uniqueId;
 
     const auto msg = call.msg;
     InstallCertificateResponse response;
 
-    const auto result = this->evse_security->install_ca_certificate(
-        msg.certificate.get(), ocpp::evse_security_conversions::from_ocpp_v201(msg.certificateType));
-    response.status = ocpp::evse_security_conversions::to_ocpp_v201(result);
-
-    if (response.status == InstallCertificateStatusEnum::Accepted) {
-        const auto& security_event = ocpp::security_events::RECONFIGURATIONOFSECURITYPARAMETERS;
-        std::string tech_info =
-            "Installed certificate: " + conversions::install_certificate_use_enum_to_string(msg.certificateType);
-        this->security_event_notification_req(CiString<50>(security_event), CiString<255>(tech_info), true,
-                                              utils::is_critical(security_event));
+    if (!should_allow_certificate_install(msg.certificateType)) {
+        response.status = InstallCertificateStatusEnum::Rejected;
+        response.statusInfo = StatusInfo();
+        response.statusInfo->reasonCode = "UnsecureConnection";
+        response.statusInfo->additionalInfo = "CertificateInstallationNotAllowedWithUnsecureConnection";
+    } else {
+        const auto result = this->evse_security->install_ca_certificate(
+            msg.certificate.get(), ocpp::evse_security_conversions::from_ocpp_v201(msg.certificateType));
+        response.status = ocpp::evse_security_conversions::to_ocpp_v201(result);
+        if (response.status == InstallCertificateStatusEnum::Accepted) {
+            const auto& security_event = ocpp::security_events::RECONFIGURATIONOFSECURITYPARAMETERS;
+            std::string tech_info =
+                "Installed certificate: " + conversions::install_certificate_use_enum_to_string(msg.certificateType);
+            this->security_event_notification_req(CiString<50>(security_event), CiString<255>(tech_info), true,
+                                                  utils::is_critical(security_event));
+        }
     }
-
     ocpp::CallResult<InstallCertificateResponse> call_result(response, call.uniqueId);
     this->message_dispatcher->dispatch_call_result(call_result);
 }

diff --git a/lib/ocpp/v201/ctrlr_component_variables.cpp b/lib/ocpp/v201/ctrlr_component_variables.cpp
@@ -359,6 +359,20 @@ const ComponentVariable& ResumeTransactionsOnBoot = {
         "ResumeTransactionsOnBoot",
     }),
 };
+const ComponentVariable& AllowCSMSRootCertInstallWithUnsecureConnection = {
+    ControllerComponents::InternalCtrlr,
+    std::nullopt,
+    std::optional<Variable>({
+        "AllowCSMSRootCertInstallWithUnsecureConnection",
+    }),
+};
+const ComponentVariable& AllowMFRootCertInstallWithUnsecureConnection = {
+    ControllerComponents::InternalCtrlr,
+    std::nullopt,
+    std::optional<Variable>({
+        "AllowMFRootCertInstallWithUnsecureConnection",
+    }),
+};
 const ComponentVariable& AlignedDataCtrlrEnabled = {
     ControllerComponents::AlignedDataCtrlr,
     std::nullopt,