From 50ebd99241b5ca599ec0caa33cd42bedcfafe2c9 Mon Sep 17 00:00:00 2001 From: KRI Date: Tue, 24 Mar 2020 08:10:49 +0100 Subject: [PATCH] RDEV-1648 update for curlHandler method. --- SSH/PAM/src/coreHandler.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/SSH/PAM/src/coreHandler.c b/SSH/PAM/src/coreHandler.c index 6000fd0..088419a 100644 --- a/SSH/PAM/src/coreHandler.c +++ b/SSH/PAM/src/coreHandler.c @@ -230,7 +230,7 @@ char *curlHandler(pam_handle_t *pamh, char *jsonObj, char *url, char *secretKey) responseXRublon = curlResponseSignatureParser(pamh, size, chunks.memory); if(!verifyData(pamh, curlResponse, secretKey, responseXRublon)) { pam_prompt(pamh, PAM_TEXT_INFO, NULL, "Invalid Signature!"); - return NULL; + return curlResponse; } curl_easy_cleanup(curl); if(chunks.memory) @@ -307,6 +307,11 @@ int postInit(pam_handle_t *pamh, cJSON **availableMethods, struct ApplicationInf info->companyName = parseNestedJson(curlResponse, "result","companyName"); info->applicationName = parseNestedJson(curlResponse, "result", "applicationName"); + if(strcmp(status,"ERROR") == 0) { + if(transactionErrorException(pamh,curlResponse)) + return STATUS_DENIED; + } + if(gdprAccepted != 1 || tosAccepted != 1) { pam_prompt(pamh, PAM_TEXT_INFO, NULL, "\nYou have to read and accept our:\n- Terms of Use: https://core.rublon.net/terms_of_use\n- Privacy Policy: https://core.rublon.net/privacy_policy\n"); do{ @@ -317,10 +322,6 @@ int postInit(pam_handle_t *pamh, cJSON **availableMethods, struct ApplicationInf return STATUS_WAITING; } - if(strcmp(status,"ERROR") == 0) { - if(transactionErrorException(pamh,curlResponse)) - return STATUS_DENIED; - } if(transactionStatus == NULL || transactionId == NULL) { pam_prompt(pamh, PAM_TEXT_INFO, NULL, "\nRublon Transaction Error!"); return STATUS_BYPASS;