refactored success scenarios

Signed-off-by: Abby Xu <abbyxu@amazon.com>
ros2 · May 3, 2019 · 238dfd2 · 238dfd2
1 parent b792b9c
commit 238dfd2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 17 deletions.
diff --git a/rcl/package.xml b/rcl/package.xml
@@ -17,13 +17,11 @@
   <build_depend>rcutils</build_depend>
   <build_depend>rosidl_generator_c</build_depend>
   <build_depend>tinydir_vendor</build_depend>
-  <build_depend>osrf_testing_tools_cpp</build_depend>
 
   <build_export_depend>rcl_interfaces</build_export_depend>
   <build_export_depend>rcutils</build_export_depend>
   <build_export_depend>rosidl_generator_c</build_export_depend>
   <build_export_depend>tinydir_vendor</build_export_depend>
-  <build_export_depend>osrf_testing_tools_cpp</build_export_depend>
 
   <exec_depend>rcl_interfaces</exec_depend>
   <exec_depend>ament_cmake</exec_depend>

diff --git a/rcl/src/rcl/security_directory.c b/rcl/src/rcl/security_directory.c
@@ -227,6 +227,7 @@ char * rcl_get_secure_root(
     // Check which lookup method to use and invoke the relevant function.
     const char * ros_security_lookup_type = NULL;
     if (rcutils_get_env(ROS_SECURITY_LOOKUP_TYPE_VAR_NAME, &ros_security_lookup_type)) {
+      allocator->deallocate(ros_secure_root_env, allocator->state);
       return NULL;
     }
     if (0 == strcmp(ros_security_lookup_type,

diff --git a/rcl/test/rcl/test_security_directory.cpp b/rcl/test/rcl/test_security_directory.cpp
@@ -15,6 +15,7 @@
 #include <gtest/gtest.h>
 
 #include <string>
+#include <algorithm>
 #include "rcl/security_directory.h"
 #include "rcutils/filesystem.h"
 #include "osrf_testing_tools_cpp/scope_exit.hpp"
@@ -25,6 +26,11 @@
 #define TEST_NODE_NAME "dummy_node"
 #define TEST_NODE_NAMESPACE ROOT_NAMESPACE TEST_SECURITY_DIRECTORY_RESOURCES_DIR_NAME
 
+char * root_path;
+char * secure_root;
+char * base_lookup_dir_fqn;
+char envstring[512] = {0};
+
 static int putenv_wrapper(const char * env_var)
 {
 #ifdef _WIN32
@@ -78,20 +84,18 @@ class TestGetSecureRoot : public ::testing::Test
     });
   }
 
-  void get_base_lookup_dir_fqn(std::string & path,
-    const char * resource_dir, const char * resource_dir_name)
+  void set_base_lookup_dir_fqn(const char * resource_dir, const char * resource_dir_name)
   {
     base_lookup_dir_fqn = rcutils_join_path(resource_dir,
       resource_dir_name, allocator);
     std::string putenv_input = ROS_SECURITY_ROOT_DIRECTORY_VAR_NAME "=";
     putenv_input += base_lookup_dir_fqn;
-    path = putenv_input;
+    memcpy(envstring, putenv_input.c_str(),
+      std::min(putenv_input.length(), sizeof(envstring) - 1));
+    putenv_wrapper(envstring);
   }
 
   rcl_allocator_t allocator;
-  char * root_path;
-  char * secure_root;
-  char * base_lookup_dir_fqn;
 };
 
 TEST_F(TestGetSecureRoot, failureScenarios) {
@@ -149,10 +153,7 @@ TEST_F(TestGetSecureRoot, successScenarios_root_exactMatch) {
   secure_root = rcl_get_secure_root(TEST_NODE_NAME, TEST_NODE_NAMESPACE, &allocator);
 
   /* Include the namespace as part of the root security directory and test root namespace */
-  std::string path;
-  get_base_lookup_dir_fqn(path, TEST_RESOURCES_DIRECTORY, TEST_SECURITY_DIRECTORY_RESOURCES_DIR_NAME);
-  putenv_wrapper(path.c_str());
-
+  set_base_lookup_dir_fqn(TEST_RESOURCES_DIRECTORY, TEST_SECURITY_DIRECTORY_RESOURCES_DIR_NAME);
   /* --------------------------
    * Namespace  : Root
    * Match type : Exact
@@ -164,17 +165,13 @@ TEST_F(TestGetSecureRoot, successScenarios_root_exactMatch) {
   ASSERT_STREQ(root_path, secure_root);
 }
 
-
 TEST_F(TestGetSecureRoot, successScenarios_root_prefixMatch) {
   putenv_wrapper(ROS_SECURITY_ROOT_DIRECTORY_VAR_NAME "=" TEST_RESOURCES_DIRECTORY);
   putenv_wrapper(ROS_SECURITY_LOOKUP_TYPE_VAR_NAME "=MATCH_PREFIX");
   secure_root = rcl_get_secure_root(TEST_NODE_NAME, TEST_NODE_NAMESPACE, &allocator);
 
   /* Include the namespace as part of the root security directory and test root namespace */
-  std::string path;
-  get_base_lookup_dir_fqn(path, TEST_RESOURCES_DIRECTORY, TEST_SECURITY_DIRECTORY_RESOURCES_DIR_NAME);
-  putenv_wrapper(path.c_str());
-
+  set_base_lookup_dir_fqn(TEST_RESOURCES_DIRECTORY, TEST_SECURITY_DIRECTORY_RESOURCES_DIR_NAME);
   /* --------------------------
    * Namespace  : Root
    * Match type : Prefix