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

Use Security instead of DDSSecurity in test config

Browse source 
The configuration was changed in b25f10ff to consider the DDSSecurity
tag deprecated (there is no other), which gave rise to warnings in test
output.

Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
Erik Boasson 2020-07-05 09:34:47 +02:00 • committed by eboasson
parent 7cbf8b7a19
commit 1f8c4f2a4c
8 changed files with 45 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core/ddsc/tests/config.c
View file

@ -110,7 +110,7 @@ CU_Test(ddsc_security_config, empty, .init = ddsrt_init, .fini = ddsrt_fini)
but the implementation doesn't include support for it. */
const char *log_expected[] = {
#ifndef DDSI_INCLUDE_SECURITY
"config: //CycloneDDS/Domain: DDSSecurity: unknown element*",
"config: //CycloneDDS/Domain: Security: unknown element*",
#else
"config: //CycloneDDS/Domain/Security/Authentication/IdentityCertificate/#text: element missing in configuration*",
"config: //CycloneDDS/Domain/Security/Authentication/IdentityCA/#text: element missing in configuration*",
@ -128,7 +128,7 @@ CU_Test(ddsc_security_config, empty, .init = ddsrt_init, .fini = ddsrt_fini)
/* Create participant with an empty security element. */
found = 0;
ddsrt_setenv(URI_VARIABLE, "<DDSSecurity/>");
ddsrt_setenv(URI_VARIABLE, "<Security/>");
participant = dds_create_participant(DDS_DOMAIN_DEFAULT, NULL, NULL);
ddsrt_setenv(URI_VARIABLE, "");
CU_ASSERT_FATAL(participant < 0);

4
src/security/core/tests/access_control.c
View file

@ -48,7 +48,7 @@ static const char *config =
" <ExternalDomainId>0</ExternalDomainId>"
" <Tag>\\${CYCLONEDDS_PID}</Tag>"
" </Discovery>"
" <DDSSecurity>"
" <Security>"
" <Authentication>"
" <Library finalizeFunction=\"finalize_test_authentication_wrapped\" initFunction=\"init_test_authentication_wrapped\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
" <IdentityCertificate>data:,${TEST_IDENTITY_CERTIFICATE}</IdentityCertificate>"
@ -64,7 +64,7 @@ static const char *config =
" <Cryptographic>"
" <Library initFunction=\"${CRYPTO_INIT:-init_test_cryptography_wrapped}\" finalizeFunction=\"${CRYPTO_INIT:-finalize_test_cryptography_wrapped}\" path=\"" WRAPPERLIB_PATH("dds_security_cryptography_wrapper") "\"/>"
" </Cryptographic>"
" </DDSSecurity>"
" </Security>"
"</Domain>";
#define MAX_DOMAINS 10

4
src/security/core/tests/authentication.c
View file

@ -54,7 +54,7 @@ static const char *config =
" <ExternalDomainId>0</ExternalDomainId>"
" <Tag>\\${CYCLONEDDS_PID}</Tag>"
" </Discovery>"
" <DDSSecurity>"
" <Security>"
" <Authentication>"
" <Library finalizeFunction=\"finalize_test_authentication_wrapped\" initFunction=\"init_test_authentication_wrapped\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
" <IdentityCertificate>data:,${TEST_IDENTITY_CERTIFICATE}</IdentityCertificate>"
@ -71,7 +71,7 @@ static const char *config =
" <Cryptographic>"
" <Library finalizeFunction=\"finalize_crypto\" initFunction=\"init_crypto\"/>"
" </Cryptographic>"
" </DDSSecurity>"
" </Security>"
"</Domain>";
static const char *config_non_secure =

30
src/security/core/tests/config.c
View file

@ -111,7 +111,7 @@ CU_Test(ddssec_config, empty, .init = ddsrt_init, .fini = ddsrt_fini)
" <Tag>${CYCLONEDDS_PID}</Tag>"
" </Discovery>"
" <Tracing><Verbosity>config</></>"
" <DDSSecurity />"
" <Security />"
"</Domain>";
set_logger_exp(log_expected);
@ -161,14 +161,14 @@ CU_Test(ddssec_config, missing, .init = ddsrt_init, .fini = ddsrt_fini)
" <Tag>${CYCLONEDDS_PID}</Tag>"
" </Discovery>"
" <Tracing><Verbosity>finest</></>"
" <DDSSecurity>"
" <Security>"
" <Authentication>"
" <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
" <IdentityCertificate></IdentityCertificate>"
" <PrivateKey></PrivateKey>"
" <Password>testtext_Password_testtext</Password>"
" </Authentication>"
" </DDSSecurity>"
" </Security>"
"</Domain>";
set_logger_exp(log_expected);
@ -216,7 +216,7 @@ CU_Test(ddssec_config, all, .init = ddsrt_init, .fini = ddsrt_fini)
" <Tag>${CYCLONEDDS_PID}</Tag>"
" </Discovery>"
" <Tracing><Verbosity>finest</></>"
" <DDSSecurity>"
" <Security>"
" <Authentication>"
" <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
" <IdentityCertificate>"TEST_IDENTITY_CERTIFICATE_DUMMY"</IdentityCertificate>"
@ -234,7 +234,7 @@ CU_Test(ddssec_config, all, .init = ddsrt_init, .fini = ddsrt_fini)
" <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>"
" <Permissions>file:Permissions.p7s</Permissions>"
" </AccessControl>"
" </DDSSecurity>"
" </Security>"
"</Domain>";
set_logger_exp(log_expected);
@ -287,7 +287,7 @@ CU_Test(ddssec_config, security, .init = ddsrt_init, .fini = ddsrt_fini)
" <Tag>${CYCLONEDDS_PID}</Tag>"
" </Discovery>"
" <Tracing><Verbosity>finest</></>"
" <DDSSecurity>"
" <Security>"
" <Authentication>"
" <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
" <IdentityCertificate>"TEST_IDENTITY_CERTIFICATE_DUMMY"</IdentityCertificate>"
@ -303,7 +303,7 @@ CU_Test(ddssec_config, security, .init = ddsrt_init, .fini = ddsrt_fini)
" <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>"
" <Permissions>file:Permissions.p7s</Permissions>"
" </AccessControl>"
" </DDSSecurity>"
" </Security>"
"</Domain>";
set_logger_exp(log_expected);
@ -355,7 +355,7 @@ CU_Test(ddssec_config, deprecated, .init = ddsrt_init, .fini = ddsrt_fini)
" <Tag>${CYCLONEDDS_PID}</Tag>"
" </Discovery>"
" <Tracing><Verbosity>finest</></>"
" <DDSSecurity>"
" <Security>"
" <Authentication>"
" <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
" <IdentityCertificate>"TEST_IDENTITY_CERTIFICATE_DUMMY"</IdentityCertificate>"
@ -373,7 +373,7 @@ CU_Test(ddssec_config, deprecated, .init = ddsrt_init, .fini = ddsrt_fini)
" <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>"
" <Permissions>file:Permissions.p7s</Permissions>"
" </AccessControl>"
" </DDSSecurity>"
" </Security>"
"</Domain>";
set_logger_exp(log_expected);
@ -506,7 +506,7 @@ CU_Test(ddssec_config, config_qos, .init = ddsrt_init, .fini = ddsrt_fini)
" <Tag>${CYCLONEDDS_PID}</Tag>"
" </Discovery>"
" <Tracing><Verbosity>finest</></>"
" <DDSSecurity>"
" <Security>"
" <Authentication>"
" <IdentityCertificate>"TEST_IDENTITY_CERTIFICATE_DUMMY"</IdentityCertificate>"
" <IdentityCA>"TEST_IDENTITY_CA_CERTIFICATE_DUMMY"</IdentityCA>"
@ -517,7 +517,7 @@ CU_Test(ddssec_config, config_qos, .init = ddsrt_init, .fini = ddsrt_fini)
" <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>"
" <Permissions>file:Permissions.p7s</Permissions>"
" </AccessControl>"
" </DDSSecurity>"
" </Security>"
"</Domain>";
CU_ASSERT_FATAL((qos = dds_create_qos()) != NULL);
@ -569,7 +569,7 @@ CU_Test(ddssec_config, other_prop, .init = ddsrt_init, .fini = ddsrt_fini)
" <Tag>${CYCLONEDDS_PID}</Tag>"
" </Discovery>"
" <Tracing><Verbosity>finest</></>"
" <DDSSecurity>"
" <Security>"
" <Authentication>"
" <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
" <IdentityCertificate>"TEST_IDENTITY_CERTIFICATE_DUMMY"</IdentityCertificate>"
@ -587,7 +587,7 @@ CU_Test(ddssec_config, other_prop, .init = ddsrt_init, .fini = ddsrt_fini)
" <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>"
" <Permissions>file:Permissions.p7s</Permissions>"
" </AccessControl>"
" </DDSSecurity>"
" </Security>"
"</Domain>";
CU_ASSERT_FATAL((qos = dds_create_qos()) != NULL);
@ -639,7 +639,7 @@ CU_Test(ddssec_config, qos_invalid, .init = ddsrt_init, .fini = ddsrt_fini)
" <Tag>${CYCLONEDDS_PID}</Tag>"
" </Discovery>"
" <Tracing><Verbosity>finest</></>"
" <DDSSecurity>"
" <Security>"
" <Authentication>"
" <IdentityCertificate>"TEST_IDENTITY_CERTIFICATE_DUMMY"</IdentityCertificate>"
" <IdentityCA>"TEST_IDENTITY_CA_CERTIFICATE_DUMMY"</IdentityCA>"
@ -650,7 +650,7 @@ CU_Test(ddssec_config, qos_invalid, .init = ddsrt_init, .fini = ddsrt_fini)
" <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>"
" <Permissions>file:Permissions.p7s</Permissions>"
" </AccessControl>"
" </DDSSecurity>"
" </Security>"
"</Domain>";
set_logger_exp(log_expected);

4
src/security/core/tests/crypto.c
View file

@ -42,7 +42,7 @@ static const char *config =
" <ExternalDomainId>0</ExternalDomainId>"
" <Tag>\\${CYCLONEDDS_PID}</Tag>"
" </Discovery>"
" <DDSSecurity>"
" <Security>"
" <Authentication>"
" <Library finalizeFunction=\"finalize_authentication\" initFunction=\"init_authentication\"/>"
" <IdentityCertificate>data:,${TEST_IDENTITY_CERTIFICATE}</IdentityCertificate>"
@ -58,7 +58,7 @@ static const char *config =
" <Cryptographic>"
" <Library initFunction=\"${CRYPTO_INIT:-init_test_cryptography_wrapped}\" finalizeFunction=\"${CRYPTO_FINI:-finalize_test_cryptography_wrapped}\" path=\"" WRAPPERLIB_PATH("dds_security_cryptography_wrapper") "\"/>"
" </Cryptographic>"
" </DDSSecurity>"
" </Security>"
"</Domain>";
#define DDS_DOMAINID1 0

4
src/security/core/tests/handshake.c
View file

@ -43,7 +43,7 @@ static const char *config =
" <ExternalDomainId>0</ExternalDomainId>"
" <Tag>\\${CYCLONEDDS_PID}</Tag>"
" </Discovery>"
" <DDSSecurity>"
" <Security>"
" <Authentication>"
" <Library initFunction=\"${AUTH_INIT}\" finalizeFunction=\"${AUTH_FINI}\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
" <IdentityCertificate>data:,"TEST_IDENTITY1_CERTIFICATE"</IdentityCertificate>"
@ -59,7 +59,7 @@ static const char *config =
" <Cryptographic>"
" <Library initFunction=\"${CRYPTO_INIT}\" finalizeFunction=\"${CRYPTO_FINI}\" path=\"" WRAPPERLIB_PATH("dds_security_cryptography_wrapper") "\"/>"
" </Cryptographic>"
" </DDSSecurity>"
" </Security>"
"</Domain>";
#define DDS_DOMAINID1 0

36
src/security/core/tests/plugin_loading.c
View file

@ -72,7 +72,7 @@ CU_Test(ddssec_security_plugin_loading, all_ok, .init = ddsrt_init, .fini = ddsr
" <Tag>${CYCLONEDDS_PID}</Tag>"
" </Discovery>"
" <Tracing><Verbosity>finest</></>"
" <DDSSecurity>"
" <Security>"
" <Authentication>"
" <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
" <IdentityCertificate>"TEST_IDENTITY_CERTIFICATE_DUMMY"</IdentityCertificate>"
@ -90,7 +90,7 @@ CU_Test(ddssec_security_plugin_loading, all_ok, .init = ddsrt_init, .fini = ddsr
" <PermissionsCA></PermissionsCA>"
" <Permissions></Permissions>"
" </AccessControl>"
" </DDSSecurity>"
" </Security>"
"</Domain>";
set_logger_exp(log_expected);
@ -119,7 +119,7 @@ CU_Test(ddssec_security_plugin_loading, missing_finalize, .init = ddsrt_init, .f
" <Tag>${CYCLONEDDS_PID}</Tag>"
" </Discovery>"
" <Tracing><Verbosity>warning</></>"
" <DDSSecurity>"
" <Security>"
" <Authentication>"
" <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_NON_EXISTING_FUNC\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
" <IdentityCertificate>"TEST_IDENTITY_CERTIFICATE_DUMMY"</IdentityCertificate>"
@ -137,7 +137,7 @@ CU_Test(ddssec_security_plugin_loading, missing_finalize, .init = ddsrt_init, .f
" <PermissionsCA></PermissionsCA>"
" <Permissions></Permissions>"
" </AccessControl>"
" </DDSSecurity>"
" </Security>"
"</Domain>";
set_logger_exp(log_expected);
@ -165,7 +165,7 @@ CU_Test(ddssec_security_plugin_loading, authentication_missing_function, .init =
" <Tag>${CYCLONEDDS_PID}</Tag>"
" </Discovery>"
" <Tracing><Verbosity>warning</></>"
" <DDSSecurity>"
" <Security>"
" <Authentication>"
" <Library initFunction=\"init_test_authentication_missing_func\" finalizeFunction=\"finalize_test_authentication_missing_func\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
" <IdentityCertificate>"TEST_IDENTITY_CERTIFICATE_DUMMY"</IdentityCertificate>"
@ -183,7 +183,7 @@ CU_Test(ddssec_security_plugin_loading, authentication_missing_function, .init =
" <PermissionsCA></PermissionsCA>"
" <Permissions></Permissions>"
" </AccessControl>"
" </DDSSecurity>"
" </Security>"
"</Domain>";
set_logger_exp(log_expected);
@ -211,7 +211,7 @@ CU_Test(ddssec_security_plugin_loading, access_control_missing_function, .init =
" <Tag>${CYCLONEDDS_PID}</Tag>"
" </Discovery>"
" <Tracing><Verbosity>warning</></>"
" <DDSSecurity>"
" <Security>"
" <Authentication>"
" <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
" <IdentityCertificate>"TEST_IDENTITY_CERTIFICATE_DUMMY"</IdentityCertificate>"
@ -229,7 +229,7 @@ CU_Test(ddssec_security_plugin_loading, access_control_missing_function, .init =
" <PermissionsCA></PermissionsCA>"
" <Permissions></Permissions>"
" </AccessControl>"
" </DDSSecurity>"
" </Security>"
"</Domain>";
set_logger_exp(log_expected);
@ -257,7 +257,7 @@ CU_Test(ddssec_security_plugin_loading, cryptography_missing_function, .init = d
" <Tag>${CYCLONEDDS_PID}</Tag>"
" </Discovery>"
" <Tracing><Verbosity>warning</></>"
" <DDSSecurity>"
" <Security>"
" <Authentication>"
" <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
" <IdentityCertificate>"TEST_IDENTITY_CERTIFICATE_DUMMY"</IdentityCertificate>"
@ -275,7 +275,7 @@ CU_Test(ddssec_security_plugin_loading, cryptography_missing_function, .init = d
" <PermissionsCA></PermissionsCA>"
" <Permissions></Permissions>"
" </AccessControl>"
" </DDSSecurity>"
" </Security>"
"</Domain>";
set_logger_exp(log_expected);
@ -306,7 +306,7 @@ CU_Test(ddssec_security_plugin_loading, no_library_in_path, .init = ddsrt_init,
" <Tag>${CYCLONEDDS_PID}</Tag>"
" </Discovery>"
" <Tracing><Verbosity>warning</></>"
" <DDSSecurity>"
" <Security>"
" <Authentication>"
" <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper_INVALID") "\"/>"
" <IdentityCertificate>"TEST_IDENTITY_CERTIFICATE_DUMMY"</IdentityCertificate>"
@ -324,7 +324,7 @@ CU_Test(ddssec_security_plugin_loading, no_library_in_path, .init = ddsrt_init,
" <PermissionsCA></PermissionsCA>"
" <Permissions></Permissions>"
" </AccessControl>"
" </DDSSecurity>"
" </Security>"
"</Domain>";
set_logger_exp(log_expected);
@ -353,7 +353,7 @@ CU_Test(ddssec_security_plugin_loading, init_error, .init = ddsrt_init, .fini =
" <Tag>${CYCLONEDDS_PID}</Tag>"
" </Discovery>"
" <Tracing><Verbosity>warning</></>"
" <DDSSecurity>"
" <Security>"
" <Authentication>"
" <Library initFunction=\"init_test_authentication_init_error\" finalizeFunction=\"finalize_test_authentication_init_error\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
" <IdentityCertificate>"TEST_IDENTITY_CERTIFICATE_DUMMY"</IdentityCertificate>"
@ -371,7 +371,7 @@ CU_Test(ddssec_security_plugin_loading, init_error, .init = ddsrt_init, .fini =
" <PermissionsCA></PermissionsCA>"
" <Permissions></Permissions>"
" </AccessControl>"
" </DDSSecurity>"
" </Security>"
"</Domain>";
set_logger_exp(log_expected);
@ -590,7 +590,7 @@ CU_Test(ddssec_security_plugin_loading, multiple_domains_different_config, .init
" <Tag>${CYCLONEDDS_PID}</Tag>"
" </Discovery>"
" <Tracing><Verbosity>finest</></>"
" <DDSSecurity>"
" <Security>"
" <Authentication>"
" <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
" <IdentityCertificate>"TEST_IDENTITY_CERTIFICATE_DUMMY"</IdentityCertificate>"
@ -608,14 +608,14 @@ CU_Test(ddssec_security_plugin_loading, multiple_domains_different_config, .init
" <PermissionsCA></PermissionsCA>"
" <Permissions></Permissions>"
" </AccessControl>"
" </DDSSecurity>"
" </Security>"
"</Domain>"
"<Domain id=\"2\">"
" <Tracing><Verbosity>finest</></>"
" <Discovery>"
" <Tag>${CYCLONEDDS_PID}</Tag>"
" </Discovery>"
" <DDSSecurity>"
" <Security>"
" <Authentication>"
" <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
" <IdentityCertificate>"TEST_IDENTITY_CERTIFICATE_DUMMY"</IdentityCertificate>"
@ -633,7 +633,7 @@ CU_Test(ddssec_security_plugin_loading, multiple_domains_different_config, .init
" <PermissionsCA></PermissionsCA>"
" <Permissions></Permissions>"
" </AccessControl>"
" </DDSSecurity>"
" </Security>"
"</Domain>";
set_logger_exp(log_expected);

4
src/security/core/tests/secure_communication.c
View file

@ -44,7 +44,7 @@ static const char *config =
" <ExternalDomainId>0</ExternalDomainId>"
" <Tag>\\${CYCLONEDDS_PID}</Tag>"
" </Discovery>"
" <DDSSecurity>"
" <Security>"
" <Authentication>"
" <Library finalizeFunction=\"finalize_authentication\" initFunction=\"init_authentication\" />"
" <IdentityCertificate>data:,"TEST_IDENTITY1_CERTIFICATE"</IdentityCertificate>"
@ -62,7 +62,7 @@ static const char *config =
" <Cryptographic>"
" <Library finalizeFunction=\"finalize_test_cryptography_wrapped\" initFunction=\"init_test_cryptography_wrapped\" path=\"" WRAPPERLIB_PATH("dds_security_cryptography_wrapper") "\"/>"
" </Cryptographic>"
" </DDSSecurity>"
" </Security>"
"</Domain>";
#define DDS_DOMAINID_PUB 0