From ed25b0f77690abe1f04e4cdcb284b7e17208d169 Mon Sep 17 00:00:00 2001 From: Paul Cristian Sarbu Date: Fri, 9 May 2025 18:07:21 +0200 Subject: RepositoryConfig: Ensure consistency in reading blobs and trees ...with respect to rejecting invalid entries such as upwards symlinks. Also ensure that valid trees are only checked once by remebering known valid tress though marker files in local storage. --- src/buildtool/execution_api/git/git_api.cpp | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'src/buildtool/execution_api/git/git_api.cpp') diff --git a/src/buildtool/execution_api/git/git_api.cpp b/src/buildtool/execution_api/git/git_api.cpp index 231e717a..2c083e64 100644 --- a/src/buildtool/execution_api/git/git_api.cpp +++ b/src/buildtool/execution_api/git/git_api.cpp @@ -81,7 +81,8 @@ auto GitApi::RetrieveToPaths( } } else { - auto blob = repo_config_.ReadBlobFromGitCAS(info.digest.hash()); + auto blob = repo_config_.ReadBlobFromGitCAS( + info.digest.hash(), /*is_symlink=*/IsSymlinkObject(info.type)); if (not blob) { return false; } @@ -141,7 +142,8 @@ auto GitApi::RetrieveToFds( } } else { - auto blob = repo_config_.ReadBlobFromGitCAS(info.digest.hash()); + auto blob = repo_config_.ReadBlobFromGitCAS( + info.digest.hash(), /*is_symlink=*/IsSymlinkObject(info.type)); if (not blob) { Logger::Log(LogLevel::Debug, "Blob {} not known to git", @@ -217,7 +219,9 @@ auto GitApi::RetrieveToCas( content = tree->RawData(); } else { - content = repo_config_.ReadBlobFromGitCAS(info->digest.hash()); + content = repo_config_.ReadBlobFromGitCAS( + info->digest.hash(), + /*is_symlink=*/IsSymlinkObject(info->type)); } if (not content) { return false; @@ -248,10 +252,14 @@ auto GitApi::RetrieveToCas( auto GitApi::RetrieveToMemory(Artifact::ObjectInfo const& artifact_info) const noexcept -> std::optional { - return repo_config_.ReadBlobFromGitCAS(artifact_info.digest.hash()); + return repo_config_.ReadBlobFromGitCAS( + artifact_info.digest.hash(), + /*is_symlink=*/IsSymlinkObject(artifact_info.type)); } auto GitApi::IsAvailable(ArtifactDigest const& digest) const noexcept -> bool { - return repo_config_.ReadBlobFromGitCAS(digest.hash(), LogLevel::Trace) - .has_value(); + return repo_config_ + .ReadBlobFromGitCAS( + digest.hash(), /*is_symlink=*/false, LogLevel::Trace) + .has_value(); // allow invalid symlink if just to check existence } -- cgit v1.2.3