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.

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

Swap HMAC Validation method parameters #1185

Merged
merged 15 commits into from
Jan 31, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
5 changes: 3 additions & 2 deletions src/main/java/com/adyen/util/HMACValidator.java
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,9 @@ public String calculateHMAC(NotificationRequestItem notificationRequestItem, Str
return calculateHMAC(getDataToSign(notificationRequestItem), key);
}

// Calculate HMAC for BankingWebhooks and ManagementWebhooks (Generic webhooks)
public boolean validateHMAC(String hmacKey, String hmacSignature, String payload) throws SignatureException {
//Calculate HMAC for BankingWebhooks and ManagementWebhooks (Generic webhooks)
//First parameter is hmacSignature which is get from webhook and the second hmackey which is configured
public boolean validateHMAC(String hmacSignature, String hmacKey, String payload) throws SignatureException {
String calculatedSign = calculateHMAC(payload, hmacSignature);
AlexandrosMor marked this conversation as resolved.
Show resolved Hide resolved
final byte [] expectedSign = calculatedSign.getBytes(StandardCharsets.UTF_8);
final byte[] merchantSign = hmacKey.getBytes(StandardCharsets.UTF_8);
AlexandrosMor marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/adyen/WebhookTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ public void testBankingWebhookHmacValidator() throws SignatureException {
String signKey = "D7DD5BA6146493707BF0BE7496F6404EC7A63616B7158EC927B9F54BB436765F";
String hmacKey = "9Qz9S/0xpar1klkniKdshxpAhRKbiSAewPpWoxKefQA=";
HMACValidator hmacValidator = new HMACValidator();
boolean response = hmacValidator.validateHMAC(hmacKey, signKey, notification);
boolean response = hmacValidator.validateHMAC(signKey,hmacKey,notification);
Assert.assertTrue(response);
}

Expand Down
Loading