Move EndpointSecurityAttributes.h to /attributes and create EndpointS…

…ecurityAttributes.cpp Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
eProsima · May 24, 2024 · 6f337ea · 6f337ea
1 parent 5410eba
commit 6f337ea
Show file tree

Hide file tree

Showing 18 changed files with 126 additions and 75 deletions.
diff --git a/include/fastdds/rtps/attributes/EndpointAttributes.h b/include/fastdds/rtps/attributes/EndpointAttributes.h
@@ -25,11 +25,9 @@
 #include <fastdds/rtps/common/Guid.h>
 #include <fastdds/rtps/common/LocatorList.hpp>
 #include <fastdds/rtps/common/Types.h>
-
 #if HAVE_SECURITY
-#include <rtps/security/accesscontrol/EndpointSecurityAttributes.h>
-#endif  // HAVE_SECURITY
-
+#include <fastdds/rtps/attributes/EndpointSecurityAttributes.h>
+#endif // if HAVE_SECURITY
 namespace eprosima {
 namespace fastrtps {
 namespace rtps {
@@ -164,7 +162,7 @@ class EndpointAttributes
     int16_t m_entityID = -1;
 
 #if HAVE_SECURITY
-    //! Security attributes
+     //! Security attributes
     security::EndpointSecurityAttributes security_attributes_;
 #endif // HAVE_SECURITY
 

diff --git a/...ccesscontrol/EndpointSecurityAttributes.h → ...s/attributes/EndpointSecurityAttributes.h b/...ccesscontrol/EndpointSecurityAttributes.h → ...s/attributes/EndpointSecurityAttributes.h
@@ -18,7 +18,7 @@
 #ifndef _FASTDDS_RTPS_SECURITY_ACCESSCONTROL_ENDPOINTSECURITYATTRIBUTES_H_
 #define _FASTDDS_RTPS_SECURITY_ACCESSCONTROL_ENDPOINTSECURITYATTRIBUTES_H_
 
-#include <rtps/security/accesscontrol/SecurityMaskUtilities.h>
+#include <cstdint>
 
 namespace eprosima {
 namespace fastrtps {
@@ -56,23 +56,7 @@ struct PluginEndpointSecurityAttributes
     bool is_submessage_origin_authenticated;
     bool is_payload_encrypted;
 
-    inline PluginEndpointSecurityAttributesMask mask() const
-    {
-        PluginEndpointSecurityAttributesMask rv = PLUGIN_ENDPOINT_SECURITY_ATTRIBUTES_FLAG_IS_VALID;
-        if (is_submessage_encrypted)
-        {
-            rv |= PLUGIN_ENDPOINT_SECURITY_ATTRIBUTES_FLAG_IS_SUBMESSAGE_ENCRYPTED;
-        }
-        if (is_submessage_origin_authenticated)
-        {
-            rv |= PLUGIN_ENDPOINT_SECURITY_ATTRIBUTES_FLAG_IS_SUBMESSAGE_ORIGIN_AUTHENTICATED;
-        }
-        if (is_payload_encrypted)
-        {
-            rv |= PLUGIN_ENDPOINT_SECURITY_ATTRIBUTES_FLAG_IS_PAYLOAD_ENCRYPTED;
-        }
-        return rv;
-    }
+    PluginEndpointSecurityAttributesMask mask() const;
 
 };
 
@@ -130,47 +114,11 @@ struct EndpointSecurityAttributes
 
     PluginEndpointSecurityAttributesMask plugin_endpoint_attributes;
 
-    inline EndpointSecurityAttributesMask mask() const
-    {
-        EndpointSecurityAttributesMask rv = ENDPOINT_SECURITY_ATTRIBUTES_FLAG_IS_VALID;
-        if (is_read_protected)
-        {
-            rv |= ENDPOINT_SECURITY_ATTRIBUTES_FLAG_IS_READ_PROTECTED;
-        }
-        if (is_write_protected)
-        {
-            rv |= ENDPOINT_SECURITY_ATTRIBUTES_FLAG_IS_WRITE_PROTECTED;
-        }
-        if (is_discovery_protected)
-        {
-            rv |= ENDPOINT_SECURITY_ATTRIBUTES_FLAG_IS_DISCOVERY_PROTECTED;
-        }
-        if (is_liveliness_protected)
-        {
-            rv |= ENDPOINT_SECURITY_ATTRIBUTES_FLAG_IS_LIVELINESS_PROTECTED;
-        }
-        if (is_submessage_protected)
-        {
-            rv |= ENDPOINT_SECURITY_ATTRIBUTES_FLAG_IS_SUBMESSAGE_PROTECTED;
-        }
-        if (is_payload_protected)
-        {
-            rv |= ENDPOINT_SECURITY_ATTRIBUTES_FLAG_IS_PAYLOAD_PROTECTED;
-        }
-        if (is_key_protected)
-        {
-            rv |= ENDPOINT_SECURITY_ATTRIBUTES_FLAG_IS_KEY_PROTECTED;
-        }
-        return rv;
-    }
+    EndpointSecurityAttributesMask mask() const;
 
-    inline bool match(
+    bool match(
             const EndpointSecurityAttributesMask remoteMask,
-            const PluginEndpointSecurityAttributesMask remotePluginMask) const
-    {
-        return security_mask_matches(mask(), remoteMask) &&
-               security_mask_matches(plugin_endpoint_attributes, remotePluginMask);
-    }
+            const PluginEndpointSecurityAttributesMask remotePluginMask) const;
 
 };
 

diff --git a/include/fastdds/rtps/builtin/data/ReaderProxyData.h b/include/fastdds/rtps/builtin/data/ReaderProxyData.h
@@ -22,16 +22,15 @@
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
 #include <fastdds/dds/subscriber/qos/ReaderQos.hpp>
+#if HAVE_SECURITY
+#include <fastdds/rtps/attributes/EndpointSecurityAttributes.h>
+#endif // if HAVE_SECURITY
 #include <fastdds/rtps/attributes/RTPSParticipantAllocationAttributes.hpp>
 #include <fastdds/rtps/attributes/WriterAttributes.h>
 #include <fastdds/rtps/builtin/data/ContentFilterProperty.hpp>
 #include <fastdds/rtps/common/RemoteLocators.hpp>
 #include <fastdds/rtps/common/VendorId_t.hpp>
 #include <fastdds/rtps/attributes/TopicAttributes.h>
-#if HAVE_SECURITY
-#include <rtps/security/accesscontrol/EndpointSecurityAttributes.h>
-#endif // if HAVE_SECURITY
-
 
 namespace eprosima {
 namespace fastrtps {

diff --git a/include/fastdds/rtps/builtin/data/WriterProxyData.h b/include/fastdds/rtps/builtin/data/WriterProxyData.h
@@ -30,7 +30,7 @@
 #include <fastdds/rtps/common/RemoteLocators.hpp>
 #include <fastdds/rtps/common/VendorId_t.hpp>
 #if HAVE_SECURITY
-#include <rtps/security/accesscontrol/EndpointSecurityAttributes.h>
+#include <fastdds/rtps/attributes/EndpointSecurityAttributes.h>
 #endif // if HAVE_SECURITY
 
 

diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
@@ -90,6 +90,7 @@ set(${PROJECT_NAME}_source_files
     fastdds/topic/TopicProxyFactory.cpp
     fastdds/topic/TypeSupport.cpp
     fastdds/utils/QosConverters.cpp
+    rtps/attributes/EndpointSecurityAttributes.cpp
     rtps/attributes/PropertyPolicy.cpp
     rtps/attributes/RTPSParticipantAttributes.cpp
     rtps/attributes/ThreadSettings.cpp

diff --git a/src/cpp/rtps/attributes/EndpointSecurityAttributes.cpp b/src/cpp/rtps/attributes/EndpointSecurityAttributes.cpp
@@ -0,0 +1,97 @@
+// Copyright 2018 Proyectos y Sistemas de Mantenimiento SL (eProsima).
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/*!
+ * @file EndpointSecurityAttributes.cpp
+ */
+
+#include <fastdds/rtps/attributes/EndpointSecurityAttributes.h>
+
+#include <rtps/security/accesscontrol/SecurityMaskUtilities.h>
+
+namespace eprosima {
+namespace fastrtps {
+namespace rtps {
+namespace security {
+
+typedef uint32_t PluginEndpointSecurityAttributesMask;
+
+PluginEndpointSecurityAttributesMask PluginEndpointSecurityAttributes::mask() const
+{
+    PluginEndpointSecurityAttributesMask rv = PLUGIN_ENDPOINT_SECURITY_ATTRIBUTES_FLAG_IS_VALID;
+    if (is_submessage_encrypted)
+    {
+        rv |= PLUGIN_ENDPOINT_SECURITY_ATTRIBUTES_FLAG_IS_SUBMESSAGE_ENCRYPTED;
+    }
+    if (is_submessage_origin_authenticated)
+    {
+        rv |= PLUGIN_ENDPOINT_SECURITY_ATTRIBUTES_FLAG_IS_SUBMESSAGE_ORIGIN_AUTHENTICATED;
+    }
+    if (is_payload_encrypted)
+    {
+        rv |= PLUGIN_ENDPOINT_SECURITY_ATTRIBUTES_FLAG_IS_PAYLOAD_ENCRYPTED;
+    }
+    return rv;
+}
+
+typedef uint32_t EndpointSecurityAttributesMask;
+
+
+EndpointSecurityAttributesMask EndpointSecurityAttributes::mask() const
+{
+    EndpointSecurityAttributesMask rv = ENDPOINT_SECURITY_ATTRIBUTES_FLAG_IS_VALID;
+    if (is_read_protected)
+    {
+        rv |= ENDPOINT_SECURITY_ATTRIBUTES_FLAG_IS_READ_PROTECTED;
+    }
+    if (is_write_protected)
+    {
+        rv |= ENDPOINT_SECURITY_ATTRIBUTES_FLAG_IS_WRITE_PROTECTED;
+    }
+    if (is_discovery_protected)
+    {
+        rv |= ENDPOINT_SECURITY_ATTRIBUTES_FLAG_IS_DISCOVERY_PROTECTED;
+    }
+    if (is_liveliness_protected)
+    {
+        rv |= ENDPOINT_SECURITY_ATTRIBUTES_FLAG_IS_LIVELINESS_PROTECTED;
+    }
+    if (is_submessage_protected)
+    {
+        rv |= ENDPOINT_SECURITY_ATTRIBUTES_FLAG_IS_SUBMESSAGE_PROTECTED;
+    }
+    if (is_payload_protected)
+    {
+        rv |= ENDPOINT_SECURITY_ATTRIBUTES_FLAG_IS_PAYLOAD_PROTECTED;
+    }
+    if (is_key_protected)
+    {
+        rv |= ENDPOINT_SECURITY_ATTRIBUTES_FLAG_IS_KEY_PROTECTED;
+    }
+    return rv;
+}
+
+bool EndpointSecurityAttributes::match(
+        const EndpointSecurityAttributesMask remoteMask,
+        const PluginEndpointSecurityAttributesMask remotePluginMask) const
+{
+    return security_mask_matches(mask(), remoteMask) &&
+            security_mask_matches(plugin_endpoint_attributes, remotePluginMask);
+}
+
+
+} // namespace security
+} // namespace rtps
+} // namespace fastrtps
+} // namespace eprosima
diff --git a/src/cpp/rtps/security/SecurityManager.cpp b/src/cpp/rtps/security/SecurityManager.cpp
@@ -24,6 +24,7 @@
 #include <thread>
 
 #include <fastdds/dds/log/Log.hpp>
+#include <fastdds/rtps/attributes/EndpointSecurityAttributes.h>
 #include <fastdds/rtps/attributes/HistoryAttributes.h>
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.h>
 #include <fastdds/rtps/builtin/data/ReaderProxyData.h>
@@ -43,7 +44,6 @@
 #include <rtps/network/NetworkFactory.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/security/accesscontrol/AccessControl.h>
-#include <rtps/security/accesscontrol/EndpointSecurityAttributes.h>
 #include <rtps/security/accesscontrol/ParticipantSecurityAttributes.h>
 #include <rtps/security/accesscontrol/SecurityMaskUtilities.h>
 #include <rtps/security/authentication/Authentication.h>

diff --git a/src/cpp/rtps/security/cryptography/CryptoKeyFactory.h b/src/cpp/rtps/security/cryptography/CryptoKeyFactory.h
@@ -18,12 +18,13 @@
 #ifndef _FASTDDS_RTPS_SECURITY_CRYPTOGRAPHY_CRYPTOKEYFACTORY_H_
 #define _FASTDDS_RTPS_SECURITY_CRYPTOGRAPHY_CRYPTOKEYFACTORY_H_
 
+#include <memory>
+
+#include <fastdds/rtps/attributes/EndpointSecurityAttributes.h>
+
 #include <rtps/security/cryptography/CryptoTypes.h>
-#include <rtps/security/accesscontrol/EndpointSecurityAttributes.h>
 #include <rtps/security/accesscontrol/ParticipantSecurityAttributes.h>
 
-#include <memory>
-
 namespace eprosima {
 namespace fastrtps {
 namespace rtps {

diff --git a/src/cpp/security/accesscontrol/AccessPermissionsHandle.h b/src/cpp/security/accesscontrol/AccessPermissionsHandle.h
@@ -19,7 +19,7 @@
 #define __SECURITY_ACCESSCONTROL_ACCESSPERMISSIONSHANDLE_H__
 
 #include <fastdds/rtps/common/Token.h>
-#include <rtps/security/accesscontrol/EndpointSecurityAttributes.h>
+#include <fastdds/rtps/attributes/EndpointSecurityAttributes.h>
 #include <rtps/security/accesscontrol/ParticipantSecurityAttributes.h>
 #include <rtps/security/common/Handle.h>
 #include <security/accesscontrol/PermissionsTypes.h>

diff --git a/src/cpp/security/cryptography/AESGCMGMAC_Types.h b/src/cpp/security/cryptography/AESGCMGMAC_Types.h
@@ -20,7 +20,7 @@
 #define _SECURITY_AUTHENTICATION_AESGCMGMAC_TYPES_H_
 
 #include <fastdds/rtps/attributes/PropertyPolicy.h>
-#include <rtps/security/accesscontrol/EndpointSecurityAttributes.h>
+#include <fastdds/rtps/attributes/EndpointSecurityAttributes.h>
 #include <rtps/security/accesscontrol/ParticipantSecurityAttributes.h>
 #include <rtps/security/common/Handle.h>
 #include <rtps/security/common/SharedSecretHandle.h>

diff --git a/test/mock/rtps/ReaderProxyData/fastdds/rtps/builtin/data/ReaderProxyData.h b/test/mock/rtps/ReaderProxyData/fastdds/rtps/builtin/data/ReaderProxyData.h
@@ -30,7 +30,7 @@
 #include <fastdds/rtps/common/RemoteLocators.hpp>
 #include <fastdds/rtps/common/VendorId_t.hpp>
 #if HAVE_SECURITY
-#include <rtps/security/accesscontrol/EndpointSecurityAttributes.h>
+#include <fastdds/rtps/attributes/EndpointSecurityAttributes.h>
 #endif // if HAVE_SECURITY
 
 namespace eprosima {

diff --git a/test/mock/rtps/WriterProxyData/fastdds/rtps/builtin/data/WriterProxyData.h b/test/mock/rtps/WriterProxyData/fastdds/rtps/builtin/data/WriterProxyData.h
@@ -29,7 +29,7 @@
 #include <fastdds/rtps/common/RemoteLocators.hpp>
 
 #if HAVE_SECURITY
-#include <rtps/security/accesscontrol/EndpointSecurityAttributes.h>
+#include <fastdds/rtps/attributes/EndpointSecurityAttributes.h>
 #endif // if HAVE_SECURITY
 
 namespace eprosima {

diff --git a/test/unittest/dds/publisher/CMakeLists.txt b/test/unittest/dds/publisher/CMakeLists.txt
@@ -75,6 +75,7 @@ set(DATAWRITERTESTS_SOURCE DataWriterTests.cpp
     ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/TopicProxyFactory.cpp
     ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/TypeSupport.cpp
     ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/utils/QosConverters.cpp
+    ${PROJECT_SOURCE_DIR}/src/cpp/rtps/attributes/EndpointSecurityAttributes.cpp
     ${PROJECT_SOURCE_DIR}/src/cpp/rtps/attributes/PropertyPolicy.cpp
     ${PROJECT_SOURCE_DIR}/src/cpp/rtps/attributes/RTPSParticipantAttributes.cpp
     ${PROJECT_SOURCE_DIR}/src/cpp/rtps/attributes/ThreadSettings.cpp

diff --git a/test/unittest/rtps/discovery/CMakeLists.txt b/test/unittest/rtps/discovery/CMakeLists.txt
@@ -25,6 +25,7 @@ set(EDPTESTS_SOURCE EdpTests.cpp
     ${PROJECT_SOURCE_DIR}/src/cpp/rtps/flowcontrol/ThroughputControllerDescriptor.cpp
     ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/utils/netmask_filter.cpp
     ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/utils/network.cpp
+    ${PROJECT_SOURCE_DIR}/src/cpp/rtps/attributes/EndpointSecurityAttributes.cpp
     ${PROJECT_SOURCE_DIR}/src/cpp/rtps/transport/network/NetmaskFilterKind.cpp
     ${PROJECT_SOURCE_DIR}/src/cpp/rtps/transport/network/NetworkInterface.cpp
     ${PROJECT_SOURCE_DIR}/src/cpp/rtps/transport/network/NetworkInterfaceWithFilter.cpp

diff --git a/test/unittest/rtps/security/CMakeLists.txt b/test/unittest/rtps/security/CMakeLists.txt
@@ -19,6 +19,7 @@ endif()
 set(SOURCES_SECURITY_TEST_SOURCE
     ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/publisher/qos/WriterQos.cpp
     ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/subscriber/qos/ReaderQos.cpp
+    ${PROJECT_SOURCE_DIR}/src/cpp/rtps/attributes/EndpointSecurityAttributes.cpp
     ${PROJECT_SOURCE_DIR}/src/cpp/rtps/attributes/PropertyPolicy.cpp
     ${PROJECT_SOURCE_DIR}/src/cpp/rtps/common/LocatorWithMask.cpp
     ${PROJECT_SOURCE_DIR}/src/cpp/rtps/common/Time_t.cpp

diff --git a/test/unittest/security/accesscontrol/CMakeLists.txt b/test/unittest/security/accesscontrol/CMakeLists.txt
@@ -30,6 +30,7 @@ set(COMMON_SOURCES_ACCESS_CONTROL_TEST_SOURCE
     ${PROJECT_SOURCE_DIR}/src/cpp/rtps/flowcontrol/ThroughputControllerDescriptor.cpp
     ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/utils/netmask_filter.cpp
     ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/utils/network.cpp
+    ${PROJECT_SOURCE_DIR}/src/cpp/rtps/attributes/EndpointSecurityAttributes.cpp
     ${PROJECT_SOURCE_DIR}/src/cpp/rtps/resources/ResourceEvent.cpp
     ${PROJECT_SOURCE_DIR}/src/cpp/rtps/resources/TimedEvent.cpp
     ${PROJECT_SOURCE_DIR}/src/cpp/rtps/resources/TimedEventImpl.cpp

diff --git a/test/unittest/security/authentication/CMakeLists.txt b/test/unittest/security/authentication/CMakeLists.txt
@@ -23,6 +23,7 @@ endif()
 set(COMMON_SOURCES_AUTH_PLUGIN_TEST_SOURCE
     ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/core/policy/ParameterList.cpp
     ${PROJECT_SOURCE_DIR}/src/cpp/rtps/attributes/PropertyPolicy.cpp
+    ${PROJECT_SOURCE_DIR}/src/cpp/rtps/attributes/EndpointSecurityAttributes.cpp
     ${PROJECT_SOURCE_DIR}/src/cpp/rtps/builtin/data/ParticipantProxyData.cpp
     ${PROJECT_SOURCE_DIR}/src/cpp/rtps/common/GuidPrefix_t.cpp
     ${PROJECT_SOURCE_DIR}/src/cpp/rtps/common/LocatorWithMask.cpp

diff --git a/test/unittest/statistics/dds/CMakeLists.txt b/test/unittest/statistics/dds/CMakeLists.txt
@@ -176,6 +176,7 @@ if (SQLITE3_SUPPORT AND FASTDDS_STATISTICS AND NOT QNX)
         ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/TopicProxyFactory.cpp
         ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/TypeSupport.cpp
         ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/utils/QosConverters.cpp
+        ${PROJECT_SOURCE_DIR}/src/cpp/rtps/attributes/EndpointSecurityAttributes.cpp
         ${PROJECT_SOURCE_DIR}/src/cpp/rtps/attributes/PropertyPolicy.cpp
         ${PROJECT_SOURCE_DIR}/src/cpp/rtps/attributes/RTPSParticipantAttributes.cpp
         ${PROJECT_SOURCE_DIR}/src/cpp/rtps/attributes/ThreadSettings.cpp
@@ -350,6 +351,7 @@ if (SQLITE3_SUPPORT AND FASTDDS_STATISTICS AND NOT QNX)
         ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/TopicProxyFactory.cpp
         ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/TypeSupport.cpp
         ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/utils/QosConverters.cpp
+        ${PROJECT_SOURCE_DIR}/src/cpp/rtps/attributes/EndpointSecurityAttributes.cpp
         ${PROJECT_SOURCE_DIR}/src/cpp/rtps/attributes/PropertyPolicy.cpp
         ${PROJECT_SOURCE_DIR}/src/cpp/rtps/attributes/ThreadSettings.cpp
         ${PROJECT_SOURCE_DIR}/src/cpp/rtps/builtin/BuiltinProtocols.cpp