Merge pull request #80 from c-jimenez/release/v0.9.0

Release/v0.9.0

Author: c-jimenez

.github/workflows/codeql-analysis.yml

@@ -42,7 +42,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -66,4 +66,4 @@ jobs:
        make clang-native
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

CMakeLists.txt

@@ -5,7 +5,7 @@
 cmake_minimum_required(VERSION 3.13)
 
 project(OpenOCPP DESCRIPTION "Open Source C++ implementation of the OCPP 1.6 protocol"
-                 VERSION 0.8.0
+                 VERSION 0.9.0
 )
 
 # Definitions for Version.h file

schemas/SignedFirmwareStatusNotificationResponse.json

@@ -6,5 +6,4 @@
   "type": "object",
   "properties": {},
   "additionalProperties": false
-  }
 }

src/centralsystem/CentralSystem.cpp

@@ -69,6 +69,7 @@ CentralSystem::CentralSystem(const ocpp::config::ICentralSystemConfig&        st
       m_database(),
       m_internal_config(m_database),
       m_messages_converter(),
+      m_messages_validator(),
       m_ws_server(),
       m_rpc_server(),
       m_uptime_timer(*m_timer_pool.get(), "Uptime timer"),
@@ -164,31 +165,40 @@ bool CentralSystem::start()
     {
         LOG_INFO << "Starting OCPP stack v" << OPEN_OCPP_VERSION << " - Listen URL : " << m_stack_config.listenUrl();
 
-        // Start uptime counter
-        m_uptime = 0;
-        m_internal_config.setKey(START_DATE_KEY, DateTime::now().str());
-        m_uptime_timer.start(std::chrono::seconds(1u));
-
-        // Allocate resources
-        m_ws_server  = std::unique_ptr<ocpp::websockets::IWebsocketServer>(ocpp::websockets::WebsocketFactory::newServer());
-        m_rpc_server = std::make_unique<ocpp::rpc::RpcServer>(*m_ws_server, "ocpp1.6");
-        m_rpc_server->registerServerListener(*this);
-
-        // Configure websocket link
-        ocpp::websockets::IWebsocketServer::Credentials credentials;
-        credentials.http_basic_authent                        = m_stack_config.httpBasicAuthent();
-        credentials.tls12_cipher_list                         = m_stack_config.tlsv12CipherList();
-        credentials.tls13_cipher_list                         = m_stack_config.tlsv13CipherList();
-        credentials.ecdh_curve                                = m_stack_config.tlsEcdhCurve();
-        credentials.server_certificate                        = m_stack_config.tlsServerCertificate();
-        credentials.server_certificate_private_key            = m_stack_config.tlsServerCertificatePrivateKey();
-        credentials.server_certificate_private_key_passphrase = m_stack_config.tlsServerCertificatePrivateKeyPassphrase();
-        credentials.server_certificate_ca                     = m_stack_config.tlsServerCertificateCa();
-        credentials.client_certificate_authent                = m_stack_config.tlsClientCertificateAuthent();
-        credentials.encoded_pem_certificates                  = false;
-
-        // Start listening
-        ret = m_rpc_server->start(m_stack_config.listenUrl(), credentials, m_stack_config.webSocketPingInterval());
+        // Load validator
+        ret = m_messages_validator.load(m_stack_config.jsonSchemasPath());
+        if (ret)
+        {
+            // Start uptime counter
+            m_uptime = 0;
+            m_internal_config.setKey(START_DATE_KEY, DateTime::now().str());
+            m_uptime_timer.start(std::chrono::seconds(1u));
+
+            // Allocate resources
+            m_ws_server  = std::unique_ptr<ocpp::websockets::IWebsocketServer>(ocpp::websockets::WebsocketFactory::newServer());
+            m_rpc_server = std::make_unique<ocpp::rpc::RpcServer>(*m_ws_server, "ocpp1.6");
+            m_rpc_server->registerServerListener(*this);
+
+            // Configure websocket link
+            ocpp::websockets::IWebsocketServer::Credentials credentials;
+            credentials.http_basic_authent                        = m_stack_config.httpBasicAuthent();
+            credentials.tls12_cipher_list                         = m_stack_config.tlsv12CipherList();
+            credentials.tls13_cipher_list                         = m_stack_config.tlsv13CipherList();
+            credentials.ecdh_curve                                = m_stack_config.tlsEcdhCurve();
+            credentials.server_certificate                        = m_stack_config.tlsServerCertificate();
+            credentials.server_certificate_private_key            = m_stack_config.tlsServerCertificatePrivateKey();
+            credentials.server_certificate_private_key_passphrase = m_stack_config.tlsServerCertificatePrivateKeyPassphrase();
+            credentials.server_certificate_ca                     = m_stack_config.tlsServerCertificateCa();
+            credentials.client_certificate_authent                = m_stack_config.tlsClientCertificateAuthent();
+            credentials.encoded_pem_certificates                  = false;
+
+            // Start listening
+            ret = m_rpc_server->start(m_stack_config.listenUrl(), credentials, m_stack_config.webSocketPingInterval());
+        }
+        else
+        {
+            LOG_ERROR << "Unable to load all the messages validators";
+        }
     }
     else
     {
@@ -252,7 +262,7 @@ void CentralSystem::rpcClientConnected(const std::string& chargepoint_id, std::s
 
     // Instanciate proxy
     std::shared_ptr<ICentralSystem::IChargePoint> chargepoint(
-        new ChargePointProxy(*this, chargepoint_id, client, m_stack_config.jsonSchemasPath(), m_messages_converter, m_stack_config));
+        new ChargePointProxy(*this, chargepoint_id, client, m_messages_validator, m_messages_converter, m_stack_config));
 
     // Notify connection
     m_events_handler.chargePointConnected(chargepoint);

src/centralsystem/CentralSystem.h

@@ -16,13 +16,14 @@ You should have received a copy of the GNU Lesser General Public License
 along with OpenOCPP. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef CENTRALSYSTEM_H
-#define CENTRALSYSTEM_H
+#ifndef OPENOCPP_CENTRALSYSTEM_H
+#define OPENOCPP_CENTRALSYSTEM_H
 
 #include "Database.h"
 #include "ICentralSystem.h"
 #include "InternalConfigManager.h"
 #include "MessagesConverter.h"
+#include "MessagesValidator.h"
 #include "RpcServer.h"
 #include "Timer.h"
 
@@ -95,6 +96,8 @@ class CentralSystem : public ICentralSystem, public ocpp::rpc::RpcServer::IListe
 
     /** @brief Messages converter */
     ocpp::messages::MessagesConverter m_messages_converter;
+    /** @brief Messages validator */
+    ocpp::messages::MessagesValidator m_messages_validator;
 
     /** @brief Websocket server */
     std::unique_ptr<ocpp::websockets::IWebsocketServer> m_ws_server;
@@ -119,4 +122,4 @@ class CentralSystem : public ICentralSystem, public ocpp::rpc::RpcServer::IListe
 } // namespace centralsystem
 } // namespace ocpp
 
-#endif // CENTRALSYSTEM_H
+#endif // OPENOCPP_CENTRALSYSTEM_H

src/centralsystem/chargepoint/ChargePointHandler.h

@@ -16,8 +16,8 @@ You should have received a copy of the GNU Lesser General Public License
 along with OpenOCPP. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef CHARGEPOINTHANDLER_H
-#define CHARGEPOINTHANDLER_H
+#ifndef OPENOCPP_CHARGEPOINTHANDLER_H
+#define OPENOCPP_CHARGEPOINTHANDLER_H
 
 #include "Authorize.h"
 #include "BootNotification.h"
@@ -248,4 +248,4 @@ class ChargePointHandler
 } // namespace centralsystem
 } // namespace ocpp
 
-#endif // CHARGEPOINTHANDLER_H
+#endif // OPENOCPP_CHARGEPOINTHANDLER_H

src/centralsystem/chargepoint/ChargePointProxy.cpp

@@ -58,14 +58,14 @@ namespace centralsystem
 ChargePointProxy::ChargePointProxy(ICentralSystem&                               central_system,
                                    const std::string&                            identifier,
                                    std::shared_ptr<ocpp::rpc::RpcServer::Client> rpc,
-                                   const std::string&                            schemas_path,
+                                   const ocpp::messages::MessagesValidator&      messages_validator,
                                    ocpp::messages::MessagesConverter&            messages_converter,
                                    const ocpp::config::ICentralSystemConfig&     stack_config)
     : m_central_system(central_system),
       m_identifier(identifier),
       m_rpc(rpc),
-      m_msg_dispatcher(schemas_path),
-      m_msg_sender(*m_rpc, messages_converter, stack_config.callRequestTimeout()),
+      m_msg_dispatcher(messages_validator),
+      m_msg_sender(*m_rpc, messages_converter, messages_validator, stack_config.callRequestTimeout()),
       m_handler(m_identifier, messages_converter, m_msg_dispatcher, stack_config)
 {
     m_rpc->registerSpy(*this);
@@ -77,6 +77,12 @@ ChargePointProxy::~ChargePointProxy() { }
 
 // ICentralSystem::IChargePoint interface
 
+/** @copydoc const std::string& ICentralSystem::IChargePoint::ipAddress() const */
+const std::string& ChargePointProxy::ipAddress() const
+{
+    return m_rpc->ipAddress();
+}
+
 /** @copydoc void ICentralSystem::IChargePoint::setTimeout(std::chrono::milliseconds) */
 void ChargePointProxy::setTimeout(std::chrono::milliseconds timeout)
 {

src/centralsystem/chargepoint/ChargePointProxy.h

@@ -16,13 +16,14 @@ You should have received a copy of the GNU Lesser General Public License
 along with OpenOCPP. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef CHARGEPOINTPROXY_H
-#define CHARGEPOINTPROXY_H
+#ifndef OPENOCPP_CHARGEPOINTPROXY_H
+#define OPENOCPP_CHARGEPOINTPROXY_H
 
 #include "ChargePointHandler.h"
 #include "GenericMessageSender.h"
 #include "ICentralSystem.h"
 #include "MessageDispatcher.h"
+#include "MessagesValidator.h"
 #include "RpcServer.h"
 
 #include <memory>
@@ -41,14 +42,14 @@ class ChargePointProxy : public ICentralSystem::IChargePoint, public ocpp::rpc::
      * @param central_system Central System instance associated to the charge point
      * @param identifier Charge point's identifier
      * @param rpc RPC connection with the charge point
-     * @param schemas_path Path to the JSON schemas needed to validate payloads
+     * @param messages_validator JSON schemas needed to validate payloads
      * @param messages_converter Converter from/to OCPP to/from JSON messages
      * @param stack_config Stack configuration
      */
     ChargePointProxy(ICentralSystem&                               central_system,
                      const std::string&                            identifier,
                      std::shared_ptr<ocpp::rpc::RpcServer::Client> rpc,
-                     const std::string&                            schemas_path,
+                     const ocpp::messages::MessagesValidator&      messages_validator,
                      ocpp::messages::MessagesConverter&            messages_converter,
                      const ocpp::config::ICentralSystemConfig&     stack_config);
     /** @brief Destructor */
@@ -59,6 +60,9 @@ class ChargePointProxy : public ICentralSystem::IChargePoint, public ocpp::rpc::
     /** @copydoc ICentralSystem&& ICentralSystem::IChargePoint::centralSystem() */
     ICentralSystem& centralSystem() override { return m_central_system; }
 
+    /** @copydoc const std::string& ICentralSystem::IChargePoint::ipAddress() const */
+    const std::string& ipAddress() const override;
+
     /** @copydoc const std::string& ICentralSystem::IChargePoint::identifier() const */
     const std::string& identifier() const override { return m_identifier; }
 
@@ -298,4 +302,4 @@ class ChargePointProxy : public ICentralSystem::IChargePoint, public ocpp::rpc::
 } // namespace centralsystem
 } // namespace ocpp
 
-#endif // CHARGEPOINTPROXY_H
+#endif // OPENOCPP_CHARGEPOINTPROXY_H

src/centralsystem/config/InternalConfigKeys.h

@@ -16,8 +16,8 @@ You should have received a copy of the GNU Lesser General Public License
 along with OpenOCPP. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef INTERNALCONFIGKEYS_H
-#define INTERNALCONFIGKEYS_H
+#ifndef OPENOCPP_INTERNALCONFIGKEYS_H
+#define OPENOCPP_INTERNALCONFIGKEYS_H
 
 namespace ocpp
 {
@@ -36,4 +36,4 @@ static constexpr const char* TOTAL_UPTIME_KEY = "TotalUpTime";
 } // namespace centralsystem
 } // namespace ocpp
 
-#endif // INTERNALCONFIGKEYS_H
+#endif // OPENOCPP_INTERNALCONFIGKEYS_H

src/centralsystem/interface/ICentralSystem.h

@@ -16,8 +16,8 @@ You should have received a copy of the GNU Lesser General Public License
 along with OpenOCPP. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef ICENTRALSYSTEM_H
-#define ICENTRALSYSTEM_H
+#ifndef OPENOCPP_ICENTRALSYSTEM_H
+#define OPENOCPP_ICENTRALSYSTEM_H
 
 #include "AuthorizationData.h"
 #include "Certificate.h"
@@ -125,6 +125,12 @@ class ICentralSystem
          */
         virtual ICentralSystem& centralSystem() = 0;
 
+        /**
+         * @brief Get the IP address of the charge point
+         * @return IP address of the charge point
+         */
+        virtual const std::string& ipAddress() const = 0;
+
         /**
          * @brief Get the charge point identifier
          * @return charge point identifier
@@ -432,4 +438,4 @@ class ICentralSystem
 } // namespace centralsystem
 } // namespace ocpp
 
-#endif // ICENTRALSYSTEM_H
+#endif // OPENOCPP_ICENTRALSYSTEM_H