diff --git a/web/src/main/java/org/springframework/security/web/webauthn/jackson/AuthenticationExtensionsClientOutputsDeserializer.java b/web/src/main/java/org/springframework/security/web/webauthn/jackson/AuthenticationExtensionsClientOutputsDeserializer.java index f1d18e6f23..3a46fe9ddd 100644 --- a/web/src/main/java/org/springframework/security/web/webauthn/jackson/AuthenticationExtensionsClientOutputsDeserializer.java +++ b/web/src/main/java/org/springframework/security/web/webauthn/jackson/AuthenticationExtensionsClientOutputsDeserializer.java @@ -56,11 +56,8 @@ class AuthenticationExtensionsClientOutputsDeserializer extends StdDeserializer< throws IOException, JacksonException { List> outputs = new ArrayList<>(); for (String key = parser.nextFieldName(); key != null; key = parser.nextFieldName()) { - JsonToken startObject = parser.nextValue(); - if (startObject != JsonToken.START_OBJECT) { - break; - } - if (CredentialPropertiesOutput.EXTENSION_ID.equals(key)) { + JsonToken next = parser.nextToken(); + if (next == JsonToken.START_OBJECT && CredentialPropertiesOutput.EXTENSION_ID.equals(key)) { CredentialPropertiesOutput output = parser.readValueAs(CredentialPropertiesOutput.class); outputs.add(output); } @@ -68,7 +65,9 @@ class AuthenticationExtensionsClientOutputsDeserializer extends StdDeserializer< if (logger.isDebugEnabled()) { logger.debug("Skipping unknown extension with id " + key); } - parser.nextValue(); + if (next.isStructStart()) { + parser.skipChildren(); + } } } diff --git a/web/src/test/java/org/springframework/security/web/webauthn/jackson/JacksonTests.java b/web/src/test/java/org/springframework/security/web/webauthn/jackson/JacksonTests.java index ba970125e0..f93b4ecd3f 100644 --- a/web/src/test/java/org/springframework/security/web/webauthn/jackson/JacksonTests.java +++ b/web/src/test/java/org/springframework/security/web/webauthn/jackson/JacksonTests.java @@ -122,6 +122,47 @@ class JacksonTests { assertThat(outputs).usingRecursiveComparison().isEqualTo(credProps); } + @Test + void readAuthenticationExtensionsClientOutputsWhenAppId() throws Exception { + String json = """ + { + "appid": false, + "credProps": { + "rk": false + } + } + """; + CredentialPropertiesOutput credProps = new CredentialPropertiesOutput(false); + + AuthenticationExtensionsClientOutputs outputs = this.mapper.readValue(json, + AuthenticationExtensionsClientOutputs.class); + assertThat(outputs.getOutputs()).usingRecursiveFieldByFieldElementComparator().contains(credProps); + } + + @Test + void readAuthenticationExtensionsClientOutputsWhenUnknownExtension() throws Exception { + String json = """ + { + "unknownObject1": { + "key": "value" + }, + "unknownArray": [ + { "key": "value1" }, + { "key": "value2" } + ], + "credProps": { + "rk": false + }, + "unknownObject2": {} + } + """; + CredentialPropertiesOutput credProps = new CredentialPropertiesOutput(false); + + AuthenticationExtensionsClientOutputs outputs = this.mapper.readValue(json, + AuthenticationExtensionsClientOutputs.class); + assertThat(outputs.getOutputs()).usingRecursiveFieldByFieldElementComparator().contains(credProps); + } + @Test void readAuthenticationExtensionsClientOutputsWhenFieldAfter() throws Exception { String json = """