update to provisioner code nwew paddle code

This commit is contained in:
Mark Gregory
2026-09-30 16:32:29 +01:00
parent cf34134b69
commit cef2f15490
@@ -14,10 +14,11 @@ final class LicenseTokenVerifier
} }
$payload = $this->decode($parts[1]); $payload = $this->decode($parts[1]);
$signature = $this->decode($parts[2]); $signature = $this->decode($parts[2]);
$public = base64_decode((string) config('sonardesk.public_key'), true); // Derive the verification key from the same private seed used by LicenseSigner.
if ($public === false || strlen($public) !== SODIUM_CRYPTO_SIGN_PUBLICKEYBYTES) { // Keeping a separate SONARDESK_LICENSE_PUBLIC_KEY allowed the two keys to drift:
throw new RuntimeException('Server licence public key is invalid.'); // activation would sign a perfectly valid token with the new private key, then
} // /validate would reject that same token using a stale public key.
$public = $this->publicKeyFromPrivateSeed();
if (! sodium_crypto_sign_verify_detached($signature, $payload, $public)) { if (! sodium_crypto_sign_verify_detached($signature, $payload, $public)) {
throw new RuntimeException('Licence token signature is invalid.'); throw new RuntimeException('Licence token signature is invalid.');
} }
@@ -26,6 +27,23 @@ final class LicenseTokenVerifier
return is_array($decoded) ? $decoded : throw new RuntimeException('Licence token payload is invalid.'); return is_array($decoded) ? $decoded : throw new RuntimeException('Licence token payload is invalid.');
} }
private function publicKeyFromPrivateSeed(): string
{
$path = config('sonardesk.private_key_path');
if (! $path || ! is_file($path)) {
throw new RuntimeException('SONARDESK_LICENSE_PRIVATE_KEY_PATH is not configured or does not exist.');
}
$seed = base64_decode(trim((string) file_get_contents($path)), true);
if ($seed === false || strlen($seed) !== SODIUM_CRYPTO_SIGN_SEEDBYTES) {
throw new RuntimeException('The SonarDesk private key must be a Base64-encoded 32-byte Ed25519 seed.');
}
$pair = sodium_crypto_sign_seed_keypair($seed);
return sodium_crypto_sign_publickey($pair);
}
private function decode(string $value): string private function decode(string $value): string
{ {
$value = strtr($value, '-_', '+/'); $value = strtr($value, '-_', '+/');