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

Return error response for failed HMAC validation #77

Merged
merged 1 commit into from
Jan 10, 2025
Merged

Return error response for failed HMAC validation #77

Show file tree
Hide file tree
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
11 changes: 9 additions & 2 deletions force-app/main/default/classes/AdyenNotificationHandler.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ public with sharing class AdyenNotificationHandler {
try {
validator = new HMACValidator(notificationRequestItem, adyenAdapter.HMAC_Key__c);
if (!Test.isRunningTest() && !validator.validateHMAC()) {
return createAcceptedNotificationResponse('not a valid notification request');
return createErrorResponse(AdyenOMSConstants.INVALID_NOTIFICATION, 403);
}
} catch (HMACValidator.HmacValidationException hmacValidationException) {
return createAcceptedNotificationResponse(hmacValidationException.getMessage());
return createErrorResponse(hmacValidationException.getMessage(), 403);
}

if (!AdyenPaymentUtility.isValidNotification(notificationRequestItem)) {
Expand All @@ -41,6 +41,13 @@ public with sharing class AdyenNotificationHandler {
return gatewayNotificationResponse;
}

private static CommercePayments.GatewayNotificationResponse createErrorResponse(String message, Integer statusCode) {
CommercePayments.GatewayNotificationResponse gatewayNotificationResponse = new CommercePayments.GatewayNotificationResponse();
gatewayNotificationResponse.setResponseBody(Blob.valueOf(message));
gatewayNotificationResponse.setStatusCode(statusCode);
return gatewayNotificationResponse;
}

/**
* Creates and records (ie saves) the notification save result.
*
Expand Down
1 change: 1 addition & 0 deletions force-app/main/default/classes/AdyenOMSConstants.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@ public with sharing class AdyenOMSConstants {
public static final String PBL_ID_KEY = 'pblId';
public static final String GATEWAY_RESULT_SUCCESS = 'success';
public static final String GATEWAY_RESULT_SUCCESS_DESCRIPTION = 'Transaction Normal';
public static final String INVALID_NOTIFICATION = 'Not a valid notification request';
}
10 changes: 7 additions & 3 deletions force-app/main/default/classes/NonPaymentWebhookHandler.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@RestResource(UrlMapping='/nonPaymentWebhook/v1/*')
global without sharing class NonPaymentWebhookHandler {
public static final String ACCEPTED_RESPONSE = '[accepted]';
public static final String INVALID_NOTIFICATION = 'but not a valid notification request';
public static final String INVALID_WEBHOOK = 'but no valid psp reference found or webhook type was ignored';
public static final String NO_PAYMENT_FOUND = 'but no related payment record found';
public static final String EXCEPTION_OCCURRED = 'but an exception happened: ';
Expand All @@ -13,7 +12,7 @@ global without sharing class NonPaymentWebhookHandler {
NotificationRequestItem notificationRequestItem = WebhookUtils.parseAdyenNotificationRequest(requestBody);
Adyen_Adapter__mdt adyenAdapter = AdyenPaymentUtility.retrieveAdapterByMerchantAcct(notificationRequestItem.merchantAccountCode);
if (!isValidRequest(notificationRequestItem, adyenAdapter)) {
return responseWithReason(INVALID_NOTIFICATION);
return createErrorResponse(AdyenOMSConstants.INVALID_NOTIFICATION, 403);
}
if (!AdyenPaymentUtility.isValidNonPaymentWebhook(notificationRequestItem)) {
return responseWithReason(INVALID_WEBHOOK);
Expand All @@ -28,7 +27,7 @@ global without sharing class NonPaymentWebhookHandler {
}
return ACCEPTED_RESPONSE;
} catch (HMACValidator.HmacValidationException ex) {
return responseWithReason(INVALID_NOTIFICATION);
return createErrorResponse(ex.getMessage(), 403);
} catch (Exception ex) {
return responseWithReason(EXCEPTION_OCCURRED + ex.getMessage());
}
Expand All @@ -43,6 +42,11 @@ global without sharing class NonPaymentWebhookHandler {
private static String responseWithReason(String reason) {
return ACCEPTED_RESPONSE + ', ' + reason;
}

private static String createErrorResponse(String reason, Integer statusCode) {
RestContext.response.statusCode = statusCode;
return reason;
}

private static void createGatewayLog(PaymentAuthorization paymentAuthorization, NotificationRequestItem notificationRequestItem, String requestBody) {
String interactionStatus = notificationRequestItem.success == 'true' ? AdyenOMSConstants.PaymentGatewayLogStatus.SUCCESS.name() : AdyenOMSConstants.PaymentGatewayLogStatus.FAILED.name();
Expand Down
Loading