builds allow redirect option (#379)

* add --allow-redirect to zen builds upload/download

9 files changed, 107 insertions, 67 deletions

diff --git a/src/zen/cmds/builds_cmd.cpp b/src/zen/cmds/builds_cmd.cpp
index 134cde0f8..c4a1344d4 100644
--- a/src/zen/cmds/builds_cmd.cpp
+++ b/src/zen/cmds/builds_cmd.cpp
@@ -8953,6 +8953,12 @@ BuildsCommand::BuildsCommand()
 
 		Ops.add_option("cloud build", "", "namespace", "Builds Storage namespace", cxxopts::value(m_Namespace), "<namespace>");
 		Ops.add_option("cloud build", "", "bucket", "Builds Storage bucket", cxxopts::value(m_Bucket), "<bucket>");
+		Ops.add_option("cloud build",
+					   "",
+					   "allow-redirect",
+					   "Allow redirect of requests",
+					   cxxopts::value(m_AllowRedirect),
+					   "<allow-redirect>");
 	};
 
 	auto AddFileOptions = [this](cxxopts::Options& Ops) {
@@ -9677,9 +9683,14 @@ BuildsCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 											  Result.BuildStorageHttp->GetSessionId(),
 											  m_Namespace,
 											  m_Bucket);
-			Result.BuildStorage =
-				CreateJupiterBuildStorage(Log(), *Result.BuildStorageHttp, StorageStats, m_Namespace, m_Bucket, TempPath / "storage");
-			Result.StorageName = BuildStorageName;
+			Result.BuildStorage		= CreateJupiterBuildStorage(Log(),
+															*Result.BuildStorageHttp,
+															StorageStats,
+															m_Namespace,
+															m_Bucket,
+															m_AllowRedirect,
+															TempPath / "storage");
+			Result.StorageName		= BuildStorageName;
 		}
 		else if (!m_StoragePath.empty())
 		{
diff --git a/src/zen/cmds/builds_cmd.h b/src/zen/cmds/builds_cmd.h
index 9f6c1f6ec..de2d6fffc 100644
--- a/src/zen/cmds/builds_cmd.h
+++ b/src/zen/cmds/builds_cmd.h
@@ -37,7 +37,8 @@ private:
 	// cloud builds
 	std::string m_OverrideHost;
 	std::string m_Host;
-	bool		m_AssumeHttp2 = false;
+	bool		m_AssumeHttp2	= false;
+	bool		m_AllowRedirect = false;
 	std::string m_Namespace;
 	std::string m_Bucket;
 
diff --git a/src/zenserver/projectstore/buildsremoteprojectstore.cpp b/src/zenserver/projectstore/buildsremoteprojectstore.cpp
index 2a04d5c40..ab96ae92d 100644
--- a/src/zenserver/projectstore/buildsremoteprojectstore.cpp
+++ b/src/zenserver/projectstore/buildsremoteprojectstore.cpp
@@ -35,16 +35,10 @@ public:
 	, m_BuildId(BuildId)
 	, m_MetaData(MetaData)
 	, m_TempFilePath(TempFilePath)
+	, m_EnableBlocks(!ForceDisableBlocks)
+	, m_UseTempBlocks(!ForceDisableTempBlocks)
 	{
 		m_MetaData.MakeOwned();
-		if (ForceDisableBlocks)
-		{
-			m_EnableBlocks = false;
-		}
-		if (ForceDisableTempBlocks)
-		{
-			m_UseTempBlocks = false;
-		}
 	}
 
 	virtual RemoteStoreInfo GetInfo() const override
@@ -71,7 +65,7 @@ public:
 	{
 		ZEN_ASSERT(m_OplogBuildPartId == Oid::Zero);
 
-		JupiterSession Session(m_JupiterClient->Logger(), m_JupiterClient->Client());
+		JupiterSession Session(m_JupiterClient->Logger(), m_JupiterClient->Client(), m_AllowRedirect);
 
 		IoBuffer Payload = m_MetaData;
 		Payload.SetContentType(ZenContentType::kCbObject);
@@ -95,7 +89,7 @@ public:
 	virtual SaveResult SaveContainer(const IoBuffer& Payload) override
 	{
 		ZEN_ASSERT(m_OplogBuildPartId != Oid::Zero);
-		JupiterSession	   Session(m_JupiterClient->Logger(), m_JupiterClient->Client());
+		JupiterSession	   Session(m_JupiterClient->Logger(), m_JupiterClient->Client(), m_AllowRedirect);
 		PutBuildPartResult PutResult =
 			Session.PutBuildPart(m_Namespace, m_Bucket, m_BuildId, m_OplogBuildPartId, OplogContainerPartName, Payload);
 		AddStats(PutResult);
@@ -120,7 +114,7 @@ public:
 												ChunkBlockDescription&& Block) override
 	{
 		ZEN_ASSERT(m_OplogBuildPartId != Oid::Zero);
-		JupiterSession Session(m_JupiterClient->Logger(), m_JupiterClient->Client());
+		JupiterSession Session(m_JupiterClient->Logger(), m_JupiterClient->Client(), m_AllowRedirect);
 
 		JupiterResult PutResult =
 			Session.PutBuildBlob(m_Namespace, m_Bucket, m_BuildId, RawHash, ZenContentType::kCompressedBinary, Payload);
@@ -183,7 +177,7 @@ public:
 		ZEN_UNUSED(RawHash);
 		ZEN_ASSERT(m_OplogBuildPartId != Oid::Zero);
 
-		JupiterSession			Session(m_JupiterClient->Logger(), m_JupiterClient->Client());
+		JupiterSession			Session(m_JupiterClient->Logger(), m_JupiterClient->Client(), m_AllowRedirect);
 		FinalizeBuildPartResult FinalizeRefResult =
 			Session.FinalizeBuildPart(m_Namespace, m_Bucket, m_BuildId, m_OplogBuildPartId, RawHash);
 		AddStats(FinalizeRefResult);
@@ -222,7 +216,7 @@ public:
 	{
 		ZEN_ASSERT(m_OplogBuildPartId == Oid::Zero);
 
-		JupiterSession Session(m_JupiterClient->Logger(), m_JupiterClient->Client());
+		JupiterSession Session(m_JupiterClient->Logger(), m_JupiterClient->Client(), m_AllowRedirect);
 		JupiterResult  GetBuildResult = Session.GetBuild(m_Namespace, m_Bucket, m_BuildId);
 		AddStats(GetBuildResult);
 		LoadContainerResult Result{ConvertResult(GetBuildResult)};
@@ -307,7 +301,7 @@ public:
 	virtual GetKnownBlocksResult GetKnownBlocks() override
 	{
 		ZEN_ASSERT(m_OplogBuildPartId != Oid::Zero);
-		JupiterSession Session(m_JupiterClient->Logger(), m_JupiterClient->Client());
+		JupiterSession Session(m_JupiterClient->Logger(), m_JupiterClient->Client(), m_AllowRedirect);
 		JupiterResult  FindResult = Session.FindBlocks(m_Namespace, m_Bucket, m_BuildId, (uint64_t)-1);
 		AddStats(FindResult);
 		GetKnownBlocksResult Result{ConvertResult(FindResult)};
@@ -356,7 +350,7 @@ public:
 	virtual LoadAttachmentResult LoadAttachment(const IoHash& RawHash) override
 	{
 		ZEN_ASSERT(m_OplogBuildPartId != Oid::Zero);
-		JupiterSession Session(m_JupiterClient->Logger(), m_JupiterClient->Client());
+		JupiterSession Session(m_JupiterClient->Logger(), m_JupiterClient->Client(), m_AllowRedirect);
 		JupiterResult  GetResult = Session.GetBuildBlob(m_Namespace, m_Bucket, m_BuildId, RawHash, m_TempFilePath);
 		AddStats(GetResult);
 
@@ -452,8 +446,9 @@ private:
 	IoBuffer			  m_MetaData;
 	Oid					  m_OplogBuildPartId = Oid::Zero;
 	std::filesystem::path m_TempFilePath;
-	bool				  m_EnableBlocks  = true;
-	bool				  m_UseTempBlocks = true;
+	const bool			  m_EnableBlocks  = true;
+	const bool			  m_UseTempBlocks = true;
+	const bool			  m_AllowRedirect = false;
 
 	std::atomic_uint64_t m_SentBytes		 = {};
 	std::atomic_uint64_t m_ReceivedBytes	 = {};
diff --git a/src/zenserver/projectstore/jupiterremoteprojectstore.cpp b/src/zenserver/projectstore/jupiterremoteprojectstore.cpp
index 20e6c28ac..3728babb5 100644
--- a/src/zenserver/projectstore/jupiterremoteprojectstore.cpp
+++ b/src/zenserver/projectstore/jupiterremoteprojectstore.cpp
@@ -31,15 +31,9 @@ public:
 	, m_Key(Key)
 	, m_OptionalBaseKey(OptionalBaseKey)
 	, m_TempFilePath(TempFilePath)
+	, m_EnableBlocks(!ForceDisableBlocks)
+	, m_UseTempBlocks(!ForceDisableTempBlocks)
 	{
-		if (ForceDisableBlocks)
-		{
-			m_EnableBlocks = false;
-		}
-		if (ForceDisableTempBlocks)
-		{
-			m_UseTempBlocks = false;
-		}
 	}
 
 	virtual RemoteStoreInfo GetInfo() const override
@@ -75,7 +69,7 @@ public:
 
 	virtual SaveResult SaveContainer(const IoBuffer& Payload) override
 	{
-		JupiterSession Session(m_JupiterClient->Logger(), m_JupiterClient->Client());
+		JupiterSession Session(m_JupiterClient->Logger(), m_JupiterClient->Client(), m_AllowRedirect);
 		PutRefResult   PutResult = Session.PutRef(m_Namespace, m_Bucket, m_Key, Payload, ZenContentType::kCbObject);
 		AddStats(PutResult);
 
@@ -94,7 +88,7 @@ public:
 
 	virtual SaveAttachmentResult SaveAttachment(const CompositeBuffer& Payload, const IoHash& RawHash, ChunkBlockDescription&&) override
 	{
-		JupiterSession Session(m_JupiterClient->Logger(), m_JupiterClient->Client());
+		JupiterSession Session(m_JupiterClient->Logger(), m_JupiterClient->Client(), m_AllowRedirect);
 		JupiterResult  PutResult = Session.PutCompressedBlob(m_Namespace, RawHash, Payload);
 		AddStats(PutResult);
 
@@ -127,7 +121,7 @@ public:
 
 	virtual FinalizeResult FinalizeContainer(const IoHash& RawHash) override
 	{
-		JupiterSession	  Session(m_JupiterClient->Logger(), m_JupiterClient->Client());
+		JupiterSession	  Session(m_JupiterClient->Logger(), m_JupiterClient->Client(), m_AllowRedirect);
 		FinalizeRefResult FinalizeRefResult = Session.FinalizeRef(m_Namespace, m_Bucket, m_Key, RawHash);
 		AddStats(FinalizeRefResult);
 
@@ -164,7 +158,7 @@ public:
 				{.ErrorCode = static_cast<int>(HttpResponseCode::NoContent), .ElapsedSeconds = LoadResult.ElapsedSeconds}};
 		}
 
-		JupiterSession		Session(m_JupiterClient->Logger(), m_JupiterClient->Client());
+		JupiterSession		Session(m_JupiterClient->Logger(), m_JupiterClient->Client(), m_AllowRedirect);
 		JupiterExistsResult ExistsResult =
 			Session.CompressedBlobExists(m_Namespace, std::set<IoHash>(BlockHashes.begin(), BlockHashes.end()));
 		AddStats(ExistsResult);
@@ -203,7 +197,7 @@ public:
 
 	virtual LoadAttachmentResult LoadAttachment(const IoHash& RawHash) override
 	{
-		JupiterSession Session(m_JupiterClient->Logger(), m_JupiterClient->Client());
+		JupiterSession Session(m_JupiterClient->Logger(), m_JupiterClient->Client(), m_AllowRedirect);
 		JupiterResult  GetResult = Session.GetCompressedBlob(m_Namespace, RawHash, m_TempFilePath);
 		AddStats(GetResult);
 
@@ -239,7 +233,7 @@ public:
 private:
 	LoadContainerResult LoadContainer(const IoHash& Key)
 	{
-		JupiterSession Session(m_JupiterClient->Logger(), m_JupiterClient->Client());
+		JupiterSession Session(m_JupiterClient->Logger(), m_JupiterClient->Client(), m_AllowRedirect);
 		JupiterResult  GetResult = Session.GetRef(m_Namespace, m_Bucket, Key, ZenContentType::kCbObject);
 		AddStats(GetResult);
 		if (GetResult.ErrorCode || !GetResult.Success)
@@ -329,8 +323,9 @@ private:
 	const IoHash		  m_Key;
 	const IoHash		  m_OptionalBaseKey;
 	std::filesystem::path m_TempFilePath;
-	bool				  m_EnableBlocks  = true;
-	bool				  m_UseTempBlocks = true;
+	const bool			  m_EnableBlocks  = true;
+	const bool			  m_UseTempBlocks = true;
+	const bool			  m_AllowRedirect = false;
 
 	std::atomic_uint64_t m_SentBytes		 = {};
 	std::atomic_uint64_t m_ReceivedBytes	 = {};
diff --git a/src/zenserver/upstream/upstreamcache.cpp b/src/zenserver/upstream/upstreamcache.cpp
index e438a840a..744b861dd 100644
--- a/src/zenserver/upstream/upstreamcache.cpp
+++ b/src/zenserver/upstream/upstreamcache.cpp
@@ -134,7 +134,7 @@ namespace detail {
 					return {.State = UpstreamEndpointState::kOk};
 				}
 
-				JupiterSession		Session(m_Client->Logger(), m_Client->Client());
+				JupiterSession		Session(m_Client->Logger(), m_Client->Client(), m_AllowRedirect);
 				const JupiterResult Result = Session.Authenticate();
 
 				if (Result.Success)
@@ -181,7 +181,7 @@ namespace detail {
 
 			try
 			{
-				JupiterSession Session(m_Client->Logger(), m_Client->Client());
+				JupiterSession Session(m_Client->Logger(), m_Client->Client(), m_AllowRedirect);
 				JupiterResult  Result;
 
 				std::string_view BlobStoreNamespace = GetActualBlobStoreNamespace(Namespace);
@@ -301,7 +301,7 @@ namespace detail {
 		{
 			ZEN_TRACE_CPU("Upstream::Jupiter::GetCacheRecords");
 
-			JupiterSession		   Session(m_Client->Logger(), m_Client->Client());
+			JupiterSession		   Session(m_Client->Logger(), m_Client->Client(), m_AllowRedirect);
 			GetUpstreamCacheResult Result;
 
 			for (CacheKeyRequest* Request : Requests)
@@ -365,7 +365,7 @@ namespace detail {
 
 			try
 			{
-				JupiterSession		Session(m_Client->Logger(), m_Client->Client());
+				JupiterSession		Session(m_Client->Logger(), m_Client->Client(), m_AllowRedirect);
 				std::string_view	BlobStoreNamespace = GetActualBlobStoreNamespace(Namespace);
 				const JupiterResult Result			   = Session.GetCompressedBlob(BlobStoreNamespace, ValueContentId);
 
@@ -398,7 +398,7 @@ namespace detail {
 		{
 			ZEN_TRACE_CPU("Upstream::Jupiter::GetCacheChunks");
 
-			JupiterSession		   Session(m_Client->Logger(), m_Client->Client());
+			JupiterSession		   Session(m_Client->Logger(), m_Client->Client(), m_AllowRedirect);
 			GetUpstreamCacheResult Result;
 
 			for (CacheChunkRequest* RequestPtr : CacheChunkRequests)
@@ -453,7 +453,7 @@ namespace detail {
 		{
 			ZEN_TRACE_CPU("Upstream::Jupiter::GetCacheValues");
 
-			JupiterSession		   Session(m_Client->Logger(), m_Client->Client());
+			JupiterSession		   Session(m_Client->Logger(), m_Client->Client(), m_AllowRedirect);
 			GetUpstreamCacheResult Result;
 
 			for (CacheValueRequest* RequestPtr : CacheValueRequests)
@@ -533,7 +533,7 @@ namespace detail {
 
 			try
 			{
-				JupiterSession Session(m_Client->Logger(), m_Client->Client());
+				JupiterSession Session(m_Client->Logger(), m_Client->Client(), m_AllowRedirect);
 
 				if (CacheRecord.Type == ZenContentType::kBinary)
 				{
@@ -756,6 +756,7 @@ namespace detail {
 		UpstreamStatus		  m_Status;
 		UpstreamEndpointStats m_Stats;
 		RefPtr<JupiterClient> m_Client;
+		const bool			  m_AllowRedirect = false;
 	};
 
 	class ZenUpstreamEndpoint final : public UpstreamEndpoint
diff --git a/src/zenutil/include/zenutil/jupiter/jupiterbuildstorage.h b/src/zenutil/include/zenutil/jupiter/jupiterbuildstorage.h
index 89fc70140..bbf070993 100644
--- a/src/zenutil/include/zenutil/jupiter/jupiterbuildstorage.h
+++ b/src/zenutil/include/zenutil/jupiter/jupiterbuildstorage.h
@@ -13,5 +13,6 @@ std::unique_ptr<BuildStorage> CreateJupiterBuildStorage(LoggerRef					 InLog,
 														BuildStorage::Statistics&	 Stats,
 														std::string_view			 Namespace,
 														std::string_view			 Bucket,
+														bool						 AllowRedirect,
 														const std::filesystem::path& TempFolderPath);
 }  // namespace zen
diff --git a/src/zenutil/include/zenutil/jupiter/jupitersession.h b/src/zenutil/include/zenutil/jupiter/jupitersession.h
index 32bfd50f4..b79790f25 100644
--- a/src/zenutil/include/zenutil/jupiter/jupitersession.h
+++ b/src/zenutil/include/zenutil/jupiter/jupitersession.h
@@ -65,7 +65,7 @@ struct FinalizeBuildPartResult : JupiterResult
 class JupiterSession
 {
 public:
-	JupiterSession(LoggerRef InLog, HttpClient& InHttpClient);
+	JupiterSession(LoggerRef InLog, HttpClient& InHttpClient, bool AllowRedirect);
 	~JupiterSession();
 
 	JupiterResult Authenticate();
@@ -173,6 +173,7 @@ private:
 
 	LoggerRef	m_Log;
 	HttpClient& m_HttpClient;
+	const bool	m_AllowRedirect = false;
 };
 
 }  // namespace zen
diff --git a/src/zenutil/jupiter/jupiterbuildstorage.cpp b/src/zenutil/jupiter/jupiterbuildstorage.cpp
index 6ada72e1e..53cad78da 100644
--- a/src/zenutil/jupiter/jupiterbuildstorage.cpp
+++ b/src/zenutil/jupiter/jupiterbuildstorage.cpp
@@ -25,8 +25,9 @@ public:
 						Statistics&					 Stats,
 						std::string_view			 Namespace,
 						std::string_view			 Bucket,
+						bool						 AllowRedirect,
 						const std::filesystem::path& TempFolderPath)
-	: m_Session(InLog, InHttpClient)
+	: m_Session(InLog, InHttpClient, AllowRedirect)
 	, m_Stats(Stats)
 	, m_Namespace(Namespace)
 	, m_Bucket(Bucket)
@@ -462,11 +463,12 @@ CreateJupiterBuildStorage(LoggerRef					   InLog,
 						  BuildStorage::Statistics&	   Stats,
 						  std::string_view			   Namespace,
 						  std::string_view			   Bucket,
+						  bool						   AllowRedirect,
 						  const std::filesystem::path& TempFolderPath)
 {
 	ZEN_TRACE_CPU("CreateJupiterBuildStorage");
 
-	return std::make_unique<JupiterBuildStorage>(InLog, InHttpClient, Stats, Namespace, Bucket, TempFolderPath);
+	return std::make_unique<JupiterBuildStorage>(InLog, InHttpClient, Stats, Namespace, Bucket, AllowRedirect, TempFolderPath);
 }
 
 }  // namespace zen
diff --git a/src/zenutil/jupiter/jupitersession.cpp b/src/zenutil/jupiter/jupitersession.cpp
index d3076d36b..de138f994 100644
--- a/src/zenutil/jupiter/jupitersession.cpp
+++ b/src/zenutil/jupiter/jupitersession.cpp
@@ -5,6 +5,7 @@
 #include <zencore/compactbinary.h>
 #include <zencore/compactbinarybuilder.h>
 #include <zencore/compositebuffer.h>
+#include <zencore/compress.h>
 #include <zencore/fmtutils.h>
 #include <zencore/trace.h>
 
@@ -48,7 +49,10 @@ namespace detail {
 	}
 }  // namespace detail
 
-JupiterSession::JupiterSession(LoggerRef InLog, HttpClient& InHttpClient) : m_Log(InLog), m_HttpClient(InHttpClient)
+JupiterSession::JupiterSession(LoggerRef InLog, HttpClient& InHttpClient, bool AllowRedirect)
+: m_Log(InLog)
+, m_HttpClient(InHttpClient)
+, m_AllowRedirect(AllowRedirect)
 {
 }
 
@@ -542,12 +546,14 @@ JupiterSession::PutMultipartBuildBlob(std::string_view												  Namespace,
 									  bool& OutIsComplete) -> JupiterResult {
 			const MultipartUploadResponse::Part& Part		 = Workload->PartDescription.Parts[PartIndex];
 			IoBuffer							 PartPayload = Workload->Transmitter(Part.FirstByte, Part.LastByte - Part.FirstByte);
-			std::string MultipartUploadResponseRequestString = fmt::format("/api/v2/builds/{}/{}/{}/blobs/{}/uploadMultipart{}",
-																		   Namespace,
-																		   BucketId,
-																		   BuildId,
-																		   Hash.ToHexString(),
-																		   Part.QueryString);
+			std::string							 MultipartUploadResponseRequestString =
+				fmt::format("/api/v2/builds/{}/{}/{}/blobs/{}/uploadMultipart{}&supportsRedirect={}",
+							Namespace,
+							BucketId,
+							BuildId,
+							Hash.ToHexString(),
+							Part.QueryString,
+							m_AllowRedirect ? "true"sv : "false"sv);
 			// ZEN_INFO("PUT: {}", MultipartUploadResponseRequestString);
 			HttpClient::Response MultipartUploadResponse = m_HttpClient.Put(MultipartUploadResponseRequestString, PartPayload);
 			if (!MultipartUploadResponse.IsSuccess())
@@ -605,12 +611,13 @@ JupiterSession::PutMultipartBuildBlob(std::string_view												  Namespace,
 								IoBuffer							 RetryPartPayload =
 									Workload->Transmitter(RetryPart.FirstByte, RetryPart.LastByte - RetryPart.FirstByte - 1);
 								std::string RetryMultipartUploadResponseRequestString =
-									fmt::format("/api/v2/builds/{}/{}/{}/blobs/{}/uploadMultipart{}",
+									fmt::format("/api/v2/builds/{}/{}/{}/blobs/{}/uploadMultipart{}&supportsRedirect={}",
 												Namespace,
 												BucketId,
 												BuildId,
 												Hash.ToHexString(),
-												RetryPart.QueryString);
+												RetryPart.QueryString,
+												m_AllowRedirect ? "true"sv : "false"sv);
 
 								MultipartUploadResponse = m_HttpClient.Put(RetryMultipartUploadResponseRequestString, RetryPartPayload);
 								TotalUploadedBytes		= MultipartUploadResponse.UploadedBytes;
@@ -650,7 +657,12 @@ JupiterSession::GetMultipartBuildBlob(std::string_view												Namespace,
 									  std::function<void()>&&										OnComplete,
 									  std::vector<std::function<JupiterResult()>>&					OutWorkItems)
 {
-	std::string			 RequestUrl = fmt::format("/api/v2/builds/{}/{}/{}/blobs/{}", Namespace, BucketId, BuildId, Hash.ToHexString());
+	std::string			 RequestUrl = fmt::format("/api/v2/builds/{}/{}/{}/blobs/{}?supportsRedirect={}",
+										  Namespace,
+										  BucketId,
+										  BuildId,
+										  Hash.ToHexString(),
+										  m_AllowRedirect ? "true"sv : "false"sv);
 	HttpClient::Response Response =
 		m_HttpClient.Get(RequestUrl, HttpClient::KeyValueMap({{"Range", fmt::format("bytes={}-{}", 0, ChunkSize - 1)}}));
 	if (Response.IsSuccess())
@@ -687,11 +699,15 @@ JupiterSession::GetMultipartBuildBlob(std::string_view												Namespace,
 							uint64_t PartSize = Min(ChunkSize, TotalSize - Offset);
 							OutWorkItems.emplace_back(
 								[this, Namespace, BucketId, BuildId, Hash, TotalSize, Workload, Offset, PartSize]() -> JupiterResult {
-									std::string RequestUrl =
-										fmt::format("/api/v2/builds/{}/{}/{}/blobs/{}", Namespace, BucketId, BuildId, Hash.ToHexString());
-									HttpClient::Response Response = m_HttpClient.Get(
-										RequestUrl,
-										HttpClient::KeyValueMap({{"Range", fmt::format("bytes={}-{}", Offset, Offset + PartSize - 1)}}));
+									std::string			 RequestUrl = fmt::format("/api/v2/builds/{}/{}/{}/blobs/{}?supportsRedirect={}",
+																		  Namespace,
+																		  BucketId,
+																		  BuildId,
+																		  Hash.ToHexString(),
+																		  m_AllowRedirect ? "true"sv : "false"sv);
+									HttpClient::Response Response	= m_HttpClient.Get(
+										  RequestUrl,
+										  HttpClient::KeyValueMap({{"Range", fmt::format("bytes={}-{}", Offset, Offset + PartSize - 1)}}));
 									if (Response.IsSuccess())
 									{
 										Workload->OnReceive(Offset, Response.ResponsePayload);
@@ -734,11 +750,28 @@ JupiterSession::GetBuildBlob(std::string_view	   Namespace,
 	{
 		Headers.Entries.insert({"Range", fmt::format("bytes={}-{}", Offset, Offset + Size - 1)});
 	}
-	HttpClient::Response Response =
-		m_HttpClient.Download(fmt::format("/api/v2/builds/{}/{}/{}/blobs/{}", Namespace, BucketId, BuildId, Hash.ToHexString()),
-							  TempFolderPath,
-							  Headers);
-
+	HttpClient::Response Response = m_HttpClient.Download(fmt::format("/api/v2/builds/{}/{}/{}/blobs/{}?supportsRedirect={}",
+																	  Namespace,
+																	  BucketId,
+																	  BuildId,
+																	  Hash.ToHexString(),
+																	  m_AllowRedirect ? "true"sv : "false"sv),
+														  TempFolderPath,
+														  Headers);
+	if (Response.IsSuccess())
+	{
+		// If we get a redirect to S3 or a non-Jupiter endpoint the content type will not be correct, validate it and set it
+		if (m_AllowRedirect && (Response.ResponsePayload.GetContentType() == HttpContentType::kBinary))
+		{
+			IoHash	 ValidateRawHash;
+			uint64_t ValidateRawSize = 0;
+			ZEN_ASSERT_SLOW(CompressedBuffer::ValidateCompressedHeader(Response.ResponsePayload, ValidateRawHash, ValidateRawSize));
+			ZEN_ASSERT_SLOW(ValidateRawHash == Hash);
+			ZEN_ASSERT_SLOW(ValidateRawSize > 0);
+			ZEN_UNUSED(ValidateRawHash, ValidateRawSize);
+			Response.ResponsePayload.SetContentType(ZenContentType::kCompressedBinary);
+		}
+	}
 	return detail::ConvertResponse(Response, "JupiterSession::GetBuildBlob"sv);
 }