Skip to content

Expose credential public key as a PublicKey object #299

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

Merged
merged 5 commits into from
Jul 3, 2023
Merged

Expose credential public key as a PublicKey object #299

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0836704
expose credential public key as a PublicKey object
iaik-jheher Jun 21, 2023
de39170
Add missing import and run spotlessApply
emlun Jun 22, 2023
db3f868
Rename getPublicKeyAsPublicKey to getParsedPublicKey, refine JavaDoc
emlun Jun 22, 2023
44d3a06
Merge branch 'release-2.5.0' into feature/expose-public-key
emlun Jun 27, 2023
a5d88f7
Update NEWS
emlun Jun 28, 2023
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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ out/
*.iws
.attach_pid*

# VS Code
.vscode/

# Mac
.DS_Store

Expand Down
17 changes: 17 additions & 0 deletions webauthn-server-core/src/main/java/com/yubico/webauthn/RegisteredCredential.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

package com.yubico.webauthn;

import COSE.CoseException;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yubico.webauthn.data.AttestedCredentialData;
Expand All @@ -33,6 +34,10 @@
import com.yubico.webauthn.data.COSEAlgorithmIdentifier;
import com.yubico.webauthn.data.PublicKeyCredentialDescriptor;
import com.yubico.webauthn.data.UserIdentity;
import java.io.IOException;
import java.security.NoSuchAlgorithmException;
import java.security.PublicKey;
import java.security.spec.InvalidKeySpecException;
import java.util.Optional;
import lombok.AccessLevel;
import lombok.Builder;
Expand Down Expand Up @@ -83,6 +88,18 @@ public final class RegisteredCredential {
*/
@NonNull private final ByteArray publicKeyCose;

/**
* The credential public key, as a {@link java.security.PublicKey} object.
*
* <p>Provided for convenience.
*/
@NonNull
@JsonIgnore
public PublicKey getPublicKeyAsPublicKey()
throws InvalidKeySpecException, NoSuchAlgorithmException, CoseException, IOException {
return WebAuthnCodecs.importCosePublicKey(getPublicKeyCose());
}

/**
* The stored <a href="https://www.w3.org/TR/2021/REC-webauthn-2-20210408/#signcount">signature
* count</a> of the credential.
Expand Down
16 changes: 16 additions & 0 deletions webauthn-server-core/src/main/java/com/yubico/webauthn/RegistrationResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

package com.yubico.webauthn;

import COSE.CoseException;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
Expand All @@ -38,9 +39,13 @@
import com.yubico.webauthn.data.ClientRegistrationExtensionOutputs;
import com.yubico.webauthn.data.PublicKeyCredential;
import com.yubico.webauthn.data.PublicKeyCredentialDescriptor;
import java.io.IOException;
import java.security.NoSuchAlgorithmException;
import java.security.PublicKey;
import java.security.cert.CertificateEncodingException;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import java.security.spec.InvalidKeySpecException;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -263,6 +268,17 @@ public ByteArray getPublicKeyCose() {
.getCredentialPublicKey();
}

/**
* The public key of the created credential, as a {@link java.security.PublicKey} object.
* <p>Provided for convenience.
*/
@NonNull
@JsonIgnore
public PublicKey getPublicKeyAsPublicKey()
throws InvalidKeySpecException, NoSuchAlgorithmException, CoseException, IOException {
return WebAuthnCodecs.importCosePublicKey(getPublicKeyCose());
}

/**
* The <a
* href="https://www.w3.org/TR/2021/REC-webauthn-2-20210408/#client-extension-output">client
Expand Down