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

Fix security directory lookup for '/' security contexts (#609)

Browse source 
Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>
This commit is contained in:
Ivan Santiago Paunovic 2020-04-10 11:08:46 -03:00 • committed by GitHub
parent 08e0c715c5
commit 03f53f7098
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rcl/src/rcl/security.c
View file

@ -111,16 +111,16 @@ char * exact_match_lookup(
{ {
// Perform an exact match for the context name in directory <root dir>. // Perform an exact match for the context name in directory <root dir>.
char * secure_root = NULL; char * secure_root = NULL;
char * contexts_dir = NULL;
contexts_dir = rcutils_join_path(ros_secure_root_env, "contexts", *allocator);
// "/" case when root namespace is explicitly passed in // "/" case when root namespace is explicitly passed in
if (0 == strcmp(name, "/")) { if (0 == strcmp(name, "/")) {
secure_root = rcutils_strdup(ros_secure_root_env, *allocator); secure_root = contexts_dir;
} else { } else {
char * relative_path = NULL; char * relative_path = NULL;
char * contexts_dir = NULL;
// Get native path, ignore the leading forward slash // Get native path, ignore the leading forward slash
// TODO(ros2team): remove the hard-coded length, use the length of the root namespace instead // TODO(ros2team): remove the hard-coded length, use the length of the root namespace instead
relative_path = rcutils_to_native_path(name + 1, *allocator); relative_path = rcutils_to_native_path(name + 1, *allocator);
contexts_dir = rcutils_join_path(ros_secure_root_env, "contexts", *allocator);
secure_root = rcutils_join_path(contexts_dir, relative_path, *allocator); secure_root = rcutils_join_path(contexts_dir, relative_path, *allocator);
allocator->deallocate(relative_path, allocator->state); allocator->deallocate(relative_path, allocator->state);
allocator->deallocate(contexts_dir, allocator->state); allocator->deallocate(contexts_dir, allocator->state);

12
rcl/test/rcl/test_security.cpp
View file

@ -134,6 +134,18 @@ TEST_F(TestGetSecureRoot, failureScenarios) {
rcl_reset_error(); rcl_reset_error();
} }
TEST_F(TestGetSecureRoot, successScenarios_local_root_security_context) {
putenv_wrapper(
ROS_SECURITY_ROOT_DIRECTORY_VAR_NAME "="
TEST_RESOURCES_DIRECTORY TEST_SECURITY_DIRECTORY_RESOURCES_DIR_NAME);
secure_root = rcl_get_secure_root("/", &allocator);
ASSERT_NE(nullptr, secure_root);
ASSERT_STREQ(
TEST_RESOURCES_DIRECTORY TEST_SECURITY_DIRECTORY_RESOURCES_DIR_NAME PATH_SEPARATOR "contexts",
secure_root);
}
TEST_F(TestGetSecureRoot, successScenarios_local_exactMatch) { TEST_F(TestGetSecureRoot, successScenarios_local_exactMatch) {
putenv_wrapper( putenv_wrapper(
ROS_SECURITY_ROOT_DIRECTORY_VAR_NAME "=" ROS_SECURITY_ROOT_DIRECTORY_VAR_NAME "="