Skip to content

Fallback if system time incorrect during migration #95

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
merged 1 commit into from
Nov 7, 2024
Merged

Fallback if system time incorrect during migration #95

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 10 additions & 3 deletions Thirdweb/Thirdweb.Wallets/InAppWallet/EmbeddedWallet.Authentication/AWS.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ private static async Task<AwsCredentials> GetTemporaryCredentialsAsync(string id
};
}

private static async Task<JToken> GenerateDataKey(AwsCredentials credentials, IThirdwebHttpClient httpClient)
private static async Task<JToken> GenerateDataKey(AwsCredentials credentials, IThirdwebHttpClient httpClient, DateTime? dateOverride = null)
{
var client = Utils.ReconstructHttpClient(httpClient);
var endpoint = $"https://kms.{AWS_REGION}.amazonaws.com/";
Expand All @@ -64,9 +64,10 @@ private static async Task<JToken> GenerateDataKey(AwsCredentials credentials, IT

client.AddHeader("X-Amz-Target", "TrentService.GenerateDataKey");

var dateTimeNow = DateTime.UtcNow;
var dateTimeNow = dateOverride ?? DateTime.UtcNow;
var dateStamp = dateTimeNow.ToString("yyyyMMdd");
var amzDate = dateTimeNow.ToString("yyyyMMddTHHmmssZ");
var amzDateFormat = "yyyyMMddTHHmmssZ";
var amzDate = dateTimeNow.ToString(amzDateFormat);
var canonicalUri = "/";

var canonicalHeaders = $"host:kms.{AWS_REGION}.amazonaws.com\nx-amz-date:{amzDate}\n";
Expand Down Expand Up @@ -104,6 +105,12 @@ private static async Task<JToken> GenerateDataKey(AwsCredentials credentials, IT

if (!response.IsSuccessStatusCode)
{
if (dateOverride == null && responseContent.Contains("InvalidSignatureException"))
{
var parsedTime = responseContent.Substring(responseContent.LastIndexOf('(') + 1, amzDate.Length);
return await GenerateDataKey(credentials, httpClient, DateTime.ParseExact(parsedTime, amzDateFormat, System.Globalization.CultureInfo.InvariantCulture).ToUniversalTime())
.ConfigureAwait(false);
}
throw new Exception($"Failed to generate data key: {responseContent}");
}

Expand Down
Loading