Skip to content

Fix WebAuthn unknown transport deserialization #19369

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

Open
xfocus3 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix WebAuthn unknown transport deserialization #19369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 3 additions & 5 deletions ...org/springframework/security/web/webauthn/jackson/AuthenticatorTransportDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,10 @@ class AuthenticatorTransportDeserializer extends StdDeserializer<AuthenticatorTr
public @Nullable AuthenticatorTransport deserialize(JsonParser parser, DeserializationContext ctxt)
throws JacksonException {
String transportValue = parser.readValueAs(String.class);
for (AuthenticatorTransport transport : AuthenticatorTransport.values()) {
if (transport.getValue().equals(transportValue)) {
return transport;
}
if (transportValue == null) {
return null;
}
return null;
return AuthenticatorTransport.valueOf(transportValue);
}

}
8 changes: 3 additions & 5 deletions ...ngframework/security/web/webauthn/jackson/AuthenticatorTransportJackson2Deserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,10 @@ class AuthenticatorTransportJackson2Deserializer extends StdDeserializer<Authent
public @Nullable AuthenticatorTransport deserialize(JsonParser parser, DeserializationContext ctxt)
throws IOException, JacksonException {
String transportValue = parser.readValueAs(String.class);
for (AuthenticatorTransport transport : AuthenticatorTransport.values()) {
if (transport.getValue().equals(transportValue)) {
return transport;
}
if (transportValue == null) {
return null;
}
return null;
return AuthenticatorTransport.valueOf(transportValue);
}

}
8 changes: 8 additions & 0 deletions webauthn/src/test/java/org/springframework/security/web/webauthn/jackson/Jackson2Tests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,14 @@ void readAuthenticatorTransport() throws Exception {
assertThat(transport).isEqualTo(AuthenticatorTransport.HYBRID);
}

@Test
void readAuthenticatorTransportWhenUnknownThenPreservesValue() throws Exception {
AuthenticatorTransport transport = this.mapper.readValue("\"cable\"", AuthenticatorTransport.class);

assertThat(transport).isNotNull();
assertThat(transport.getValue()).isEqualTo("cable");
}

@Test
void readAuthenticatorAttachment() throws Exception {
AuthenticatorAttachment value = this.mapper.readValue("\"cross-platform\"", AuthenticatorAttachment.class);
Expand Down
8 changes: 8 additions & 0 deletions webauthn/src/test/java/org/springframework/security/web/webauthn/jackson/JacksonTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,14 @@ void readAuthenticatorTransport() throws Exception {
assertThat(transport).isEqualTo(AuthenticatorTransport.HYBRID);
}

@Test
void readAuthenticatorTransportWhenUnknownThenPreservesValue() throws Exception {
AuthenticatorTransport transport = this.mapper.readValue("\"cable\"", AuthenticatorTransport.class);

assertThat(transport).isNotNull();
assertThat(transport.getValue()).isEqualTo("cable");
}

@Test
void readAuthenticatorAttachment() throws Exception {
AuthenticatorAttachment value = this.mapper.readValue("\"cross-platform\"", AuthenticatorAttachment.class);
Expand Down