[#4647] Addressed review comments

modified:   changelog_unreleased/4647-validatepath-allows-lease-file-path-outside-dhcp-data-dir
modified:   src/lib/util/tests/filesystem_unittests.cc

diff --git a/changelog_unreleased/4647-validatepath-allows-lease-file-path-outside-dhcp-data-dir b/changelog_unreleased/4647-validatepath-allows-lease-file-path-outside-dhcp-data-dir
index bf801211fb0263c60a49b16ee309a4f018e92836..27a4297a01da5436379e764e863f75223567fc15 100644 (file)
--- a/changelog_unreleased/4647-validatepath-allows-lease-file-path-outside-dhcp-data-dir
+++ b/changelog_unreleased/4647-validatepath-allows-lease-file-path-outside-dhcp-data-dir
@@ -1,4 +1,4 @@
 [bug]          wlodek, tmark
-       Path validation now rejects now rejects "." and ".." file names
+       Path validation now rejects "." and ".." file names
        as invalid (e.g. memfile lease database name "..").
        (Gitlab #4647)

diff --git a/src/lib/util/tests/filesystem_unittests.cc b/src/lib/util/tests/filesystem_unittests.cc
index 01c283fb3be0e88c3ec7edd34521e24ff7614d27..fbca3c1f751f0c5672dba8a423c282d81a0066d7 100644 (file)
--- a/src/lib/util/tests/filesystem_unittests.cc
+++ b/src/lib/util/tests/filesystem_unittests.cc
@@ -505,23 +505,29 @@ TEST_F(PathCheckerTest, validatePathEnforcePathFalse) {
         string("path: '' has no filename"),
         false
     },
+    {
+        // Empty filename.
+        __LINE__,
+        "",
+        "",
+        string("path: '' has no filename"),
+        false
+    },
     {
         // Bare ".." escapes the supported path via empty parent.
         __LINE__,
         "..",
         "",
-        string("invalid path specified: '..', supported path is '" +
-               def_path + "'"),
-        true
+        string("path: '..' has no filename"),
+        false
     },
     {
         // Supported path plus ".." also escapes despite matching parent.
         __LINE__,
         def_path + "/..",
         "",
-        string("invalid path specified: '..', supported path is '" +
-               def_path + "'"),
-        true
+        string("path: '" + def_path + "/..' has no filename"),
+        false
     }
     };