Skip to content

Fix issue where any retry will fail to AppConfig service. #8184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
annelo-msft merged 2 commits into from
Oct 17, 2019
Merged

Fix issue where any retry will fail to AppConfig service. #8184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f3e34c
fix-issue-8171
annelo-msft Oct 17, 2019
2e60c05
Adding tests.
annelo-msft Oct 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions sdk/appconfiguration/Azure.Data.AppConfiguration/src/AuthenticationPolicy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,9 @@ private async ValueTask ProcessAsync(HttpMessage message, bool async)
var signature = Convert.ToBase64String(hmac.ComputeHash(Encoding.ASCII.GetBytes(stringToSign))); // Calculate the signature
string signedHeaders = "date;host;x-ms-content-sha256"; // Semicolon separated header names

// TODO (pri 3): should date header writing be moved out from here?
message.Request.Headers.Add("Date", utcNowString);
message.Request.Headers.Add("x-ms-content-sha256", contentHash);
message.Request.Headers.Add("Authorization", $"HMAC-SHA256 Credential={_credential}&SignedHeaders={signedHeaders}&Signature={signature}");
message.Request.Headers.SetValue("Date", utcNowString);
message.Request.Headers.SetValue("x-ms-content-sha256", contentHash);
message.Request.Headers.SetValue("Authorization", $"HMAC-SHA256 Credential={_credential}&SignedHeaders={signedHeaders}&Signature={signature}");
}
}

Expand Down
24 changes: 24 additions & 0 deletions sdk/appconfiguration/Azure.Data.AppConfiguration/tests/ConfigurationMockTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Text;
using System.Text.Json;
using System.Text.RegularExpressions;
Expand Down Expand Up @@ -820,6 +821,29 @@ public async Task CustomHeadersAreAdded()
Assert.IsFalse(request.Headers.TryGetValue("x-ms-random-id", out string randomId));
}

[Test]
public async Task AuthorizationHeadersAddedOnceWithRetries()
{
var response = new MockResponse(200);
response.SetContent(SerializationHelpers.Serialize(s_testSetting, SerializeSetting));

var mockTransport = new MockTransport(new MockResponse(503), response);
ConfigurationClient service = CreateTestService(mockTransport);

ConfigurationSetting setting = await service.GetAsync(s_testSetting.Key, s_testSetting.Label);

var retriedRequest = mockTransport.Requests[1];

AssertRequestCommon(retriedRequest);
Assert.True(retriedRequest.Headers.TryGetValues("Date", out var dateHeaders));
Assert.True(retriedRequest.Headers.TryGetValues("x-ms-content-sha256", out var contentHashHeaders));
Assert.True(retriedRequest.Headers.TryGetValues("Authorization", out var authorizationHeaders));
Assert.AreEqual(1, dateHeaders.Count());
Assert.AreEqual(1, contentHashHeaders.Count());
Assert.AreEqual(1, authorizationHeaders.Count());
}


private void AssertContent(byte[] expected, MockRequest request, bool compareAsString = true)
{
using (var stream = new MemoryStream())
Expand Down