tor

commit 7b4716a7624b73e60f70485ac577ef6cf884e67c
parent effc9739bfb3c91171be47673c67ec2bd05c2758
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed, 12 Aug 2020 20:36:23 -0400

Make test_glob() pass even when run as root.

Previously the test relied on not being able to look inside 000
directories, which is a thing root _can_ do.

Bug not in any released Tor version.

Diffstat:
M
src/test/test_util.c
 | 
13
++++++++-----

1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/test/test_util.c b/src/test/test_util.c
@@ -4622,11 +4622,14 @@ test_util_glob(void *ptr)
   TEST("\\*");
   EXPECT_EMPTY();
 
-  // test forbidden directory
-  tor_asprintf(&pattern, "%s"PATH_SEPARATOR"*"PATH_SEPARATOR"*", dirname);
-  results = tor_glob(pattern);
-  tor_free(pattern);
-  tt_assert(!results);
+  if (getuid() != 0) {
+    // test forbidden directory, if we're not root.
+    // (Root will be able to see this directory anyway.)
+    tor_asprintf(&pattern, "%s"PATH_SEPARATOR"*"PATH_SEPARATOR"*", dirname);
+    results = tor_glob(pattern);
+    tor_free(pattern);
+    tt_assert(!results);
+  }
 #endif
 
 #undef TEST