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

Remove setting the tracing verbosity in tests and make configs in security core tests more consistent

Browse source 
Signed-off-by: Dennis Potman <dennis.potman@adlinktech.com>
This commit is contained in:
Dennis Potman 2020-03-05 11:12:40 +01:00 • committed by eboasson
parent e7f5ae354c
commit 9cc128c295
4 changed files with 226 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -42,7 +42,6 @@ static const char *config =
" <ExternalDomainId>0</ExternalDomainId>" " <ExternalDomainId>0</ExternalDomainId>"
" <Tag>\\${CYCLONEDDS_PID}</Tag>" " <Tag>\\${CYCLONEDDS_PID}</Tag>"
" </Discovery>" " </Discovery>"
" <Tracing><Verbosity>config</></>"
" <DDSSecurity>" " <DDSSecurity>"
" <Authentication>" " <Authentication>"
" <Library finalizeFunction=\"finalize_test_authentication_wrapped\" initFunction=\"init_test_authentication_wrapped\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>" " <Library finalizeFunction=\"finalize_test_authentication_wrapped\" initFunction=\"init_test_authentication_wrapped\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"

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

@ -50,6 +50,15 @@
"file:Permissions_CA.pem", "file:Governance.p7s", "file:Permissions.p7s", \ "file:Permissions_CA.pem", "file:Governance.p7s", "file:Permissions.p7s", \
pre_str, post_str, binprops) pre_str, post_str, binprops)
static const char *default_config =
"<Domain id=\"any\">"
" <Discovery>"
" <Tag>${CYCLONEDDS_PID}</Tag>"
" </Discovery>"
" <Tracing><Verbosity>finest</></>"
"</Domain>";
/* /*
* The 'found' variable will contain flags related to the expected log * The 'found' variable will contain flags related to the expected log
* messages that were received. * messages that were received.
@ -96,8 +105,17 @@ CU_Test(ddssec_config, empty, .init = ddsrt_init, .fini = ddsrt_fini)
NULL NULL
}; };
const char *sec_config =
"<Domain id=\"any\">"
" <Discovery>"
" <Tag>${CYCLONEDDS_PID}</Tag>"
" </Discovery>"
" <Tracing><Verbosity>config</></>"
" <DDSSecurity />"
"</Domain>";
set_logger_exp(log_expected); set_logger_exp(log_expected);
domain = dds_create_domain(0, "<DDSSecurity/>"); domain = dds_create_domain(0, sec_config);
CU_ASSERT_EQUAL_FATAL(domain, DDS_RETCODE_ERROR); CU_ASSERT_EQUAL_FATAL(domain, DDS_RETCODE_ERROR);
reset_logger(); reset_logger();
@ -116,7 +134,7 @@ CU_Test(ddssec_config, non, .init = ddsrt_init, .fini = ddsrt_fini)
}; };
set_logger_exp(log_expected); set_logger_exp(log_expected);
domain = dds_create_domain(0, "<Tracing><Verbosity>finest</></>"); domain = dds_create_domain(0, default_config);
CU_ASSERT_FATAL(domain > 0); CU_ASSERT_FATAL(domain > 0);
dds_delete(domain); dds_delete(domain);
reset_logger(); reset_logger();
@ -139,6 +157,9 @@ CU_Test(ddssec_config, missing, .init = ddsrt_init, .fini = ddsrt_fini)
/* IdentityCertificate, IdentityCA and PrivateKey values or elements are missing. */ /* IdentityCertificate, IdentityCA and PrivateKey values or elements are missing. */
const char *sec_config = const char *sec_config =
"<Domain id=\"any\">" "<Domain id=\"any\">"
" <Discovery>"
" <Tag>${CYCLONEDDS_PID}</Tag>"
" </Discovery>"
" <Tracing><Verbosity>finest</></>" " <Tracing><Verbosity>finest</></>"
" <DDSSecurity>" " <DDSSecurity>"
" <Authentication>" " <Authentication>"
@ -190,30 +211,31 @@ CU_Test(ddssec_config, all, .init = ddsrt_init, .fini = ddsrt_fini)
}; };
const char *sec_config = const char *sec_config =
"<"DDS_PROJECT_NAME">" "<Domain id=\"any\">"
" <Domain id=\"any\">" " <Discovery>"
" <Tracing><Verbosity>finest</></>" " <Tag>${CYCLONEDDS_PID}</Tag>"
" <DDSSecurity>" " </Discovery>"
" <Authentication>" " <Tracing><Verbosity>finest</></>"
" <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>" " <DDSSecurity>"
" <IdentityCertificate>"TEST_IDENTITY_CERTIFICATE_DUMMY"</IdentityCertificate>" " <Authentication>"
" <IdentityCA>"TEST_IDENTITY_CA_CERTIFICATE_DUMMY"</IdentityCA>" " <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
" <PrivateKey>"TEST_IDENTITY_PRIVATE_KEY_DUMMY"</PrivateKey>" " <IdentityCertificate>"TEST_IDENTITY_CERTIFICATE_DUMMY"</IdentityCertificate>"
" <Password>testtext_Password_testtext</Password>" " <IdentityCA>"TEST_IDENTITY_CA_CERTIFICATE_DUMMY"</IdentityCA>"
" <TrustedCADirectory>testtext_Dir_testtext</TrustedCADirectory>" " <PrivateKey>"TEST_IDENTITY_PRIVATE_KEY_DUMMY"</PrivateKey>"
" </Authentication>" " <Password>testtext_Password_testtext</Password>"
" <Cryptographic>" " <TrustedCADirectory>testtext_Dir_testtext</TrustedCADirectory>"
" <Library initFunction=\"init_test_cryptography_all_ok\" finalizeFunction=\"finalize_test_cryptography_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_cryptography_wrapper") "\"/>" " </Authentication>"
" </Cryptographic>" " <Cryptographic>"
" <AccessControl>" " <Library initFunction=\"init_test_cryptography_all_ok\" finalizeFunction=\"finalize_test_cryptography_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_cryptography_wrapper") "\"/>"
" <Library initFunction=\"init_test_access_control_all_ok\" finalizeFunction=\"finalize_test_access_control_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>" " </Cryptographic>"
" <Governance>file:Governance.p7s</Governance>" " <AccessControl>"
" <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>" " <Library initFunction=\"init_test_access_control_all_ok\" finalizeFunction=\"finalize_test_access_control_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>"
" <Permissions>file:Permissions.p7s</Permissions>" " <Governance>file:Governance.p7s</Governance>"
" </AccessControl>" " <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>"
" </DDSSecurity>" " <Permissions>file:Permissions.p7s</Permissions>"
" </Domain>" " </AccessControl>"
"</"DDS_PROJECT_NAME">"; " </DDSSecurity>"
"</Domain>";
set_logger_exp(log_expected); set_logger_exp(log_expected);
domain = dds_create_domain(0, sec_config); domain = dds_create_domain(0, sec_config);
@ -261,6 +283,10 @@ CU_Test(ddssec_config, security, .init = ddsrt_init, .fini = ddsrt_fini)
const char *sec_config = const char *sec_config =
"<Domain id=\"any\">" "<Domain id=\"any\">"
" <Discovery>"
" <Tag>${CYCLONEDDS_PID}</Tag>"
" </Discovery>"
" <Tracing><Verbosity>finest</></>"
" <DDSSecurity>" " <DDSSecurity>"
" <Authentication>" " <Authentication>"
" <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>" " <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
@ -278,7 +304,6 @@ CU_Test(ddssec_config, security, .init = ddsrt_init, .fini = ddsrt_fini)
" <Permissions>file:Permissions.p7s</Permissions>" " <Permissions>file:Permissions.p7s</Permissions>"
" </AccessControl>" " </AccessControl>"
" </DDSSecurity>" " </DDSSecurity>"
" <Tracing><Verbosity>finest</></>"
"</Domain>"; "</Domain>";
set_logger_exp(log_expected); set_logger_exp(log_expected);
@ -325,30 +350,31 @@ CU_Test(ddssec_config, deprecated, .init = ddsrt_init, .fini = ddsrt_fini)
}; };
const char *sec_config = const char *sec_config =
"<"DDS_PROJECT_NAME">" "<Domain id=\"any\">"
" <Domain id=\"any\">" " <Discovery>"
" <DDSSecurity>" " <Tag>${CYCLONEDDS_PID}</Tag>"
" <Authentication>" " </Discovery>"
" <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>" " <Tracing><Verbosity>finest</></>"
" <IdentityCertificate>"TEST_IDENTITY_CERTIFICATE_DUMMY"</IdentityCertificate>" " <DDSSecurity>"
" <IdentityCA>"TEST_IDENTITY_CA_CERTIFICATE_DUMMY"</IdentityCA>" " <Authentication>"
" <PrivateKey>"TEST_IDENTITY_PRIVATE_KEY_DUMMY"</PrivateKey>" " <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
" <Password>testtext_Password_testtext</Password>" " <IdentityCertificate>"TEST_IDENTITY_CERTIFICATE_DUMMY"</IdentityCertificate>"
" <TrustedCADirectory>testtext_Dir_testtext</TrustedCADirectory>" " <IdentityCA>"TEST_IDENTITY_CA_CERTIFICATE_DUMMY"</IdentityCA>"
" </Authentication>" " <PrivateKey>"TEST_IDENTITY_PRIVATE_KEY_DUMMY"</PrivateKey>"
" <Cryptographic>" " <Password>testtext_Password_testtext</Password>"
" <Library initFunction=\"init_test_cryptography_all_ok\" finalizeFunction=\"finalize_test_cryptography_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_cryptography_wrapper") "\"/>" " <TrustedCADirectory>testtext_Dir_testtext</TrustedCADirectory>"
" </Cryptographic>" " </Authentication>"
" <AccessControl>" " <Cryptographic>"
" <Library initFunction=\"init_test_access_control_all_ok\" finalizeFunction=\"finalize_test_access_control_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>" " <Library initFunction=\"init_test_cryptography_all_ok\" finalizeFunction=\"finalize_test_cryptography_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_cryptography_wrapper") "\"/>"
" <Governance>file:Governance.p7s</Governance>" " </Cryptographic>"
" <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>" " <AccessControl>"
" <Permissions>file:Permissions.p7s</Permissions>" " <Library initFunction=\"init_test_access_control_all_ok\" finalizeFunction=\"finalize_test_access_control_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>"
" </AccessControl>" " <Governance>file:Governance.p7s</Governance>"
" </DDSSecurity>" " <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>"
" <Tracing><Verbosity>finest</></>" " <Permissions>file:Permissions.p7s</Permissions>"
" </Domain>" " </AccessControl>"
"</"DDS_PROJECT_NAME">"; " </DDSSecurity>"
"</Domain>";
set_logger_exp(log_expected); set_logger_exp(log_expected);
domain = dds_create_domain(0, sec_config); domain = dds_create_domain(0, sec_config);
@ -395,7 +421,7 @@ CU_Test(ddssec_config, qos, .init = ddsrt_init, .fini = ddsrt_fini)
dds_qset_prop(qos, "dds.sec.auth.trusted_ca_dir", "file:/test/dir"); dds_qset_prop(qos, "dds.sec.auth.trusted_ca_dir", "file:/test/dir");
set_logger_exp(log_expected); set_logger_exp(log_expected);
domain = dds_create_domain(0, "<Tracing><Verbosity>finest</></>"); domain = dds_create_domain(0, default_config);
CU_ASSERT_FATAL(domain > 0); CU_ASSERT_FATAL(domain > 0);
participant = dds_create_participant(0, qos, NULL); participant = dds_create_participant(0, qos, NULL);
CU_ASSERT_FATAL(participant > 0); CU_ASSERT_FATAL(participant > 0);
@ -445,7 +471,7 @@ CU_Test(ddssec_config, qos_props, .init = ddsrt_init, .fini = ddsrt_fini)
dds_qset_bprop(qos, "test.bprop1", bvalue, 3); dds_qset_bprop(qos, "test.bprop1", bvalue, 3);
set_logger_exp(log_expected); set_logger_exp(log_expected);
domain = dds_create_domain(0, "<Tracing><Verbosity>finest</></>"); domain = dds_create_domain(0, default_config);
CU_ASSERT_FATAL(domain > 0); CU_ASSERT_FATAL(domain > 0);
participant = dds_create_participant(0, qos, NULL); participant = dds_create_participant(0, qos, NULL);
CU_ASSERT_FATAL(participant > 0); CU_ASSERT_FATAL(participant > 0);
@ -475,19 +501,24 @@ CU_Test(ddssec_config, config_qos, .init = ddsrt_init, .fini = ddsrt_fini)
}; };
const char *sec_config = const char *sec_config =
"<Tracing><Verbosity>finest</></>" "<Domain id=\"any\">"
"<DDSSecurity>" " <Discovery>"
" <Authentication>" " <Tag>${CYCLONEDDS_PID}</Tag>"
" <IdentityCertificate>"TEST_IDENTITY_CERTIFICATE_DUMMY"</IdentityCertificate>" " </Discovery>"
" <IdentityCA>"TEST_IDENTITY_CA_CERTIFICATE_DUMMY"</IdentityCA>" " <Tracing><Verbosity>finest</></>"
" <PrivateKey>"TEST_IDENTITY_PRIVATE_KEY_DUMMY"</PrivateKey>" " <DDSSecurity>"
" </Authentication>" " <Authentication>"
" <AccessControl>" " <IdentityCertificate>"TEST_IDENTITY_CERTIFICATE_DUMMY"</IdentityCertificate>"
" <Governance>file:Governance.p7s</Governance>" " <IdentityCA>"TEST_IDENTITY_CA_CERTIFICATE_DUMMY"</IdentityCA>"
" <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>" " <PrivateKey>"TEST_IDENTITY_PRIVATE_KEY_DUMMY"</PrivateKey>"
" <Permissions>file:Permissions.p7s</Permissions>" " </Authentication>"
" </AccessControl>" " <AccessControl>"
"</DDSSecurity>"; " <Governance>file:Governance.p7s</Governance>"
" <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>"
" <Permissions>file:Permissions.p7s</Permissions>"
" </AccessControl>"
" </DDSSecurity>"
"</Domain>";
CU_ASSERT_FATAL((qos = dds_create_qos()) != NULL); CU_ASSERT_FATAL((qos = dds_create_qos()) != NULL);
dds_qset_prop(qos, DDS_SEC_PROP_AUTH_LIBRARY_PATH, WRAPPERLIB_PATH("dds_security_authentication_wrapper")); dds_qset_prop(qos, DDS_SEC_PROP_AUTH_LIBRARY_PATH, WRAPPERLIB_PATH("dds_security_authentication_wrapper"));
@ -533,26 +564,31 @@ CU_Test(ddssec_config, other_prop, .init = ddsrt_init, .fini = ddsrt_fini)
}; };
const char *sec_config = const char *sec_config =
"<Tracing><Verbosity>finest</></>" "<Domain id=\"any\">"
"<DDSSecurity>" " <Discovery>"
" <Authentication>" " <Tag>${CYCLONEDDS_PID}</Tag>"
" <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>" " </Discovery>"
" <IdentityCertificate>"TEST_IDENTITY_CERTIFICATE_DUMMY"</IdentityCertificate>" " <Tracing><Verbosity>finest</></>"
" <IdentityCA>"TEST_IDENTITY_CA_CERTIFICATE_DUMMY"</IdentityCA>" " <DDSSecurity>"
" <PrivateKey>"TEST_IDENTITY_PRIVATE_KEY_DUMMY"</PrivateKey>" " <Authentication>"
" <Password>testtext_Password_testtext</Password>" " <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
" <TrustedCADirectory>testtext_Dir_testtext</TrustedCADirectory>" " <IdentityCertificate>"TEST_IDENTITY_CERTIFICATE_DUMMY"</IdentityCertificate>"
" </Authentication>" " <IdentityCA>"TEST_IDENTITY_CA_CERTIFICATE_DUMMY"</IdentityCA>"
" <Cryptographic>" " <PrivateKey>"TEST_IDENTITY_PRIVATE_KEY_DUMMY"</PrivateKey>"
" <Library initFunction=\"init_test_cryptography_all_ok\" finalizeFunction=\"finalize_test_cryptography_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_cryptography_wrapper") "\"/>" " <Password>testtext_Password_testtext</Password>"
" </Cryptographic>" " <TrustedCADirectory>testtext_Dir_testtext</TrustedCADirectory>"
" <AccessControl>" " </Authentication>"
" <Library initFunction=\"init_test_access_control_all_ok\" finalizeFunction=\"finalize_test_access_control_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>" " <Cryptographic>"
" <Governance>file:Governance.p7s</Governance>" " <Library initFunction=\"init_test_cryptography_all_ok\" finalizeFunction=\"finalize_test_cryptography_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_cryptography_wrapper") "\"/>"
" <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>" " </Cryptographic>"
" <Permissions>file:Permissions.p7s</Permissions>" " <AccessControl>"
" </AccessControl>" " <Library initFunction=\"init_test_access_control_all_ok\" finalizeFunction=\"finalize_test_access_control_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>"
"</DDSSecurity>"; " <Governance>file:Governance.p7s</Governance>"
" <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>"
" <Permissions>file:Permissions.p7s</Permissions>"
" </AccessControl>"
" </DDSSecurity>"
"</Domain>";
CU_ASSERT_FATAL((qos = dds_create_qos()) != NULL); CU_ASSERT_FATAL((qos = dds_create_qos()) != NULL);
dds_qset_prop(qos, "test.dds.sec.prop1", "testtext_value1_testtext"); dds_qset_prop(qos, "test.dds.sec.prop1", "testtext_value1_testtext");
@ -598,19 +634,24 @@ CU_Test(ddssec_config, qos_invalid, .init = ddsrt_init, .fini = ddsrt_fini)
}; };
const char *sec_config = const char *sec_config =
"<Tracing><Verbosity>finest</></>" "<Domain id=\"any\">"
"<DDSSecurity>" " <Discovery>"
" <Authentication>" " <Tag>${CYCLONEDDS_PID}</Tag>"
" <IdentityCertificate>"TEST_IDENTITY_CERTIFICATE_DUMMY"</IdentityCertificate>" " </Discovery>"
" <IdentityCA>"TEST_IDENTITY_CA_CERTIFICATE_DUMMY"</IdentityCA>" " <Tracing><Verbosity>finest</></>"
" <PrivateKey>"TEST_IDENTITY_PRIVATE_KEY_DUMMY"</PrivateKey>" " <DDSSecurity>"
" </Authentication>" " <Authentication>"
" <AccessControl>" " <IdentityCertificate>"TEST_IDENTITY_CERTIFICATE_DUMMY"</IdentityCertificate>"
" <Governance>file:Governance.p7s</Governance>" " <IdentityCA>"TEST_IDENTITY_CA_CERTIFICATE_DUMMY"</IdentityCA>"
" <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>" " <PrivateKey>"TEST_IDENTITY_PRIVATE_KEY_DUMMY"</PrivateKey>"
" <Permissions>file:Permissions.p7s</Permissions>" " </Authentication>"
" </AccessControl>" " <AccessControl>"
"</DDSSecurity>"; " <Governance>file:Governance.p7s</Governance>"
" <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>"
" <Permissions>file:Permissions.p7s</Permissions>"
" </AccessControl>"
" </DDSSecurity>"
"</Domain>";
set_logger_exp(log_expected); set_logger_exp(log_expected);

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

@ -40,7 +40,6 @@ static const char *config =
" <ExternalDomainId>0</ExternalDomainId>" " <ExternalDomainId>0</ExternalDomainId>"
" <Tag>\\${CYCLONEDDS_PID}</Tag>" " <Tag>\\${CYCLONEDDS_PID}</Tag>"
" </Discovery>" " </Discovery>"
" <Tracing><Verbosity>config</></>"
" <DDSSecurity>" " <DDSSecurity>"
" <Authentication>" " <Authentication>"
" <Library finalizeFunction=\"finalize_test_authentication_wrapped\" initFunction=\"init_test_authentication_wrapped\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>" " <Library finalizeFunction=\"finalize_test_authentication_wrapped\" initFunction=\"init_test_authentication_wrapped\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"

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

@ -24,6 +24,14 @@
static uint32_t found; static uint32_t found;
static const char *default_config =
"<Domain id=\"any\">"
" <Discovery>"
" <Tag>${CYCLONEDDS_PID}</Tag>"
" </Discovery>"
" <Tracing><Verbosity>finest</></>"
"</Domain>";
static void logger(void *ptr, const dds_log_data_t *data) static void logger(void *ptr, const dds_log_data_t *data)
{ {
char **expected = (char **)ptr; char **expected = (char **)ptr;
@ -60,6 +68,9 @@ CU_Test(ddssec_security_plugin_loading, all_ok, .init = ddsrt_init, .fini = ddsr
const char *sec_config = const char *sec_config =
"<Domain id=\"any\">" "<Domain id=\"any\">"
" <Discovery>"
" <Tag>${CYCLONEDDS_PID}</Tag>"
" </Discovery>"
" <Tracing><Verbosity>finest</></>" " <Tracing><Verbosity>finest</></>"
" <DDSSecurity>" " <DDSSecurity>"
" <Authentication>" " <Authentication>"
@ -75,9 +86,9 @@ CU_Test(ddssec_security_plugin_loading, all_ok, .init = ddsrt_init, .fini = ddsr
" </Cryptographic>" " </Cryptographic>"
" <AccessControl>" " <AccessControl>"
" <Library initFunction=\"init_test_access_control_all_ok\" finalizeFunction=\"finalize_test_access_control_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>" " <Library initFunction=\"init_test_access_control_all_ok\" finalizeFunction=\"finalize_test_access_control_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>"
" <Governance>file:Governance.p7s</Governance>" " <Governance></Governance>"
" <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>" " <PermissionsCA></PermissionsCA>"
" <Permissions>file:Permissions.p7s</Permissions>" " <Permissions></Permissions>"
" </AccessControl>" " </AccessControl>"
" </DDSSecurity>" " </DDSSecurity>"
"</Domain>"; "</Domain>";
@ -104,7 +115,10 @@ CU_Test(ddssec_security_plugin_loading, missing_finalize, .init = ddsrt_init, .f
const char *sec_config = const char *sec_config =
"<Domain id=\"any\">" "<Domain id=\"any\">"
" <Tracing><Verbosity>finest</></>" " <Discovery>"
" <Tag>${CYCLONEDDS_PID}</Tag>"
" </Discovery>"
" <Tracing><Verbosity>warning</></>"
" <DDSSecurity>" " <DDSSecurity>"
" <Authentication>" " <Authentication>"
" <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_NON_EXISTING_FUNC\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>" " <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_NON_EXISTING_FUNC\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
@ -119,9 +133,9 @@ CU_Test(ddssec_security_plugin_loading, missing_finalize, .init = ddsrt_init, .f
" </Cryptographic>" " </Cryptographic>"
" <AccessControl>" " <AccessControl>"
" <Library initFunction=\"init_test_access_control_all_ok\" finalizeFunction=\"finalize_test_access_control_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>" " <Library initFunction=\"init_test_access_control_all_ok\" finalizeFunction=\"finalize_test_access_control_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>"
" <Governance>file:Governance.p7s</Governance>" " <Governance></Governance>"
" <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>" " <PermissionsCA></PermissionsCA>"
" <Permissions>file:Permissions.p7s</Permissions>" " <Permissions></Permissions>"
" </AccessControl>" " </AccessControl>"
" </DDSSecurity>" " </DDSSecurity>"
"</Domain>"; "</Domain>";
@ -147,7 +161,10 @@ CU_Test(ddssec_security_plugin_loading, authentication_missing_function, .init =
const char *sec_config = const char *sec_config =
"<Domain id=\"any\">" "<Domain id=\"any\">"
" <Tracing><Verbosity>finest</></>" " <Discovery>"
" <Tag>${CYCLONEDDS_PID}</Tag>"
" </Discovery>"
" <Tracing><Verbosity>warning</></>"
" <DDSSecurity>" " <DDSSecurity>"
" <Authentication>" " <Authentication>"
" <Library initFunction=\"init_test_authentication_missing_func\" finalizeFunction=\"finalize_test_authentication_missing_func\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>" " <Library initFunction=\"init_test_authentication_missing_func\" finalizeFunction=\"finalize_test_authentication_missing_func\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
@ -162,9 +179,9 @@ CU_Test(ddssec_security_plugin_loading, authentication_missing_function, .init =
" </Cryptographic>" " </Cryptographic>"
" <AccessControl>" " <AccessControl>"
" <Library initFunction=\"init_test_access_control_all_ok\" finalizeFunction=\"finalize_test_access_control_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>" " <Library initFunction=\"init_test_access_control_all_ok\" finalizeFunction=\"finalize_test_access_control_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>"
" <Governance>file:Governance.p7s</Governance>" " <Governance></Governance>"
" <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>" " <PermissionsCA></PermissionsCA>"
" <Permissions>file:Permissions.p7s</Permissions>" " <Permissions></Permissions>"
" </AccessControl>" " </AccessControl>"
" </DDSSecurity>" " </DDSSecurity>"
"</Domain>"; "</Domain>";
@ -190,7 +207,10 @@ CU_Test(ddssec_security_plugin_loading, access_control_missing_function, .init =
const char *sec_config = const char *sec_config =
"<Domain id=\"any\">" "<Domain id=\"any\">"
" <Tracing><Verbosity>finest</></>" " <Discovery>"
" <Tag>${CYCLONEDDS_PID}</Tag>"
" </Discovery>"
" <Tracing><Verbosity>warning</></>"
" <DDSSecurity>" " <DDSSecurity>"
" <Authentication>" " <Authentication>"
" <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>" " <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
@ -205,9 +225,9 @@ CU_Test(ddssec_security_plugin_loading, access_control_missing_function, .init =
" </Cryptographic>" " </Cryptographic>"
" <AccessControl>" " <AccessControl>"
" <Library initFunction=\"init_test_access_control_missing_func\" finalizeFunction=\"finalize_test_access_control_missing_func\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>" " <Library initFunction=\"init_test_access_control_missing_func\" finalizeFunction=\"finalize_test_access_control_missing_func\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>"
" <Governance>file:Governance.p7s</Governance>" " <Governance></Governance>"
" <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>" " <PermissionsCA></PermissionsCA>"
" <Permissions>file:Permissions.p7s</Permissions>" " <Permissions></Permissions>"
" </AccessControl>" " </AccessControl>"
" </DDSSecurity>" " </DDSSecurity>"
"</Domain>"; "</Domain>";
@ -233,7 +253,10 @@ CU_Test(ddssec_security_plugin_loading, cryptography_missing_function, .init = d
const char *sec_config = const char *sec_config =
"<Domain id=\"any\">" "<Domain id=\"any\">"
" <Tracing><Verbosity>finest</></>" " <Discovery>"
" <Tag>${CYCLONEDDS_PID}</Tag>"
" </Discovery>"
" <Tracing><Verbosity>warning</></>"
" <DDSSecurity>" " <DDSSecurity>"
" <Authentication>" " <Authentication>"
" <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>" " <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
@ -248,9 +271,9 @@ CU_Test(ddssec_security_plugin_loading, cryptography_missing_function, .init = d
" </Cryptographic>" " </Cryptographic>"
" <AccessControl>" " <AccessControl>"
" <Library initFunction=\"init_test_access_control_all_ok\" finalizeFunction=\"finalize_test_access_control_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>" " <Library initFunction=\"init_test_access_control_all_ok\" finalizeFunction=\"finalize_test_access_control_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>"
" <Governance>file:Governance.p7s</Governance>" " <Governance></Governance>"
" <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>" " <PermissionsCA></PermissionsCA>"
" <Permissions>file:Permissions.p7s</Permissions>" " <Permissions></Permissions>"
" </AccessControl>" " </AccessControl>"
" </DDSSecurity>" " </DDSSecurity>"
"</Domain>"; "</Domain>";
@ -279,7 +302,10 @@ CU_Test(ddssec_security_plugin_loading, no_library_in_path, .init = ddsrt_init,
const char *sec_config = const char *sec_config =
"<Domain id=\"any\">" "<Domain id=\"any\">"
" <Tracing><Verbosity>finest</></>" " <Discovery>"
" <Tag>${CYCLONEDDS_PID}</Tag>"
" </Discovery>"
" <Tracing><Verbosity>warning</></>"
" <DDSSecurity>" " <DDSSecurity>"
" <Authentication>" " <Authentication>"
" <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper_INVALID") "\"/>" " <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper_INVALID") "\"/>"
@ -294,9 +320,9 @@ CU_Test(ddssec_security_plugin_loading, no_library_in_path, .init = ddsrt_init,
" </Cryptographic>" " </Cryptographic>"
" <AccessControl>" " <AccessControl>"
" <Library initFunction=\"init_test_access_control_all_ok\" finalizeFunction=\"finalize_test_access_control_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>" " <Library initFunction=\"init_test_access_control_all_ok\" finalizeFunction=\"finalize_test_access_control_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>"
" <Governance>file:Governance.p7s</Governance>" " <Governance></Governance>"
" <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>" " <PermissionsCA></PermissionsCA>"
" <Permissions>file:Permissions.p7s</Permissions>" " <Permissions></Permissions>"
" </AccessControl>" " </AccessControl>"
" </DDSSecurity>" " </DDSSecurity>"
"</Domain>"; "</Domain>";
@ -323,7 +349,10 @@ CU_Test(ddssec_security_plugin_loading, init_error, .init = ddsrt_init, .fini =
const char *sec_config = const char *sec_config =
"<Domain id=\"any\">" "<Domain id=\"any\">"
" <Tracing><Verbosity>finest</></>" " <Discovery>"
" <Tag>${CYCLONEDDS_PID}</Tag>"
" </Discovery>"
" <Tracing><Verbosity>warning</></>"
" <DDSSecurity>" " <DDSSecurity>"
" <Authentication>" " <Authentication>"
" <Library initFunction=\"init_test_authentication_init_error\" finalizeFunction=\"finalize_test_authentication_init_error\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>" " <Library initFunction=\"init_test_authentication_init_error\" finalizeFunction=\"finalize_test_authentication_init_error\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
@ -338,9 +367,9 @@ CU_Test(ddssec_security_plugin_loading, init_error, .init = ddsrt_init, .fini =
" </Cryptographic>" " </Cryptographic>"
" <AccessControl>" " <AccessControl>"
" <Library initFunction=\"init_test_access_control_all_ok\" finalizeFunction=\"finalize_test_access_control_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>" " <Library initFunction=\"init_test_access_control_all_ok\" finalizeFunction=\"finalize_test_access_control_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>"
" <Governance>file:Governance.p7s</Governance>" " <Governance></Governance>"
" <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>" " <PermissionsCA></PermissionsCA>"
" <Permissions>file:Permissions.p7s</Permissions>" " <Permissions></Permissions>"
" </AccessControl>" " </AccessControl>"
" </DDSSecurity>" " </DDSSecurity>"
"</Domain>"; "</Domain>";
@ -370,9 +399,9 @@ CU_Test(ddssec_security_plugin_loading, all_ok_with_props, .init = ddsrt_init, .
dds_qset_prop(qos, DDS_SEC_PROP_AUTH_IDENTITY_CA, "testtext_IdentityCA_testtext"); dds_qset_prop(qos, DDS_SEC_PROP_AUTH_IDENTITY_CA, "testtext_IdentityCA_testtext");
dds_qset_prop(qos, DDS_SEC_PROP_AUTH_PRIV_KEY, "testtext_PrivateKey_testtext"); dds_qset_prop(qos, DDS_SEC_PROP_AUTH_PRIV_KEY, "testtext_PrivateKey_testtext");
dds_qset_prop(qos, DDS_SEC_PROP_AUTH_IDENTITY_CERT, "testtext_IdentityCertificate_testtext"); dds_qset_prop(qos, DDS_SEC_PROP_AUTH_IDENTITY_CERT, "testtext_IdentityCertificate_testtext");
dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_PERMISSIONS_CA, "file:Permissions_CA.pem"); dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_PERMISSIONS_CA, "file:");
dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_GOVERNANCE, "file:Governance.p7s"); dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_GOVERNANCE, "file:");
dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_PERMISSIONS, "file:Permissions.p7s"); dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_PERMISSIONS, "file:");
dds_qset_prop(qos, DDS_SEC_PROP_AUTH_PASSWORD, "testtext_Password_testtext"); dds_qset_prop(qos, DDS_SEC_PROP_AUTH_PASSWORD, "testtext_Password_testtext");
dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_TRUSTED_CA_DIR, "file:/test/dir"); dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_TRUSTED_CA_DIR, "file:/test/dir");
@ -391,7 +420,7 @@ CU_Test(ddssec_security_plugin_loading, all_ok_with_props, .init = ddsrt_init, .
dds_qset_bprop(qos, "test.bprop1", bvalue, 3); dds_qset_bprop(qos, "test.bprop1", bvalue, 3);
set_logger_exp(log_expected); set_logger_exp(log_expected);
domain = dds_create_domain(0, "<Tracing><Verbosity>finest</></>"); domain = dds_create_domain(0, default_config);
CU_ASSERT_FATAL(domain > 0); CU_ASSERT_FATAL(domain > 0);
participant = dds_create_participant(0, qos, NULL); participant = dds_create_participant(0, qos, NULL);
CU_ASSERT_FATAL(participant > 0); CU_ASSERT_FATAL(participant > 0);
@ -418,9 +447,9 @@ CU_Test(ddssec_security_plugin_loading, missing_plugin_property_with_props, .ini
dds_qset_prop(qos, DDS_SEC_PROP_AUTH_IDENTITY_CA, "testtext_IdentityCA_testtext"); dds_qset_prop(qos, DDS_SEC_PROP_AUTH_IDENTITY_CA, "testtext_IdentityCA_testtext");
dds_qset_prop(qos, DDS_SEC_PROP_AUTH_PRIV_KEY, "testtext_PrivateKey_testtext"); dds_qset_prop(qos, DDS_SEC_PROP_AUTH_PRIV_KEY, "testtext_PrivateKey_testtext");
dds_qset_prop(qos, DDS_SEC_PROP_AUTH_IDENTITY_CERT, "testtext_IdentityCertificate_testtext"); dds_qset_prop(qos, DDS_SEC_PROP_AUTH_IDENTITY_CERT, "testtext_IdentityCertificate_testtext");
dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_PERMISSIONS_CA, "file:Permissions_CA.pem"); dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_PERMISSIONS_CA, "file:");
dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_GOVERNANCE, "file:Governance.p7s"); dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_GOVERNANCE, "file:");
dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_PERMISSIONS, "file:Permissions.p7s"); dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_PERMISSIONS, "file:");
dds_qset_prop(qos, DDS_SEC_PROP_AUTH_PASSWORD, "testtext_Password_testtext"); dds_qset_prop(qos, DDS_SEC_PROP_AUTH_PASSWORD, "testtext_Password_testtext");
dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_TRUSTED_CA_DIR, "file:/test/dir"); dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_TRUSTED_CA_DIR, "file:/test/dir");
@ -439,7 +468,7 @@ CU_Test(ddssec_security_plugin_loading, missing_plugin_property_with_props, .ini
dds_qset_bprop(qos, "test.bprop1", bvalue, 3); dds_qset_bprop(qos, "test.bprop1", bvalue, 3);
set_logger_exp(log_expected); set_logger_exp(log_expected);
domain = dds_create_domain(0, "<Tracing><Verbosity>finest</></>"); domain = dds_create_domain(0, default_config);
CU_ASSERT_FATAL(domain > 0); CU_ASSERT_FATAL(domain > 0);
participant = dds_create_participant(0, qos, NULL); participant = dds_create_participant(0, qos, NULL);
CU_ASSERT_EQUAL_FATAL(participant, DDS_RETCODE_ERROR); CU_ASSERT_EQUAL_FATAL(participant, DDS_RETCODE_ERROR);
@ -466,8 +495,8 @@ CU_Test(ddssec_security_plugin_loading, empty_plugin_property_with_props, .init
dds_qset_prop(qos, DDS_SEC_PROP_AUTH_PRIV_KEY, "testtext_PrivateKey_testtext"); dds_qset_prop(qos, DDS_SEC_PROP_AUTH_PRIV_KEY, "testtext_PrivateKey_testtext");
dds_qset_prop(qos, DDS_SEC_PROP_AUTH_IDENTITY_CERT, "testtext_IdentityCertificate_testtext"); dds_qset_prop(qos, DDS_SEC_PROP_AUTH_IDENTITY_CERT, "testtext_IdentityCertificate_testtext");
dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_PERMISSIONS_CA, "file:Permissions_CA.pem"); dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_PERMISSIONS_CA, "file:Permissions_CA.pem");
dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_GOVERNANCE, "file:Governance.p7s"); dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_GOVERNANCE, "file:");
dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_PERMISSIONS, "file:Permissions.p7s"); dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_PERMISSIONS, "file:");
dds_qset_prop(qos, DDS_SEC_PROP_AUTH_PASSWORD, "testtext_Password_testtext"); dds_qset_prop(qos, DDS_SEC_PROP_AUTH_PASSWORD, "testtext_Password_testtext");
dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_TRUSTED_CA_DIR, "file:/test/dir"); dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_TRUSTED_CA_DIR, "file:/test/dir");
@ -486,7 +515,7 @@ CU_Test(ddssec_security_plugin_loading, empty_plugin_property_with_props, .init
dds_qset_bprop(qos, "test.bprop1", bvalue, 3); dds_qset_bprop(qos, "test.bprop1", bvalue, 3);
set_logger_exp(log_expected); set_logger_exp(log_expected);
domain = dds_create_domain(0, "<Tracing><Verbosity>finest</></>"); domain = dds_create_domain(0, default_config);
CU_ASSERT_FATAL(domain > 0); CU_ASSERT_FATAL(domain > 0);
participant = dds_create_participant(DDS_DOMAIN_DEFAULT, qos, NULL); participant = dds_create_participant(DDS_DOMAIN_DEFAULT, qos, NULL);
CU_ASSERT_EQUAL_FATAL(participant, DDS_RETCODE_ERROR); CU_ASSERT_EQUAL_FATAL(participant, DDS_RETCODE_ERROR);
@ -512,10 +541,9 @@ CU_Test(ddssec_security_plugin_loading, missing_security_property_with_props, .i
dds_qset_prop(qos, DDS_SEC_PROP_AUTH_IDENTITY_CA, "testtext_IdentityCA_testtext"); dds_qset_prop(qos, DDS_SEC_PROP_AUTH_IDENTITY_CA, "testtext_IdentityCA_testtext");
dds_qset_prop(qos, DDS_SEC_PROP_AUTH_PRIV_KEY, "testtext_PrivateKey_testtext"); dds_qset_prop(qos, DDS_SEC_PROP_AUTH_PRIV_KEY, "testtext_PrivateKey_testtext");
dds_qset_prop(qos, DDS_SEC_PROP_AUTH_IDENTITY_CERT, "testtext_IdentityCertificate_testtext"); dds_qset_prop(qos, DDS_SEC_PROP_AUTH_IDENTITY_CERT, "testtext_IdentityCertificate_testtext");
dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_PERMISSIONS_CA, "file:Permissions_CA.pem"); dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_PERMISSIONS_CA, "file:");
dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_GOVERNANCE, "file:Governance.p7s"); dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_GOVERNANCE, "file:");
/* we ignore permissions for testing //dds_qset_prop (qos, DDS_SEC_PROP_ACCESS_PERMISSIONS, "file:");
//dds_qset_prop (qos, DDS_SEC_PROP_ACCESS_PERMISSIONS, "file:Permissions.p7s"); */
dds_qset_prop(qos, DDS_SEC_PROP_AUTH_PASSWORD, "testtext_Password_testtext"); dds_qset_prop(qos, DDS_SEC_PROP_AUTH_PASSWORD, "testtext_Password_testtext");
dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_TRUSTED_CA_DIR, "file:/test/dir"); dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_TRUSTED_CA_DIR, "file:/test/dir");
@ -534,7 +562,7 @@ CU_Test(ddssec_security_plugin_loading, missing_security_property_with_props, .i
dds_qset_bprop(qos, "test.bprop1", bvalue, 3); dds_qset_bprop(qos, "test.bprop1", bvalue, 3);
set_logger_exp(log_expected); set_logger_exp(log_expected);
domain = dds_create_domain(0, "<Tracing><Verbosity>finest</></>"); domain = dds_create_domain(0, default_config);
CU_ASSERT_FATAL(domain > 0); CU_ASSERT_FATAL(domain > 0);
participant = dds_create_participant(DDS_DOMAIN_DEFAULT, qos, NULL); participant = dds_create_participant(DDS_DOMAIN_DEFAULT, qos, NULL);
CU_ASSERT_EQUAL_FATAL(participant, DDS_RETCODE_ERROR); CU_ASSERT_EQUAL_FATAL(participant, DDS_RETCODE_ERROR);
@ -558,6 +586,9 @@ CU_Test(ddssec_security_plugin_loading, multiple_domains_different_config, .init
const char *sec_config = const char *sec_config =
"<Domain id=\"1\">" "<Domain id=\"1\">"
" <Discovery>"
" <Tag>${CYCLONEDDS_PID}</Tag>"
" </Discovery>"
" <Tracing><Verbosity>finest</></>" " <Tracing><Verbosity>finest</></>"
" <DDSSecurity>" " <DDSSecurity>"
" <Authentication>" " <Authentication>"
@ -573,14 +604,17 @@ CU_Test(ddssec_security_plugin_loading, multiple_domains_different_config, .init
" </Cryptographic>" " </Cryptographic>"
" <AccessControl>" " <AccessControl>"
" <Library initFunction=\"init_test_access_control_all_ok\" finalizeFunction=\"finalize_test_access_control_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>" " <Library initFunction=\"init_test_access_control_all_ok\" finalizeFunction=\"finalize_test_access_control_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>"
" <Governance>file:Governance.p7s</Governance>" " <Governance></Governance>"
" <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>" " <PermissionsCA></PermissionsCA>"
" <Permissions>file:Permissions.p7s</Permissions>" " <Permissions></Permissions>"
" </AccessControl>" " </AccessControl>"
" </DDSSecurity>" " </DDSSecurity>"
"</Domain>" "</Domain>"
"<Domain id=\"2\">" "<Domain id=\"2\">"
" <Tracing><Verbosity>finest</></>" " <Tracing><Verbosity>finest</></>"
" <Discovery>"
" <Tag>${CYCLONEDDS_PID}</Tag>"
" </Discovery>"
" <DDSSecurity>" " <DDSSecurity>"
" <Authentication>" " <Authentication>"
" <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>" " <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
@ -595,9 +629,9 @@ CU_Test(ddssec_security_plugin_loading, multiple_domains_different_config, .init
" </Cryptographic>" " </Cryptographic>"
" <AccessControl>" " <AccessControl>"
" <Library initFunction=\"init_test_access_control_all_ok\" finalizeFunction=\"finalize_test_access_control_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>" " <Library initFunction=\"init_test_access_control_all_ok\" finalizeFunction=\"finalize_test_access_control_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>"
" <Governance>file:Governance.p7s</Governance>" " <Governance></Governance>"
" <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>" " <PermissionsCA></PermissionsCA>"
" <Permissions>file:Permissions.p7s</Permissions>" " <Permissions></Permissions>"
" </AccessControl>" " </AccessControl>"
" </DDSSecurity>" " </DDSSecurity>"
"</Domain>"; "</Domain>";
@ -614,9 +648,9 @@ CU_Test(ddssec_security_plugin_loading, multiple_domains_different_config, .init
dds_qset_prop(qos, DDS_SEC_PROP_AUTH_IDENTITY_CA, "testtext_IdentityCA_testtext"); dds_qset_prop(qos, DDS_SEC_PROP_AUTH_IDENTITY_CA, "testtext_IdentityCA_testtext");
dds_qset_prop(qos, DDS_SEC_PROP_AUTH_PRIV_KEY, "testtext_PrivateKey_testtext"); dds_qset_prop(qos, DDS_SEC_PROP_AUTH_PRIV_KEY, "testtext_PrivateKey_testtext");
dds_qset_prop(qos, DDS_SEC_PROP_AUTH_IDENTITY_CERT, "testtext_IdentityCertificate_testtext"); dds_qset_prop(qos, DDS_SEC_PROP_AUTH_IDENTITY_CERT, "testtext_IdentityCertificate_testtext");
dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_PERMISSIONS_CA, "file:Permissions_CA.pem"); dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_PERMISSIONS_CA, "file:");
dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_GOVERNANCE, "file:Governance.p7s"); dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_GOVERNANCE, "file:");
dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_PERMISSIONS, "file:Permissions.p7s"); dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_PERMISSIONS, "file:");
dds_qset_prop(qos, DDS_SEC_PROP_AUTH_PASSWORD, "testtext_Password_testtext"); dds_qset_prop(qos, DDS_SEC_PROP_AUTH_PASSWORD, "testtext_Password_testtext");
dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_TRUSTED_CA_DIR, "file:/test/dir"); dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_TRUSTED_CA_DIR, "file:/test/dir");