Skip to content
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

Rename parameters in HMAC validation IsValidWebhook() for Balance Platform #1056

Merged
merged 6 commits into from
Sep 9, 2024
Merged

Rename parameters in HMAC validation IsValidWebhook() for Balance Platform #1056

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5b5f70b
adjusted parameters in HMACValidator.cs and UtilTest.cs
DjoykeAbyah Sep 3, 2024
308d0e2
adjusted parameters in HMACValidator.cs and UtilTest.cs
DjoykeAbyah Sep 3, 2024
92bc77e
renamed singKey to signature in TestBalancePlatformHmac
DjoykeAbyah Sep 3, 2024
f1da77d
deprecated IsValidWebhook, introduces isValidPlatformWebhook
DjoykeAbyah Sep 9, 2024
b2acb1c
fix IsValidWebhook
DjoykeAbyah Sep 9, 2024
52c7570
fix IsValidWebhook
DjoykeAbyah Sep 9, 2024
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
12 changes: 6 additions & 6 deletions Adyen.Test/UtilTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@ public void TestHmac()
var data = "countryCode:currencyCode:merchantAccount:merchantReference:paymentAmount:sessionValidity:skinCode:NL:EUR:MagentoMerchantTest2:TEST-PAYMENT-2017-02-01-14\\:02\\:05:199:2017-02-02T14\\:02\\:05+01\\:00:PKz2KML1";
var key = "DFB1EB5485895CFA84146406857104ABB4CBCABDC8AAF103A624C8F6A3EAAB00";
var hmacValidator = new HmacValidator();
var ecnrypted = hmacValidator.CalculateHmac(data, key);
Assert.IsTrue(string.Equals(ecnrypted, "34oR8T1whkQWTv9P+SzKyp8zhusf9n0dpqrm9nsqSJs="));
var encrypted = hmacValidator.CalculateHmac(data, key);
DjoykeAbyah marked this conversation as resolved.
Show resolved Hide resolved
Assert.IsTrue(string.Equals(encrypted, "34oR8T1whkQWTv9P+SzKyp8zhusf9n0dpqrm9nsqSJs="));
}

[TestMethod]
public void TestBalancePlatformHmac()
{
var notification =
"{\"data\":{\"balancePlatform\":\"Integration_tools_test\",\"accountId\":\"BA32272223222H5HVKTBK4MLB\",\"sweep\":{\"id\":\"SWPC42272223222H5HVKV6H8C64DP5\",\"schedule\":{\"type\":\"balance\"},\"status\":\"active\",\"targetAmount\":{\"currency\":\"EUR\",\"value\":0},\"triggerAmount\":{\"currency\":\"EUR\",\"value\":0},\"type\":\"pull\",\"counterparty\":{\"balanceAccountId\":\"BA3227C223222H5HVKT3H9WLC\"},\"currency\":\"EUR\"}},\"environment\":\"test\",\"type\":\"balancePlatform.balanceAccountSweep.updated\"}";
var signKey = "D7DD5BA6146493707BF0BE7496F6404EC7A63616B7158EC927B9F54BB436765F";
var hmacKey = "9Qz9S/0xpar1klkniKdshxpAhRKbiSAewPpWoxKefQA=";
var hmacKey = "D7DD5BA6146493707BF0BE7496F6404EC7A63616B7158EC927B9F54BB436765F";
var signature = "9Qz9S/0xpar1klkniKdshxpAhRKbiSAewPpWoxKefQA=";
var hmacValidator = new HmacValidator();
bool response = hmacValidator.IsValidWebhook(hmacKey, signKey, notification);
bool response = hmacValidator.IsValidWebhook(signature, hmacKey, notification);
Kwok-he-Chu marked this conversation as resolved.
Show resolved Hide resolved
Assert.IsTrue(response);
}

Expand Down
6 changes: 3 additions & 3 deletions Adyen/Util/HMACValidator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,10 @@ public bool IsValidHmac(NotificationRequestItem notificationRequestItem, string
/// <param name="hmacSignature">The HMAC signature, retrieved from the request header.</param>
/// <param name="payload">The webhook payload.</param>
/// <returns>A return value indicates the HMAC validation succeeded.</returns>
public bool IsValidWebhook(string hmacKey, string hmacSignature, string payload)
public bool IsValidWebhook(string hmacSignature, string hmacKey, string payload)
{
var calculatedSign = CalculateHmac(payload, hmacSignature);
return TimeSafeEquals(Encoding.UTF8.GetBytes(hmacKey), Encoding.UTF8.GetBytes(calculatedSign));
var calculatedSign = CalculateHmac(payload, hmacKey);
return TimeSafeEquals(Encoding.UTF8.GetBytes(hmacSignature), Encoding.UTF8.GetBytes(calculatedSign));
}

/// This method compares two bytestrings in constant time based on length of shortest bytestring to prevent timing attacks.
Expand Down
Loading