diff --git a/debian/changelog b/debian/changelog index 59a72583..da831805 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (22.48.8) stable; urgency=low +hedera-web (22.48.9) stable; urgency=low * Initial Release. diff --git a/debian/cron.d b/debian/cron.d index 1037bb2c..846174c7 100755 --- a/debian/cron.d +++ b/debian/cron.d @@ -1,6 +1,5 @@ MAILTO=webmaster */1 * * * * root hedera-web.php -m misc/mail -*/4 * * * * root hedera-web.php -m tpv/confirm-mail */2 * * * * root hedera-web.php -m edi/load 0 23 * * * root hedera-web.php -m edi/clean 0 5 * * * root hedera-web.php -m edi/update diff --git a/js/hedera/tpv.js b/js/hedera/tpv.js index dc759476..6deacca8 100644 --- a/js/hedera/tpv.js +++ b/js/hedera/tpv.js @@ -9,11 +9,10 @@ module.exports = new Class({ this.tpvStatus = this.hash.$.tpvStatus; if (this.tpvStatus) { - const query = 'CALL myTpvTransaction_end(#transaction, #status)'; - this.conn.execQuery(query, { - transaction: this.tpvOrder, + this.conn.post('TpvTransactions/end', { + orderId: this.tpvOrder, status: this.tpvStatus - }); + }) } return this.tpvStatus; @@ -29,11 +28,11 @@ module.exports = new Class({ return; } - const json = await this.conn.send('tpv/transaction', { - amount: parseInt(amount) - ,urlOk: this._makeUrl('ok') - ,urlKo: this._makeUrl('ko') - ,company + const json = await this.conn.post('TpvTransactions/start', { + amount: parseInt(amount), + urlOk: this._makeUrl('ok'), + urlKo: this._makeUrl('ko'), + company }); const postValues = json.postValues; diff --git a/package.json b/package.json index 2ba47960..a1bdf7e1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "22.48.8", + "version": "22.48.9", "description": "Verdnatura web page", "license": "GPL-3.0", "repository": { diff --git a/rest/tpv/confirm-mail.php b/rest/tpv/confirm-mail.php deleted file mode 100644 index 719bfed1..00000000 --- a/rest/tpv/confirm-mail.php +++ /dev/null @@ -1,98 +0,0 @@ -getObject( - 'SELECT host, user, pass, cleanPeriod, successFolder, errorFolder - FROM tpvImapConfig' - ); - - $mailbox = sprintf('{%s/imap/ssl/novalidate-cert}', - $imapConf->host); - - $imap = imap_open($mailbox - ,$imapConf->user - ,base64_decode($imapConf->pass) - ); - - if (!$imap) - throw new Exception(imap_last_error()); - - // Fetchs and confirms new transaction mails - - $count = 0; - $inbox = imap_search($imap, 'ALL'); - - if ($inbox) - foreach ($inbox as $msg) { - // Decodes the mail body - - $params = []; - $body = imap_fetchbody($imap, $msg, '1'); - $strings = explode(';', $body); - - foreach ($strings as $string) { - $x = explode(':', $string); - $params[trim($x[0])] = trim($x[1]); - } - - // Confirms the transaction - - $success = FALSE; - - try { - $success = Tpv::confirm($db, $params); - } catch (\Exception $e) { - trigger_error($e->getMessage(), E_USER_WARNING); - } - - // Moves the processed mail to another folder - - if ($success) - $folder = $imapConf->successFolder; - else - $folder = $imapConf->errorFolder; - - if (!imap_mail_move($imap, $msg, "$folder")) - trigger_error(imap_last_error(), E_USER_WARNING); - - $count++; - } - - imap_expunge($imap); - - // Cleans the old mails - - $deleted = 0; - - if (rand(1, 20) == 1) { - $folders = array( - $imapConf->successFolder - ,$imapConf->errorFolder - ); - - $date = new \DateTime(NULL); - $date->sub(new \DateInterval($imapConf->cleanPeriod)); - $filter = sprintf('BEFORE "%s"', $date->format('D, j M Y')); - - foreach ($folders as $folder) - if (imap_reopen($imap, $mailbox.$folder)) - if ($messages = imap_search($imap, $filter)) { - foreach ($messages as $message) - imap_delete($imap, $message); - - imap_expunge($imap); - $deleted += count($messages); - } - } - - echo "$count mails processed, $deleted mails deleted.\n"; - } -} - diff --git a/rest/tpv/confirm-post.php b/rest/tpv/confirm-post.php deleted file mode 100644 index 20d3cb79..00000000 --- a/rest/tpv/confirm-post.php +++ /dev/null @@ -1,13 +0,0 @@ -addFunction('procesaNotificacionSIS'); - $server->handle(); - } -} - -function procesaNotificacionSIS($XML) { - global $tpvConfirmSoap; - - $db = $tpvConfirmSoap->app->getSysConn(); - - $status = 'OK'; - $requestString = $XML; - - // Processes the request - - try { - $xml = new SimpleXMLElement($requestString); - $params =(array) $xml->{'Request'}; - - if (!(isset($params['Ds_Amount']) - && isset($params['Ds_Order']) - && isset($params['Ds_MerchantCode']) - && isset($params['Ds_Currency']) - && isset($params['Ds_Response']))) - throw new Exception('Missing required parameters'); - - // Checks the signature - - $start = strpos($requestString, ''); - $shaString = substr($requestString, $start, $end - $start + 10); - - $key = $db->getValue( - 'SELECT secretKey FROM tpvMerchant WHERE id = #' - ,[$params['Ds_MerchantCode']] - ); - - if (sha1($shaString.$key) != $xml->{'Signature'}) - throw new Exception('Invalid signature'); - - // Confirms the transaction - - Tpv::confirm($db, $params); - } catch (Exception $e) { - $status = 'KO'; - } - - // Generates the response - - $responseString = file_get_contents(__DIR__ .'/soap-reply.xml'); - $xml = new SimpleXMLElement($responseString); - - $response = $xml->{'Response'}; - $response->{'Ds_Response_Merchant'} = $status; - - $xml->{'Signature'} = sha1($response->asXML().$key); - - return $xml->asXML(); -/* - // Another way to generate the response - - $xmlResponse = - ' - '. $status .' - '; - - $xmlMessage = - ' - '. $xmlResponse .' - '. sha1($xmlResponse.$key) .' - '; - - return $xmlMessage; -*/} - diff --git a/rest/tpv/soap-reply.xml b/rest/tpv/soap-reply.xml deleted file mode 100644 index c1d454ba..00000000 --- a/rest/tpv/soap-reply.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/rest/tpv/soap-request.dtd b/rest/tpv/soap-request.dtd deleted file mode 100644 index eb73a981..00000000 --- a/rest/tpv/soap-request.dtd +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/rest/tpv/soap-request.xml b/rest/tpv/soap-request.xml deleted file mode 100644 index 25d594db..00000000 --- a/rest/tpv/soap-request.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - 21/10/2014 - 17:56 - 1 - D - 724 - 1 - 978 - 000000007216 - 329744999 - 001 - 0000 - - 0 - 1 - 563451 - - b97d1aba50aac5efc0915f59a70e24fc94cb3ffe - diff --git a/rest/tpv/soap-test.php b/rest/tpv/soap-test.php deleted file mode 100644 index 5a6bef44..00000000 --- a/rest/tpv/soap-test.php +++ /dev/null @@ -1,56 +0,0 @@ -__soapCall('procesaNotificacionSIS', [ - 'XML' => $requestString - ]); - - $xml = new SimpleXMLElement($result); - - $key = $_POST['key']; - - $start = strpos($result, ''); - $shaString = substr($result, $start, $end - $start + 11); - $shaHash = sha1($shaString.$key); - - $isValid = $xml->{'Signature'} == $shaHash; -} else { - $key = ''; - $result = ''; - $shaHash = ''; - $isValid = FALSE; -} - -?> - - - - - TPV SOAP Client - - - -
- - - -
-

Response

-

-

-

-

Signature

-

- Calculated: -

-

- Valid: /> -

- - diff --git a/rest/tpv/soap.wsdl b/rest/tpv/soap.wsdl deleted file mode 100644 index bd85821d..00000000 --- a/rest/tpv/soap.wsdl +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/rest/tpv/tpv.php b/rest/tpv/tpv.php deleted file mode 100644 index 3ae34f04..00000000 --- a/rest/tpv/tpv.php +++ /dev/null @@ -1,33 +0,0 @@ -query( - 'CALL tpvTransaction_confirm(#, #, #, #, #, #)', - [ - $params['Ds_Amount'] - ,$params['Ds_Order'] - ,$params['Ds_MerchantCode'] - ,$params['Ds_Currency'] - ,$params['Ds_Response'] - ,$error - ] - ); - } -} - diff --git a/rest/tpv/transaction.php b/rest/tpv/transaction.php deleted file mode 100644 index da465c90..00000000 --- a/rest/tpv/transaction.php +++ /dev/null @@ -1,67 +0,0 @@ -getObject('CALL myTpvTransaction_start(#, #)', - [$amount, $companyId]); - - if (!isset($row)) - throw new Exception('Transaction error'); - - $transactionId = str_pad($row->transactionId, 12, '0', STR_PAD_LEFT); - $merchantUrl = $row->merchantUrl ? $row->merchantUrl : ''; - $urlOk = empty($_REQUEST['urlOk']) ? '' : - str_replace('_transactionId_', $transactionId, $_REQUEST['urlOk']); - $urlKo = empty($_REQUEST['urlKo']) ? '' : - str_replace('_transactionId_', $transactionId, $_REQUEST['urlKo']); - - $params = [ - 'Ds_Merchant_Amount' => $amount - ,'Ds_Merchant_Order' => $transactionId - ,'Ds_Merchant_MerchantCode' => $row->merchant - ,'Ds_Merchant_Currency' => $row->currency - ,'Ds_Merchant_TransactionType' => $row->transactionType - ,'Ds_Merchant_Terminal' => $row->terminal - ,'Ds_Merchant_MerchantURL' => $merchantUrl - ,'Ds_Merchant_UrlOK' => $urlOk - ,'Ds_Merchant_UrlKO' => $urlKo - ]; - - $encodedParams = base64_encode(json_encode($params)); - - $key = base64_decode($row->secretKey); - - $bytes = [0, 0, 0, 0, 0, 0, 0, 0]; - $iv = implode(array_map('chr', $bytes)); - - $paddedData = $transactionId; - if (strlen($paddedData) % 8) { - $paddedData = str_pad($paddedData, - strlen($paddedData) + 8 - strlen($paddedData) % 8, "\0"); - } - - $encryptedData = openssl_encrypt($paddedData, - 'des-ede3-cbc', $key, OPENSSL_RAW_DATA | OPENSSL_NO_PADDING , $iv); - $signature = base64_encode(hash_hmac('sha256', $encodedParams, $encryptedData, TRUE)); - - $url = $row->url; - $postValues = [ - 'Ds_SignatureVersion' => 'HMAC_SHA256_V1' - ,'Ds_MerchantParameters' => $encodedParams - ,'Ds_Signature' => $signature - ]; - - return [ - 'url' => $url - ,'postValues' => $postValues - ]; - } -}