Use keystore root as security root directory, and not contexts folder - #410
Conversation
Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>
|
I cannot reproduce the problem in my Windows VM, I will try to figure it out ... |
I forgot |
Signed-off-by: Ivan S Paunovic <ivanpauno@gmail.com>
1aa8353 to
ea42d08
Compare
mikaelarguedas
left a comment
There was a problem hiding this comment.
hooray! pretty confused as of why the path worked before in this package but this particular 'contexts' addition needed special handling 🤔
I forgot -DSECURITY=ON man_facepalming .
Yeah this should probably be removed from the test_security package completely... This is a Fast-RTPS flag and requiring to pass it to test security on any rmw implementation is not really warranted.
|
Were the linux and MacOS tests ran with that change too ? (the path modification seem to happen unconditionally / on all platforms) |
Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>
Thank you! |
mikaelarguedas
left a comment
There was a problem hiding this comment.
lgtm, one non-blocking nit
Do you want to merge this and we'll do a follow-up for the enclave renaming ?
| set(KEYSTORE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/test/test_security_files") | ||
| set(VALID_ROS_SECURITY_ROOT_DIRECTORY "${KEYSTORE_DIRECTORY}/contexts") | ||
| if(WIN32) | ||
| string(REPLACE "/" "\\\\" KEYSTORE_DIRECTORY_NATIVE_PATH "${KEYSTORE_DIRECTORY}") |
There was a problem hiding this comment.
Nit^10: this could be done in place removing the need for a new variable and an else cause here
There was a problem hiding this comment.
I'm not sure if this
system_tests/test_security/CMakeLists.txt
Line 355 in 0ec293e
will continue working well, as it's a mixture of a cmake and a "native" path.
I'm going to left this as-is, as I don't want to come back to Windows to test.
Yeah, the renaming should be addressed in a separate PR. |
See ros2/rcl#607.
Both should be merged together.