Skip to content

Avoid undefined indexes in notifications #20

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Avoid undefined indexes in notifications #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
293cdeb
use isset to avoid undefined indexes
twisted1919 Jul 5, 2018
4ebe2dd
null fallback and test addition
twisted1919 Jul 5, 2018
b92c0c4
make phpcs happy
twisted1919 Jul 5, 2018
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
33 changes: 21 additions & 12 deletions src/Message/NotificationResponse.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,27 @@
class NotificationResponse extends AbstractResponse implements NotificationInterface
{
/**
* Is the notification harsh correct after validation?
*/
* Is the notification hash correct after validation?
*/
public function isSuccessful()
{
# Validate the Hash
$hashSecretWord = $this->data['secretWord']; # Input your secret word
$hashSid = $this->data['accountNumber']; #Input your seller ID (2Checkout account number)
$hashOrder = $this->data['sale_id'];
$hashInvoice = $this->data['invoice_id'];
$StringToHash = strtoupper(md5($hashOrder.$hashSid.$hashInvoice.$hashSecretWord));
// Validate the Hash
$hashSecretWord = isset($this->data['secretWord']) ? $this->data['secretWord'] : null;
$hashSid = isset($this->data['accountNumber']) ? $this->data['accountNumber'] : null;
$hashOrder = isset($this->data['sale_id']) ? $this->data['sale_id'] : null;
$hashInvoice = isset($this->data['invoice_id']) ? $this->data['invoice_id'] : null;
$md5_hash = isset($this->data['md5_hash']) ? $this->data['md5_hash'] : null;

return $StringToHash == $this->data['md5_hash'];
// if no value has been posted, it has no way to be valid
if ($hashSecretWord === null || $hashSid === null ||
$hashOrder === null || $hashInvoice === null ||
$md5_hash === null) {
return false;
}

$StringToHash = strtoupper(md5($hashOrder.$hashSid.$hashInvoice.$hashSecretWord));

return (string)$StringToHash == (string)$md5_hash;
}

/**
Expand All @@ -29,7 +38,7 @@ public function isSuccessful()
*/
public function getTransactionReference()
{
return $this->data['sale_id'];
return isset($this->data['sale_id']) ? $this->data['sale_id'] : null;
}

/**
Expand All @@ -39,7 +48,7 @@ public function getTransactionReference()
*/
public function getTransactionId()
{
return $this->data['vendor_order_id'];
return isset($this->data['vendor_order_id']) ? $this->data['vendor_order_id'] : null;
}

/**
Expand All @@ -49,7 +58,7 @@ public function getTransactionId()
*/
public function getNotificationType()
{
return $this->data['message_type'];
return isset($this->data['message_type']) ? $this->data['message_type'] : null;
}

/**
Expand Down
13 changes: 13 additions & 0 deletions tests/Message/NotificationResponseTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public function testResponseFail()
$this->assertTrue($response->getTransactionStatus());
$this->assertSame($data, $response->getMessage());
}

public function testResponsePass()
{
$data = $this->getMockHttpResponse('FraudChangeNotificationPass.txt')->json();
Expand All @@ -44,4 +45,16 @@ public function testForResponseOtherThanFraudReview() {

$this->assertTrue($response->getTransactionStatus());
}

public function testResponseNoData()
{
$data = array();
$response = new NotificationResponse($this->getMockRequest(), $data);

$this->assertFalse($response->isSuccessful());
$this->assertSame(null, $response->getTransactionReference());
$this->assertSame(null, $response->getTransactionId());
$this->assertSame(null, $response->getNotificationType());
$this->assertTrue($response->getTransactionStatus());
}
}