Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix to encode/decode credential id as base64url #631

Merged
merged 2 commits into from
Jul 16, 2024
Merged

Fix to encode/decode credential id as base64url #631

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
953fa43
Fix to encode/decode credential id as base64url
abcang Jul 16, 2024
198438c
Update decoding method in Credential.php
Spomky Jul 16, 2024
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
5 changes: 3 additions & 2 deletions src/webauthn/src/Credential.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
namespace Webauthn;

use InvalidArgumentException;
use ParagonIE\ConstantTime\Base64UrlSafe;

/**
* @see https://w3c.github.io/webappsec-credential-management/#credential
Expand Down Expand Up @@ -33,10 +34,10 @@ public function __construct(
'The property "$id" is deprecated and will be removed in 5.0.0. Please set null use "rawId" instead.'
);
} else {
$id = base64_encode($rawId);
$id = Base64UrlSafe::encodeUnpadded($rawId);
}
$this->id = $id;
$this->rawId = $rawId ?? base64_encode($id);
$this->rawId = $rawId ?? Base64UrlSafe::decodeNoPadding($id);
}

/**
Expand Down