Merge pull request #17 from GRAPHISOFT/gs-lfs-password-auth

Fix password based authentication for LFS

Author: GS-mcsapo

p4-fusion/lfs/communication/lfscomm.cc

@@ -369,7 +369,7 @@ BatchResponse PerformBatchUploadRequest(const std::string& serverUrl, const Cred
 	return result;
 }
 
-Communicator::UploadResult PerformUpload(const std::string& uploadUrl, const std::vector<char>& fileContents, const std::map<std::string, std::string>& actionHeaders)
+Communicator::UploadResult PerformUpload(const std::string& uploadUrl, const std::vector<char>& fileContents, const std::map<std::string, std::string>& actionHeaders, const Credentials& auth = Credentials())
 {
 	// Initialize curl
 	CURLHandle curl;
@@ -390,11 +390,13 @@ Communicator::UploadResult PerformUpload(const std::string& uploadUrl, const std
 		uploadHeaders = curl_slist_append(uploadHeaders, "Accept: application/vnd.git-lfs");
 	}
 
+	const Credentials& authToUse = (actionHeaders.find("Authorization") == actionHeaders.end()) ? auth : Credentials();
+
 	// Add action-specific headers from the batch response
 	uploadHeaders = CreateHeadersFromMap(actionHeaders, uploadHeaders);
 
 	RequestResult uploadResult = {};
-	SetupRequest(curl.get(), uploadUrl, fileContents.data(), fileContents.size(), uploadHeaders, &uploadResult);
+	SetupRequest(curl.get(), uploadUrl, fileContents.data(), fileContents.size(), uploadHeaders, &uploadResult, authToUse);
 	curl_easy_setopt(curl.get(), CURLOPT_CUSTOMREQUEST, "PUT");
 
 	uploadResult = PerformRequestWithRetry([&]() -> RequestResult
@@ -436,7 +438,7 @@ std::string CreateVerifyPayload(const std::string& oid, size_t fileSize)
 	return verifyBuffer.GetString();
 }
 
-bool PerformVerify(const std::string& verifyUrl, const std::string& oid, size_t fileSize, const std::map<std::string, std::string>& actionHeaders)
+bool PerformVerify(const std::string& verifyUrl, const std::string& oid, size_t fileSize, const std::map<std::string, std::string>& actionHeaders, const Credentials& auth = Credentials())
 {
 	CURLHandle curl;
 	if (!curl)
@@ -451,10 +453,10 @@ bool PerformVerify(const std::string& verifyUrl, const std::string& oid, size_t
 	// Add action-specific headers from the batch response
 	verifyHeaders = CreateHeadersFromMap(actionHeaders, verifyHeaders);
 
-	// Perform request without authentication (headers from action should contain auth)
-	RequestResult verifyResult = {};
-	SetupRequest(curl.get(), verifyUrl, verifyPayload.data(), verifyPayload.size(), verifyHeaders, &verifyResult);
+	const Credentials& authToUse = (actionHeaders.find("Authorization") == actionHeaders.end()) ? auth : Credentials();
 
+	RequestResult verifyResult = {};
+	SetupRequest(curl.get(), verifyUrl, verifyPayload.data(), verifyPayload.size(), verifyHeaders, &verifyResult, authToUse);
 	verifyResult = PerformRequestWithRetry([&]() -> RequestResult
 	    {
 		    verifyResult.curl_result = curl_easy_perform(curl.get());
@@ -492,15 +494,15 @@ Communicator::UploadResult LFSComm::UploadFile(const std::vector<char>& fileCont
 		return UploadResult::AlreadyExists;
 	}
 
-	auto uploadResult = PerformUpload(batchResponse.uploadUrl, fileContents, batchResponse.uploadHeaders);
+	auto uploadResult = PerformUpload(batchResponse.uploadUrl, fileContents, batchResponse.uploadHeaders, m_Creds);
 	if (uploadResult != UploadResult::Uploaded)
 	{
 		return uploadResult;
 	}
 
 	if (!batchResponse.verifyUrl.empty())
 	{
-		if (!PerformVerify(batchResponse.verifyUrl, oid, fileContents.size(), batchResponse.verifyHeaders))
+		if (!PerformVerify(batchResponse.verifyUrl, oid, fileContents.size(), batchResponse.verifyHeaders, m_Creds))
 		{
 			return UploadResult::Error;
 		}