workspace share path hardening (#95)

* resolve relative paths for root path
* block share paths that go outside of root path
* fix test using invalid share_path
* validate that root path is absolute

1 files changed, 45 insertions, 0 deletions

diff --git a/src/zenstore/workspaces.cpp b/src/zenstore/workspaces.cpp
index 6d8f8970d..01f1cc55f 100644
--- a/src/zenstore/workspaces.cpp
+++ b/src/zenstore/workspaces.cpp
@@ -408,6 +408,13 @@ Workspaces::AddWorkspace(const WorkspaceConfiguration& Configuration)
 	{
 		return false;
 	}
+
+	const std::filesystem::path RootPath = Configuration.RootPath;
+	if (RootPath.is_relative())
+	{
+		throw std::invalid_argument(fmt::format("workspace root path '{}' is not an absolute path", RootPath));
+	}
+
 	m_Workspaces.insert(std::make_pair(Configuration.Id, NewWorkspace));
 	ZEN_INFO("Created workspace '{}' with root '{}'", Configuration.Id, Configuration.RootPath);
 	return true;
@@ -499,6 +506,16 @@ Workspaces::AddWorkspaceShare(const Oid&												   WorkspaceId,
 		}
 	}
 
+	const std::filesystem::path RootPath  = Workspace->GetConfig().RootPath;
+	const std::filesystem::path SharePath = Configuration.SharePath;
+
+	std::filesystem::path FullPath		  = std::filesystem::absolute(RootPath / SharePath);
+	std::filesystem::path VerifySharePath = std::filesystem::relative(FullPath, RootPath);
+	if (VerifySharePath != Configuration.SharePath || VerifySharePath.string().starts_with(".."))
+	{
+		throw std::invalid_argument(fmt::format("workspace share path '{}' is not valid for root path '{}'", SharePath, RootPath));
+	}
+
 	Ref<WorkspaceShare> NewShare(new WorkspaceShare(Configuration, {}, PathToIdCB));
 	{
 		RwLock::ExclusiveLockScope _(m_Lock);
@@ -883,6 +900,34 @@ TEST_CASE("workspaces.scanfolder")
 	});
 }
 
+TEST_CASE("workspace.share.paths")
+{
+	using namespace std::literals;
+
+	WorkerThreadPool WorkerPool(std::thread::hardware_concurrency());
+
+	ScopedTemporaryDirectory								TempDir;
+	std::filesystem::path									RootPath = TempDir.Path();
+	std::vector<std::pair<std::filesystem::path, IoBuffer>> Content	 = GenerateFolderContent(RootPath);
+	Workspaces												WS;
+	CHECK(WS.AddWorkspace({PathToId(RootPath), RootPath}));
+	CHECK(WS.AddWorkspaceShare(PathToId(RootPath),
+							   {PathToId("second_folder/child_in_second"), "second_folder/child_in_second"},
+							   [](const std::filesystem::path& Path) { return PathToId(Path); }));
+	CHECK_THROWS(WS.AddWorkspaceShare(PathToId(RootPath),
+									  {PathToId("../second_folder"), "../second_folder"},
+									  [](const std::filesystem::path& Path) { return PathToId(Path); }));
+	CHECK(WS.AddWorkspaceShare(PathToId(RootPath), {PathToId("."), "."}, [](const std::filesystem::path& Path) { return PathToId(Path); }));
+	CHECK_THROWS(
+		WS.AddWorkspaceShare(PathToId(RootPath), {PathToId(".."), ".."}, [](const std::filesystem::path& Path) { return PathToId(Path); }));
+	CHECK_THROWS(WS.AddWorkspaceShare(PathToId(RootPath),
+									  {PathToId("second_folder/../second_folder/../.."), "second_folder/../second_folder/../.."},
+									  [](const std::filesystem::path& Path) { return PathToId(Path); }));
+	CHECK_THROWS(WS.AddWorkspaceShare(PathToId(RootPath), {PathToId(RootPath), RootPath}, [](const std::filesystem::path& Path) {
+		return PathToId(Path);
+	}));
+}
+
 TEST_CASE("workspace.share.basic")
 {
 	using namespace std::literals;