Skip to content

Initial work on supporting newer SHA256 signatures #379 #16

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 1 commit into
base: master
Choose a base branch
from
Open

Initial work on supporting newer SHA256 signatures #379 #16

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
19 changes: 14 additions & 5 deletions core/components/sitedashclient/model/sitedashclient/sitedashclient.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ public function isValidRequest($siteKey, $signature, $data)
}

// Re-create the signature data
$sigData = 'SIG-V1||';
$sigData .= !empty($data['request']) ? $data['request'] : 'REQUEST-NOT-PROVIDED';
$sigData = !empty($data['request']) ? $data['request'] : 'REQUEST-NOT-PROVIDED';
$sigData .= '||';
$sigData .= !empty($data['params']) ? $this->_stringifyParams($data['params']) : 'PARAMS-NOT-PROVIDED';
$sigData .= '||';
Expand All @@ -75,9 +74,19 @@ public function isValidRequest($siteKey, $signature, $data)
// Decode the signature, as we transmit it encoded as base64 instead of binary
$signature = base64_decode($signature);

// Verify the signature is correct for the specified data using the public key, matching the private key on the SiteDash server
$result = openssl_verify($sigData, $signature, $pubKey, OPENSSL_ALGO_SHA1);
return $result === 1;
// First try SHA256 (SIG-V2)
$sigDataSHA256 = 'SIG-V2||' . $sigData;
$resultSHA256 = openssl_verify($sigDataSHA256, $signature, $pubKey, OPENSSL_ALGO_SHA256);

if ($resultSHA256 === 1) {
return true;
}

// If SHA256 verification fails, fall back to SHA1 (SIG-V1)
$sigDataSHA1 = 'SIG-V1||' . $sigData;
$resultSHA1 = openssl_verify($sigDataSHA1, $signature, $pubKey, OPENSSL_ALGO_SHA1);

return $resultSHA1 === 1;
}

protected function _getSiteKey() {
Expand Down