Skip to content

Commit f784c1f

Browse files
colmenerocolmenero
committed
SEC-2914 snippets for composition and profiles for inheritance
Feedback #752 (comment)
1 parent 61cc6b1 commit f784c1f

7 files changed

Lines changed: 78 additions & 35 deletions

File tree

‎examples/connext_dds/network_capture/03_security/c/USER_QOS_PROFILES.xml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1313
xsi:noNamespaceSchemaLocation="http://community.rti.com/schema/7.7.0/rti_dds_qos_profiles.xsd">
1414
<qos_library name="network_capture_Library">
15-
<qos_profile name="network_capture_ProfileCommon" base_name="BuiltinQosLib::Generic.Security" >
15+
<qos_profile name="network_capture_SnippetCommon">
16+
<?rti-qos_snippet?>
17+
1618
<domain_participant_qos>
1719
<property>
1820
<value>
@@ -36,7 +38,11 @@
3638
</property>
3739
</domain_participant_qos>
3840
</qos_profile>
39-
<qos_profile name="network_capture_ProfileA" base_name="network_capture_ProfileCommon" is_default_qos="true">
41+
<qos_profile name="network_capture_ProfileA" is_default_qos="true">
42+
<base_name>
43+
<element>network_capture_Library::network_capture_SnippetCommon</element>
44+
<element>BuiltinQosSnippetLib::Feature.Security.Enable</element>
45+
</base_name>
4046
<participant_factory_qos>
4147
<monitoring>
4248
<distribution_settings>
@@ -93,10 +99,10 @@
9399
</property>
94100
</domain_participant_qos>
95101
</qos_profile>
96-
<qos_profile name="network_capture_ProfileMonitor">
102+
<qos_profile name="network_capture_ProfileMonitor" base_name="BuiltinQosLib::Generic.Monitoring2">
97103
<base_name>
98-
<element>network_capture_Library::network_capture_ProfileCommon</element>
99-
<element>BuiltinQosLib::Generic.Monitoring2</element>
104+
<element>network_capture_Library::network_capture_SnippetCommon</element>
105+
<element>BuiltinQosSnippetLib::Feature.Security.Enable</element>
100106
</base_name>
101107
<domain_participant_qos>
102108
<resource_limits>

‎examples/connext_dds/network_capture/04_advanced_api/c/USER_QOS_PROFILES.xml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1313
xsi:noNamespaceSchemaLocation="http://community.rti.com/schema/7.7.0/rti_dds_qos_profiles.xsd">
1414
<qos_library name="network_capture_Library">
15-
<qos_profile name="network_capture_ProfileCommon" base_name="BuiltinQosLib::Generic.Security" >
15+
<qos_profile name="network_capture_SnippetCommon">
16+
<?rti-qos_snippet?>
17+
1618
<domain_participant_qos>
1719
<property>
1820
<value>
@@ -36,7 +38,11 @@
3638
</property>
3739
</domain_participant_qos>
3840
</qos_profile>
39-
<qos_profile name="network_capture_ProfileA" base_name="network_capture_Library::network_capture_ProfileCommon" is_default_qos="true">
41+
<qos_profile name="network_capture_ProfileA" is_default_qos="true">
42+
<base_name>
43+
<element>network_capture_Library::network_capture_SnippetCommon</element>
44+
<element>BuiltinQosSnippetLib::Feature.Security.Enable</element>
45+
</base_name>
4046
<participant_factory_qos>
4147
<monitoring>
4248
<distribution_settings>
@@ -93,10 +99,10 @@
9399
</property>
94100
</domain_participant_qos>
95101
</qos_profile>
96-
<qos_profile name="network_capture_ProfileMonitor">
102+
<qos_profile name="network_capture_ProfileMonitor" base_name="BuiltinQosLib::Generic.Monitoring2">
97103
<base_name>
98-
<element>network_capture_Library::network_capture_ProfileCommon</element>
99-
<element>BuiltinQosLib::Generic.Monitoring2</element>
104+
<element>network_capture_Library::network_capture_SnippetCommon</element>
105+
<element>BuiltinQosSnippetLib::Feature.Security.Enable</element>
100106
</base_name>
101107
<domain_participant_qos>
102108
<resource_limits>

‎examples/connext_secure/certificate_revocation_list/c++11/USER_QOS_PROFILES.xml‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ to use the software. -->
1515
<qos_library name="crl">
1616

1717
<qos_profile name="common">
18-
<base_name>
19-
<element>BuiltinQosSnippetLib::Feature.Security.Enable</element>
20-
</base_name>
18+
<?rti-qos_snippet?>
19+
2120
<domain_participant_qos>
2221
<property>
2322
<value>
@@ -45,7 +44,11 @@ to use the software. -->
4544
</domain_participant_qos>
4645
</qos_profile>
4746

48-
<qos_profile name="peer1" base_name="crl::common" is_default_qos="true">
47+
<qos_profile name="peer1" is_default_qos="true">
48+
<base_name>
49+
<element>crl::common</element>
50+
<element>BuiltinQosSnippetLib::Feature.Security.Enable</element>
51+
</base_name>
4952
<participant_factory_qos>
5053
<monitoring>
5154
<distribution_settings>
@@ -109,10 +112,10 @@ to use the software. -->
109112
</domain_participant_qos>
110113
</qos_profile>
111114

112-
<qos_profile name="monitor">
115+
<qos_profile name="monitor" base_name="BuiltinQosLib::Generic.Monitoring2">
113116
<base_name>
114117
<element>crl::common</element>
115-
<element>BuiltinQosLib::Generic.Monitoring2</element>
118+
<element>BuiltinQosSnippetLib::Feature.Security.Enable</element>
116119
</base_name>
117120
<domain_participant_qos>
118121
<resource_limits>

‎examples/connext_secure/dynamic_permissions/c++11/USER_QOS_PROFILES.xml‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1313
xsi:noNamespaceSchemaLocation="http://community.rti.com/schema/7.7.0/rti_dds_qos_profiles.xsd">
1414
<qos_library name="dynamic_permissions_Library">
15-
<qos_profile name="common" base_name="BuiltinQosLib::Generic.Security" >
15+
<qos_profile name="common">
16+
<?rti-qos_snippet?>
17+
1618
<domain_participant_qos>
1719
<property>
1820
<value>
@@ -36,7 +38,11 @@
3638
</property>
3739
</domain_participant_qos>
3840
</qos_profile>
39-
<qos_profile name="subscriber" base_name="common" is_default_qos="true">
41+
<qos_profile name="subscriber" is_default_qos="true">
42+
<base_name>
43+
<element>dynamic_permissions_Library::common</element>
44+
<element>BuiltinQosSnippetLib::Feature.Security.Enable</element>
45+
</base_name>
4046
<participant_factory_qos>
4147
<monitoring>
4248
<distribution_settings>
@@ -65,7 +71,11 @@
6571
</property>
6672
</domain_participant_qos>
6773
</qos_profile>
68-
<qos_profile name="publisher" base_name="common">
74+
<qos_profile name="publisher">
75+
<base_name>
76+
<element>dynamic_permissions_Library::common</element>
77+
<element>BuiltinQosSnippetLib::Feature.Security.Enable</element>
78+
</base_name>
6979
<domain_participant_qos>
7080
<property>
7181
<value>
@@ -85,10 +95,10 @@
8595
</property>
8696
</domain_participant_qos>
8797
</qos_profile>
88-
<qos_profile name="monitor">
98+
<qos_profile name="monitor" base_name="BuiltinQosLib::Generic.Monitoring2">
8999
<base_name>
90100
<element>dynamic_permissions_Library::common</element>
91-
<element>BuiltinQosLib::Generic.Monitoring2</element>
101+
<element>BuiltinQosSnippetLib::Feature.Security.Enable</element>
92102
</base_name>
93103
<domain_participant_qos>
94104
<resource_limits>

‎examples/connext_secure/lightweight/c++11/USER_QOS_PROFILES.xml‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ to use the software. -->
1515
<qos_library name="full_library">
1616

1717
<qos_profile name="common">
18-
<base_name>
19-
<element>BuiltinQosSnippetLib::Feature.Security.Enable</element>
20-
</base_name>
18+
<?rti-qos_snippet?>
2119

2220
<domain_participant_qos>
2321
<transport_builtin>
@@ -51,7 +49,12 @@ to use the software. -->
5149
</domain_participant_qos>
5250
</qos_profile>
5351

54-
<qos_profile name="peer1" base_name="full_library::common" is_default_qos="true">
52+
<qos_profile name="peer1" is_default_qos="true">
53+
<base_name>
54+
<element>full_library::common</element>
55+
<element>BuiltinQosSnippetLib::Feature.Security.Enable</element>
56+
</base_name>
57+
5558
<participant_factory_qos>
5659
<monitoring>
5760
<distribution_settings>
@@ -81,7 +84,12 @@ to use the software. -->
8184
</domain_participant_qos>
8285
</qos_profile>
8386

84-
<qos_profile name="peer2" base_name="full_library::common">
87+
<qos_profile name="peer2">
88+
<base_name>
89+
<element>full_library::common</element>
90+
<element>BuiltinQosSnippetLib::Feature.Security.Enable</element>
91+
</base_name>
92+
8593
<domain_participant_qos>
8694
<property>
8795
<value>
@@ -102,10 +110,10 @@ to use the software. -->
102110
</domain_participant_qos>
103111
</qos_profile>
104112

105-
<qos_profile name="monitor">
113+
<qos_profile name="monitor" base_name="BuiltinQosLib::Generic.Monitoring2">
106114
<base_name>
107115
<element>full_library::common</element>
108-
<element>BuiltinQosLib::Generic.Monitoring2</element>
116+
<element>BuiltinQosSnippetLib::Feature.Security.Enable</element>
109117
</base_name>
110118
<domain_participant_qos>
111119
<resource_limits>

‎examples/connext_secure/lightweight/c++11/governance_lws.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
</domains>
1313
<allow_unauthenticated_participants>true</allow_unauthenticated_participants>
1414
<enable_join_access_control>false</enable_join_access_control>
15+
<enable_key_revision>false</enable_key_revision>
1516
<discovery_protection_kind>NONE</discovery_protection_kind>
1617
<liveliness_protection_kind>NONE</liveliness_protection_kind>
1718
<monitoring_metrics_protection_kind>ENCRYPT</monitoring_metrics_protection_kind>

‎examples/connext_secure/whitelist/c++11/USER_QOS_PROFILES.xml‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ to use the software. -->
1515
<qos_library name="whitelist">
1616

1717
<qos_profile name="common">
18-
<base_name>
19-
<element>BuiltinQosSnippetLib::Feature.Security.Enable</element>
20-
</base_name>
18+
<?rti-qos_snippet?>
19+
2120
<domain_participant_qos>
2221
<property>
2322
<value>
@@ -42,7 +41,12 @@ to use the software. -->
4241
</domain_participant_qos>
4342
</qos_profile>
4443

45-
<qos_profile name="peer1" base_name="whitelist::common" is_default_qos="true">
44+
<qos_profile name="peer1" is_default_qos="true">
45+
<base_name>
46+
<element>whitelist::common</element>
47+
<element>BuiltinQosSnippetLib::Feature.Security.Enable</element>
48+
</base_name>
49+
4650
<participant_factory_qos>
4751
<monitoring>
4852
<distribution_settings>
@@ -125,7 +129,12 @@ to use the software. -->
125129
</domain_participant_qos>
126130
</qos_profile>
127131

128-
<qos_profile name="peer3" base_name="whitelist::common">
132+
<qos_profile name="peer3">
133+
<base_name>
134+
<element>whitelist::common</element>
135+
<element>BuiltinQosSnippetLib::Feature.Security.Enable</element>
136+
</base_name>
137+
129138
<domain_participant_qos>
130139
<property>
131140
<value>
@@ -150,10 +159,10 @@ to use the software. -->
150159
</domain_participant_qos>
151160
</qos_profile>
152161

153-
<qos_profile name="monitor">
162+
<qos_profile name="monitor" base_name="BuiltinQosLib::Generic.Monitoring2">
154163
<base_name>
155164
<element>whitelist::common</element>
156-
<element>BuiltinQosLib::Generic.Monitoring2</element>
165+
<element>BuiltinQosSnippetLib::Feature.Security.Enable</element>
157166
</base_name>
158167
<domain_participant_qos>
159168
<resource_limits>

0 commit comments

Comments
 (0)