]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[#3837] Addressed review comments
authorThomas Markwalder <tmark@isc.org>
Wed, 30 Apr 2025 11:21:08 +0000 (07:21 -0400)
committerAndrei Pavel <andrei@isc.org>
Wed, 7 May 2025 12:54:54 +0000 (15:54 +0300)
src/lib/util/filesystem.cc

index 6990c114ffe35b45f70161ffa109d64f881427c4..384835fa2b28f7fbffcd6d47e77318f2fb786ff7 100644 (file)
@@ -14,7 +14,6 @@
 #include <cstdlib>
 #include <fstream>
 #include <string>
-#include <filesystem>
 #include <iostream>
 
 #include <dirent.h>
@@ -206,23 +205,23 @@ FileManager::validatePath(const std::string supported_path_str, const std::strin
     auto filename = input_path.filename();
     if (filename.empty()) {
         isc_throw(BadValue, "path: '" << input_path.str() << "' has no filename");
-     }
+    }
+
     auto parent_path = input_path.parentPath();
     if (!parent_path.empty()) {
-         if (!enforce_path) {
-             // Security set to lax, let it fly.
-             return (input_path_str);
-         }
+        if (!enforce_path) {
+            // Security set to lax, let it fly.
+            return (input_path_str);
+        }
+
          // We only allow absolute path equal to default. Catch an invalid path.
         if (parent_path != supported_path_copy) {
-             isc_throw(BadValue, "invalid path specified: '"
+            isc_throw(BadValue, "invalid path specified: '"
                       << parent_path << "', supported path is '"
                       << supported_path_copy << "'");
-         }
-     }
+        }
+    }
+
     std::string valid_path(supported_path_copy + "/" +  filename);
     return (valid_path);
 }