From dac964e52b2948d2343c44f00e3a469e18bb62f0 Mon Sep 17 00:00:00 2001 From: CI Bot Date: Thu, 21 Nov 2024 17:30:49 +0000 Subject: [PATCH] Run clang-format --- src/common/file_system/local_file_system.cpp | 7 ++-- src/main/database.cpp | 1 - test/c_api/database_test.cpp | 44 +++++++++++++------- 3 files changed, 31 insertions(+), 21 deletions(-) diff --git a/src/common/file_system/local_file_system.cpp b/src/common/file_system/local_file_system.cpp index aacd95b44f..65480f83f7 100644 --- a/src/common/file_system/local_file_system.cpp +++ b/src/common/file_system/local_file_system.cpp @@ -222,7 +222,7 @@ void LocalFileSystem::createDir(const std::string& dir) const { auto directoryToCreate = dir; if (directoryToCreate.ends_with('/') #if defined(_WIN32) - || directoryToCreate.ends_with('\\') + || directoryToCreate.ends_with('\\') #endif ) { // This is a known issue with std::filesystem::create_directories. (link: @@ -261,7 +261,7 @@ bool isSubdirectory(const std::filesystem::path& base, const std::filesystem::pa // Size check for a "." result. // If the path starts with "..", it's not a subdirectory. return !relative.empty() && !(relative.starts_with("..")); - + } catch (const std::filesystem::filesystem_error& e) { // Handle errors, e.g., if paths don't exist std::cerr << "Filesystem error: " << e.what() << std::endl; @@ -271,9 +271,8 @@ bool isSubdirectory(const std::filesystem::path& base, const std::filesystem::pa return false; } - void LocalFileSystem::removeFileIfExists(const std::string& path) { - std::cout<<"home:"<<<<"path:"< + #include "c_api/kuzu.h" +#include "common/exception/io.h" +#include "common/file_system/virtual_file_system.h" #include "graph_test/api_graph_test.h" #include "gtest/gtest.h" -#include "common/file_system/virtual_file_system.h" -#include "common/exception/io.h" -#include using namespace kuzu::main; using namespace kuzu::testing; @@ -115,7 +116,8 @@ TEST_F(CApiDatabaseTest, VirtualFileSystemDeleteFiles) { vfs.removeFileIfExists("/tmp/test1"); } catch (const kuzu::common::IOException& e) { // Expected behavior - EXPECT_STREQ(e.what(), "IO exception: Error: Path /tmp/test1 is not within the allowed home directory /tmp/dbHome/"); + EXPECT_STREQ(e.what(), "IO exception: Error: Path /tmp/test1 is not within the allowed " + "home directory /tmp/dbHome/"); } vfs.removeFileIfExists("/tmp/dbHome/test1"); @@ -140,7 +142,8 @@ TEST_F(CApiDatabaseTest, VirtualFileSystemDeleteFilesWithHome) { vfs.removeFileIfExists("~/tmp/test1"); } catch (const kuzu::common::IOException& e) { // Expected behavior - EXPECT_STREQ(e.what(), "IO exception: Error: Path ~/tmp/test1 is not within the allowed home directory ~/tmp/dbHome/"); + EXPECT_STREQ(e.what(), "IO exception: Error: Path ~/tmp/test1 is not within the allowed " + "home directory ~/tmp/dbHome/"); } // Attempt to delete files outside the home directory (should error) @@ -148,7 +151,8 @@ TEST_F(CApiDatabaseTest, VirtualFileSystemDeleteFilesWithHome) { vfs.removeFileIfExists("~"); } catch (const kuzu::common::IOException& e) { // Expected behavior - EXPECT_STREQ(e.what(), "IO exception: Error: Path ~ is not within the allowed home directory ~/tmp/dbHome/"); + EXPECT_STREQ(e.what(), + "IO exception: Error: Path ~ is not within the allowed home directory ~/tmp/dbHome/"); } vfs.removeFileIfExists("~/tmp/dbHome/test1"); @@ -174,42 +178,48 @@ TEST_F(CApiDatabaseTest, VirtualFileSystemDeleteFilesEdgeCases) { vfs.removeFileIfExists("/tmp/dbHome/../test2"); } catch (const kuzu::common::IOException& e) { // Expected behavior - EXPECT_STREQ(e.what(), "IO exception: Error: Path /tmp/dbHome/../test2 is not within the allowed home directory /tmp/dbHome/"); + EXPECT_STREQ(e.what(), "IO exception: Error: Path /tmp/dbHome/../test2 is not within the " + "allowed home directory /tmp/dbHome/"); } try { vfs.removeFileIfExists("/tmp"); } catch (const kuzu::common::IOException& e) { // Expected behavior - EXPECT_STREQ(e.what(), "IO exception: Error: Path /tmp is not within the allowed home directory /tmp/dbHome/"); + EXPECT_STREQ(e.what(), + "IO exception: Error: Path /tmp is not within the allowed home directory /tmp/dbHome/"); } try { vfs.removeFileIfExists("/tmp/"); } catch (const kuzu::common::IOException& e) { // Expected behavior - EXPECT_STREQ(e.what(), "IO exception: Error: Path /tmp/ is not within the allowed home directory /tmp/dbHome/"); + EXPECT_STREQ(e.what(), "IO exception: Error: Path /tmp/ is not within the allowed home " + "directory /tmp/dbHome/"); } try { vfs.removeFileIfExists("/tmp//////////////////"); } catch (const kuzu::common::IOException& e) { // Expected behavior - EXPECT_STREQ(e.what(), "IO exception: Error: Path /tmp////////////////// is not within the allowed home directory /tmp/dbHome/"); + EXPECT_STREQ(e.what(), "IO exception: Error: Path /tmp////////////////// is not within the " + "allowed home directory /tmp/dbHome/"); } try { vfs.removeFileIfExists("/tmp/./.././"); } catch (const kuzu::common::IOException& e) { // Expected behavior - EXPECT_STREQ(e.what(), "IO exception: Error: Path /tmp/./.././ is not within the allowed home directory /tmp/dbHome/"); + EXPECT_STREQ(e.what(), "IO exception: Error: Path /tmp/./.././ is not within the allowed " + "home directory /tmp/dbHome/"); } try { vfs.removeFileIfExists("/"); } catch (const kuzu::common::IOException& e) { // Expected behavior - EXPECT_STREQ(e.what(), "IO exception: Error: Path / is not within the allowed home directory /tmp/dbHome/"); + EXPECT_STREQ(e.what(), + "IO exception: Error: Path / is not within the allowed home directory /tmp/dbHome/"); } vfs.removeFileIfExists("/tmp/dbHome/test2"); @@ -240,7 +250,8 @@ TEST_F(CApiDatabaseTest, VirtualFileSystemDeleteFilesWindowsPaths) { vfs.removeFileIfExists("C:\\test1"); FAIL() << "Expected exception for path outside home directory."; } catch (const kuzu::common::IOException& e) { - EXPECT_STREQ(e.what(), "IO exception: Error: Path C:\\test1 is not within the allowed home directory C:\\Desktop\\dir"); + EXPECT_STREQ(e.what(), "IO exception: Error: Path C:\\test1 is not within the allowed home " + "directory C:\\Desktop\\dir"); } // Attempt to delete file inside the home directory with mixed separators (should succeed) @@ -274,8 +285,8 @@ TEST_F(CApiDatabaseTest, VirtualFileSystemDeleteFilesWildcard) { vfs.removeFileIfExists("/tmp/dbHome_wildcard/test*"); ASSERT_FALSE(std::filesystem::exists("/tmp/dbHome_wildcard/test1_wildcard")); ASSERT_FALSE(std::filesystem::exists("/tmp/dbHome_wildcard/test2_wildcard")); - ASSERT_TRUE(std::filesystem::exists("/tmp/dbHome_wildcard/nested_wildcard/file2.test")); // Deleted - ASSERT_TRUE(std::filesystem::exists("/tmp/dbHome_wildcard/nested_wildcard/file1.txt")); + ASSERT_TRUE(std::filesystem::exists("/tmp/dbHome_wildcard/nested_wildcard/file2.test")); // +Deleted ASSERT_TRUE(std::filesystem::exists("/tmp/dbHome_wildcard/nested_wildcard/file1.txt")); // Wildcard pattern: Delete all files in nested directory vfs.removeFileIfExists("/tmp/dbHome_wildcard/nested_wildcard/*"); @@ -287,7 +298,8 @@ TEST_F(CApiDatabaseTest, VirtualFileSystemDeleteFilesWildcard) { vfs.removeFileIfExists("/tmp/*.test"); FAIL() << "Expected exception for wildcard outside home directory."; } catch (const kuzu::common::IOException& e) { - EXPECT_STREQ(e.what(), "Error: Path /tmp/*.test is not within the allowed home directory /tmp/dbHome_wildcard/"); + EXPECT_STREQ(e.what(), "Error: Path /tmp/*.test is not within the allowed home directory +/tmp/dbHome_wildcard/"); } // Cleanup