niklas/cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Peers may have a secure announcer without using security

Browse source 
There exist implementations that advertise security-related
built-endpoints regardless of whether the participant has security
configured.  Therefore, the test whether security is enabled for the
participant cannot simply be the presence of such an endpoint, because
the absence of an IDENTITY_TOKEN in the data is then considered an
error.

This commit simply changes the check to requiring the presence of the
endpoint and the presence of the IDENTITY_TOKEN.

Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
Erik Boasson 2020-04-08 11:42:53 +02:00 • committed by eboasson
parent 52edbe94e9
commit e88552123c
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/core/ddsi/src/q_ddsi_discovery.c
View file

@ -638,16 +638,12 @@ static int handle_SPDP_alive (const struct receiver_state *rst, seqno_t seq, dds
}
}
const bool is_secure = (datap->builtin_endpoint_set & NN_DISC_BUILTIN_ENDPOINT_PARTICIPANT_SECURE_ANNOUNCER) != 0;
const bool is_secure = ((datap->builtin_endpoint_set & NN_DISC_BUILTIN_ENDPOINT_PARTICIPANT_SECURE_ANNOUNCER) != 0 &&
(datap->present & PP_IDENTITY_TOKEN));
/* Make sure we don't create any security builtin endpoint when it's considered unsecure. */
if (!is_secure)
builtin_endpoint_set &= NN_BES_MASK_NON_SECURITY;
GVLOGDISC ("SPDP ST0 "PGUIDFMT" bes %x%s NEW", PGUID (datap->participant_guid), builtin_endpoint_set, is_secure ? " (secure)" : "");
if (is_secure && !(datap->present & PP_IDENTITY_TOKEN))
{
GVLOGDISC (" identity token missing\n");
return 0;
}
if (datap->present & PP_PARTICIPANT_LEASE_DURATION)
{