Skip to content

Commit

Permalink
Checks gateway server has a valid signature
Browse files Browse the repository at this point in the history
  • Loading branch information
daftspunk committed Feb 20, 2022
1 parent e6867a5 commit e3b455a
Showing 1 changed file with 38 additions and 2 deletions.
40 changes: 38 additions & 2 deletions modules/system/classes/UpdateManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
use Cache;
use Schema;
use Config;
use Request;
use ApplicationException;
use Cms\Classes\ThemeManager;
use System\Models\Parameter;
Expand Down Expand Up @@ -885,6 +886,10 @@ public function requestServerData($uri, $postData = [])
throw new ApplicationException(Lang::get('system::lang.server.response_invalid'));
}

if (!$this->validateServerSignature($resultData, $result->headers['Rest-Sign'] ?? '')) {
throw new ApplicationException(Lang::get('system::lang.server.response_invalid') . ' (Bad signature)');
}

return $resultData;
}

Expand Down Expand Up @@ -963,12 +968,13 @@ protected function createServerUrl($uri)
*/
protected function applyHttpAttributes($http, $postData)
{
$postData['protocol_version'] = '1.2';
$postData['client'] = 'october';
$postData['protocol_version'] = '1.3';
$postData['client'] = 'October CMS';

$postData['server'] = base64_encode(json_encode([
'php' => PHP_VERSION,
'url' => Url::to('/'),
'ip' => Request::ip(),
'since' => PluginVersion::orderBy('created_at')->value('created_at')
]));

Expand Down Expand Up @@ -1070,4 +1076,34 @@ protected function printMessages()
}
}
}

/**
* validateServerSignature checks the server has provided a valid signature
*
* @return bool
*/
protected function validateServerSignature($data, $signature)
{
if (!$signature) {
return false;
}

$signature = base64_decode($signature);

$pubKey = '-----BEGIN PUBLIC KEY-----
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt+KwvTXqC8Mz9vV4KIvX
3y+aZusrlg26jdbNVUuhXNFbt1VisjJydHW2+WGsiEHSy2s61ZAV2dICR6f3huSw
jY/MH9j23Oo/u61CBpvIS3Q8uC+TLtJl4/F9eqlnzocfMoKe8NmcBbUR3TKQoIok
xbSMl6jiE2k5TJdzhHUxjZRIeeLDLMKYX6xt37LdhuM8zO6sXQmCGg4J6LmHTJph
96H11gBvcFSFJSmIiDykJOELZl/aVcY1g3YgpL0mw5Bw1VTmKaRdz1eBi9DmKrKX
UijG4gD8eLRV/FS/sZCFNR/evbQXvTBxO0TOIVi85PlQEcMl4SBj0CoTyNbcAGtz
4wIDAQAB
-----END PUBLIC KEY-----';

$pubKey = Config::get('system.update_gateway_key', $pubKey);

$data = base64_encode(json_encode($data));

return openssl_verify($data, $signature, $pubKey) === 1;
}
}

0 comments on commit e3b455a

Please sign in to comment.