From 3865c8556bde5e614dc1e8c72f83fa1ed65abcd9 Mon Sep 17 00:00:00 2001
From: Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com>
Date: Wed, 14 Jun 2023 16:40:48 +0200
Subject: bazel_msg_factory: Allow non-upwards symlinks in uploaded trees

---
 src/buildtool/execution_api/remote/bazel/bazel_api.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'src/buildtool/execution_api/remote/bazel/bazel_api.cpp')

diff --git a/src/buildtool/execution_api/remote/bazel/bazel_api.cpp b/src/buildtool/execution_api/remote/bazel/bazel_api.cpp
index fcfb517d..f4fd3b1f 100644
--- a/src/buildtool/execution_api/remote/bazel/bazel_api.cpp
+++ b/src/buildtool/execution_api/remote/bazel/bazel_api.cpp
@@ -312,8 +312,21 @@ auto BazelApi::CreateAction(
 
     if (Compatibility::IsCompatible()) {
         BlobContainer blobs{};
+        auto const& network = network_;
         auto digest = BazelMsgFactory::CreateDirectoryDigestFromTree(
             *build_root,
+            [&network](std::vector<bazel_re::Digest> const& digests,
+                       std::vector<std::string>* targets) {
+                auto reader = network->ReadBlobs(digests);
+                auto blobs = reader.Next();
+                targets->reserve(digests.size());
+                while (not blobs.empty()) {
+                    for (auto const& blob : blobs) {
+                        targets->emplace_back(blob.data);
+                    }
+                    blobs = reader.Next();
+                }
+            },
             [&blobs](BazelBlob&& blob) { blobs.Emplace(std::move(blob)); });
         if (not digest) {
             Logger::Log(LogLevel::Debug,
-- 
cgit v1.2.3