Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[16603] Secure PDP exchange #3175

Merged
merged 19 commits into from
Jan 3, 2023
Merged

[16603] Secure PDP exchange #3175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
62bf90a
Refs #16603. Initial changes on PDPClient.
MiguelCompany Dec 21, 2022
6a92543
Refs #16603. Removed unused method on PDPClient.
MiguelCompany Dec 21, 2022
fecc931
Refs #16603. Matching on PDPClient.
MiguelCompany Dec 22, 2022
cdd272b
Refs #16603. Initial refactor on PDPServer.
MiguelCompany Dec 21, 2022
22a2157
Refs #16603. Using discovered_builtin_* on PDPClient.
MiguelCompany Dec 22, 2022
b8249e6
Refs #16603. Additional changes on PDPClient.
MiguelCompany Dec 22, 2022
2c20978
Refs #16603. Fixes on PDPServer::assignRemoteEndpoints.
MiguelCompany Dec 22, 2022
092d1cb
Refs #16603. Fixes on PDPServer::removeRemoteEndpoints.
MiguelCompany Dec 22, 2022
de71599
Refs #16603. Perform matching on PDPServer.
MiguelCompany Dec 22, 2022
b98ab54
Refs #16603. Use security manager on PDPServer.
MiguelCompany Dec 22, 2022
451e30d
Refs #16603. Using discovered_builtin_* on PDPServer.
MiguelCompany Dec 22, 2022
4638fc4
Refs #16603. Pairing endpoints moved to PDP.
MiguelCompany Dec 23, 2022
223b83d
Refs #16603. Pairing endpoints on PDPClient.
MiguelCompany Dec 23, 2022
0ce8acc
Refs #16603. Pairing endpoints on PDPServer.
MiguelCompany Dec 23, 2022
2b4b46c
Refs #16603. Uncrustify.
MiguelCompany Dec 23, 2022
26ca8b1
Refs #16603. Fixed communications without security.
MiguelCompany Dec 23, 2022
7a18822
Refs #16603. Take into account that notifyAboveRemoteEndpoints is cal…
MiguelCompany Dec 23, 2022
dead9c9
Refs #16603. Temporarily disabling secure endpoints on EDPClient.
MiguelCompany Dec 23, 2022
1b68139
Refs #16603. Temporarily using mangled prefix on system test.
MiguelCompany Dec 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions include/fastdds/rtps/builtin/discovery/participant/PDP.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,16 @@ class PDP
return temp_writer_proxies_;
}

#if HAVE_SECURITY
virtual bool pairing_remote_writer_with_local_reader_after_security(
const GUID_t& local_reader,
const WriterProxyData& remote_writer_data);

virtual bool pairing_remote_reader_with_local_writer_after_security(
const GUID_t& local_writer,
const ReaderProxyData& remote_reader_data);
#endif // HAVE_SECURITY

protected:

//!Pointer to the builtin protocols object.
Expand Down
12 changes: 8 additions & 4 deletions src/cpp/rtps/builtin/discovery/endpoint/EDPClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ bool EDPClient::processLocalReaderProxyData(

auto* writer = &subscriptions_writer_;

#if HAVE_SECURITY
// TODO(Miguel C): Re-enable this when EDPServer creates the secure EDP endpoints
MiguelCompany marked this conversation as resolved.
Show resolved Hide resolved
#if 0 // HAVE_SECURITY
if (local_reader->getAttributes().security_attributes().is_discovery_protected)
{
writer = &subscriptions_secure_writer_;
Expand Down Expand Up @@ -79,7 +80,8 @@ bool EDPClient::processLocalWriterProxyData(

auto* writer = &publications_writer_;

#if HAVE_SECURITY
// TODO(Miguel C): Re-enable this when EDPServer creates the secure EDP endpoints
#if 0 //HAVE_SECURITY
if (local_writer->getAttributes().security_attributes().is_discovery_protected)
{
writer = &publications_secure_writer_;
Expand Down Expand Up @@ -110,7 +112,8 @@ bool EDPClient::removeLocalWriter(

auto* writer = &publications_writer_;

#if HAVE_SECURITY
// TODO(Miguel C): Re-enable this when EDPServer creates the secure EDP endpoints
#if 0 // HAVE_SECURITY
if (W->getAttributes().security_attributes().is_discovery_protected)
{
writer = &publications_secure_writer_;
Expand Down Expand Up @@ -163,7 +166,8 @@ bool EDPClient::removeLocalReader(

auto* writer = &subscriptions_writer_;

#if HAVE_SECURITY
// TODO(Miguel C): Re-enable this when EDPServer creates the secure EDP endpoints
#if 0 // HAVE_SECURITY
if (R->getAttributes().security_attributes().is_discovery_protected)
{
writer = &subscriptions_secure_writer_;
Expand Down
17 changes: 17 additions & 0 deletions src/cpp/rtps/builtin/discovery/participant/PDP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -919,6 +919,23 @@ WriterProxyData* PDP::addWriterProxyData(
return nullptr;
}

#if HAVE_SECURITY
bool PDP::pairing_remote_writer_with_local_reader_after_security(
const GUID_t& local_reader,
const WriterProxyData& remote_writer_data)
{
return mp_EDP->pairing_remote_writer_with_local_reader_after_security(local_reader, remote_writer_data);
}

bool PDP::pairing_remote_reader_with_local_writer_after_security(
const GUID_t& local_writer,
const ReaderProxyData& remote_reader_data)
{
return mp_EDP->pairing_remote_reader_with_local_writer_after_security(local_writer, remote_reader_data);
}

#endif // HAVE_SECURITY

bool PDP::remove_remote_participant(
const GUID_t& partGUID,
ParticipantDiscoveryInfo::DISCOVERY_STATUS reason)
Expand Down
Loading