Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Signing with InvariantCulture, so different calendars produce good ou... #63

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.

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
bcuff merged 1 commit into bcuff:master from janireu:master
Jan 29, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
View file Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
using System;
using System.Diagnostics;
using System.Globalization;
using System.Text;
using System.Threading;
using Amazon.Runtime;
using Elasticsearch.Net.Aws;
using NUnit.Framework;
Expand Down Expand Up @@ -101,6 +103,31 @@ public void SignRequest_should_apply_signature_to_request()
Trace.WriteLine("Token: " + token);
}

[Test]
public void SignRequest_should_apply_signature_to_request_right_culture()
{
Thread.CurrentThread.CurrentCulture = new CultureInfo("th");

var creds = new SessionAWSCredentials("ExampleKey", "wJalrXUtnFEMI/K7MDENG+bPxRfiCYEXAMPLEKEY", "token1")
.GetCredentials();
SignV4Util.SignRequest(_sampleRequest, _sampleBody, creds, "us-east-1", "iam");

var amzDateValue = _sampleRequest.Headers.XAmzDate;
Assert.False(String.IsNullOrEmpty(amzDateValue));
var amzDates = amzDateValue.Split(',');
Assert.AreEqual(2, amzDates.Length);
Assert.True(amzDates[1].StartsWith(DateTime.UtcNow.Year.ToString()));
Trace.WriteLine("X-Amz-Date: " + amzDateValue);

var auth = _sampleRequest.Headers.Authorization;
Assert.False(String.IsNullOrEmpty(auth));
Trace.WriteLine("Authorize: " + auth);

var token = _sampleRequest.Headers.XAmzSecurityToken;
Assert.False(String.IsNullOrEmpty(token));
Trace.WriteLine("Token: " + token);
}

[Test]
public void GetCanonicalQueryString_should_match_sample()
{
Expand Down
5 changes: 3 additions & 2 deletions src/Elasticsearch.Net.Aws/Elasticsearch.Net.Aws/SignV4Util.cs
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System.Collections.Generic;
using System.Collections.Specialized;
using System.Diagnostics;
using System.Globalization;
using System.Linq;
using System.Security.Cryptography;
using System.Text;
Expand All @@ -18,8 +19,8 @@ internal static class SignV4Util
public static void SignRequest(IRequest request, byte[] body, ImmutableCredentials credentials, string region, string service)
{
var date = DateTime.UtcNow;
var dateStamp = date.ToString("yyyyMMdd");
var amzDate = date.ToString("yyyyMMddTHHmmssZ");
var dateStamp = date.ToString("yyyyMMdd", CultureInfo.InvariantCulture);
var amzDate = date.ToString("yyyyMMddTHHmmssZ", CultureInfo.InvariantCulture);
request.Headers.XAmzDate = amzDate;

var signingKey = GetSigningKey(credentials.SecretKey, dateStamp, region, service);
Expand Down

AltStyle によって変換されたページ (->オリジナル) /