Skip to content
This repository has been archived by the owner on Jul 12, 2023. It is now read-only.

Commit

Permalink
Ensure payload is always base64url encoded
Browse files Browse the repository at this point in the history
  • Loading branch information
Niklas Grießer committed Apr 27, 2021
1 parent dec802c commit 6cd69b6
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 2 deletions.
17 changes: 17 additions & 0 deletions src/Base64UrlUtil.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?php
declare(strict_types=1);

namespace BauerKirch\CoronaWarnAppEventRegistration;

class Base64UrlUtil
{
public static function encode(string $input): string
{
return str_replace(['+', '/', '='], ['-', '_', ''], base64_encode($input));
}

public static function decode(string $input): string
{
return base64_decode(str_replace(['-', '_'], ['+', '/'], $input));
}
}
2 changes: 1 addition & 1 deletion src/QRCodePayloadGenerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public function generatePayload(LocationType $locationType, string $description,

try {
$payload->setVendorData($locationData->serializeToString());
return base64_encode($payload->serializeToString());
return Base64UrlUtil::encode($payload->serializeToString());
} catch (\Exception $e) {
throw new GenerateException($e);
}
Expand Down
2 changes: 1 addition & 1 deletion src/QRCodePayloadReader.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public function readPayload(string $payload): QRCodePayloadDto
$internalPayload = new QRCodePayload();
$internalLocationData = new CWALocationData();
try {
$internalPayload->mergeFromString(base64_decode($payload));
$internalPayload->mergeFromString(Base64UrlUtil::decode($payload));
$internalLocationData->mergeFromString($internalPayload->getVendorData());
} catch (\Exception $e) {
throw new ReadException($e);
Expand Down

0 comments on commit 6cd69b6

Please sign in to comment.