Refactor Secure Discovery Server (#6295)

* Refactor Secure Discovery Server

Signed-off-by: Raül <raulojeda@eprosima.com>

* Block discovery server when using security

Signed-off-by: Raül <raulojeda@eprosima.com>

* Uncrustify

Signed-off-by: Raül <raulojeda@eprosima.com>

* Add secure discovery server disabled test

Signed-off-by: Raül <raulojeda@eprosima.com>

* Refactor secure discovery server system tests

Signed-off-by: Raül <raulojeda@eprosima.com>

* Fix secure ds bypass and refactor

Signed-off-by: Raül <raulojeda@eprosima.com>

* Uncrustify

Signed-off-by: Raül <raulojeda@eprosima.com>

* Remove unnecessary CMakeLists config

Signed-off-by: Raül <raulojeda@eprosima.com>

* Add new python test file

Signed-off-by: Raül <raulojeda@eprosima.com>

* Update versions.md

Signed-off-by: Raül <raulojeda@eprosima.com>

* Shorter error message in PDPClient

Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
Signed-off-by: Raül Ojeda Gandia <raulojeda@eprosima.com>

* Shorter error message in PDPServer

Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
Signed-off-by: Raül Ojeda Gandia <raulojeda@eprosima.com>

* Update keywords in test according to the new error messages

Signed-off-by: Raül <raulojeda@eprosima.com>

---------

Signed-off-by: Raül <raulojeda@eprosima.com>
Signed-off-by: Raül Ojeda Gandia <raulojeda@eprosima.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>

Author: raulojeda22

src/cpp/rtps/builtin/discovery/participant/DS/FakeWriter.hpp

@@ -40,9 +40,6 @@ class FakeWriter : public Endpoint
         : Endpoint(participant, { participant->getGuid().guidPrefix, entity_id }, {})
     {
         m_att.endpointKind = EndpointKind_t::WRITER;
-#if HAVE_SECURITY
-        participant->set_endpoint_rtps_protection_supports(this, false);
-#endif // HAVE_SECURITY
     }
 
     virtual ~FakeWriter() override = default;

src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp

@@ -23,7 +23,6 @@
 
 #include <rtps/attributes/ServerAttributes.hpp>
 #include <rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpoints.hpp>
-#include <rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpointsSecure.hpp>
 #include <rtps/builtin/discovery/participant/PDP.h>
 #include <rtps/builtin/discovery/participant/timedevent/DSClientEvent.h>
 #include <rtps/messages/RTPSMessageGroup.hpp>
@@ -137,16 +136,6 @@ class PDPClient : public PDP
             const GUID_t& participant_guid,
             ParticipantDiscoveryStatus reason) override;
 
-#if HAVE_SECURITY
-    bool pairing_remote_writer_with_local_reader_after_security(
-            const GUID_t& local_reader,
-            const WriterProxyData& remote_writer_data) override;
-
-    bool pairing_remote_reader_with_local_writer_after_security(
-            const GUID_t& local_reader,
-            const ReaderProxyData& remote_reader_data) override;
-#endif // HAVE_SECURITY
-
     /*
      * Update the list of remote servers
      */
@@ -214,19 +203,6 @@ class PDPClient : public PDP
             const eprosima::fastdds::rtps::GuidPrefix_t& prefix_override,
             bool from_this_host);
 
-#if HAVE_SECURITY
-    /**
-     * Returns whether discovery should be secured
-     */
-    bool should_protect_discovery();
-
-    /**
-     * Performs creation of secured DS PDP endpoints
-     */
-    bool create_secure_ds_pdp_endpoints();
-
-#endif  // HAVE_SECURITY
-
     /**
      * Performs creation of standard DS PDP endpoints
      */
@@ -244,16 +220,6 @@ class PDPClient : public PDP
             DiscoveryServerPDPEndpoints& endpoints,
             bool is_discovery_protected);
 
-    /**
-     * Performs creation of DS best-effort PDP reader.
-     *
-     * @param [in,out]  endpoints  Container where the created resources should be kept.
-     *
-     * @return whether the reader was successfully created.
-     */
-    bool create_ds_pdp_best_effort_reader(
-            DiscoveryServerPDPEndpointsSecure& endpoints);
-
     /**
      * Provides the functionality of notifyAboveRemoteEndpoints without being an override of that method.
      */