From 2a85798cd91c27cb35d7a3227d8429923556ca40 Mon Sep 17 00:00:00 2001 From: topiam Date: Tue, 4 Feb 2025 22:25:59 +0800 Subject: [PATCH] Add setRequestMatcher to the relevant filters. Signed-off-by: smallbun <2689170096@qq.com> --- .../PublicKeyCredentialRequestOptionsFilter.java | 2 ++ .../PublicKeyCredentialCreationOptionsFilter.java | 3 +++ .../webauthn/registration/WebAuthnRegistrationFilter.java | 8 ++++++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/web/src/main/java/org/springframework/security/web/webauthn/authentication/PublicKeyCredentialRequestOptionsFilter.java b/web/src/main/java/org/springframework/security/web/webauthn/authentication/PublicKeyCredentialRequestOptionsFilter.java index e07dd283f6..ddd1fc7109 100644 --- a/web/src/main/java/org/springframework/security/web/webauthn/authentication/PublicKeyCredentialRequestOptionsFilter.java +++ b/web/src/main/java/org/springframework/security/web/webauthn/authentication/PublicKeyCredentialRequestOptionsFilter.java @@ -77,7 +77,9 @@ public PublicKeyCredentialRequestOptionsFilter(WebAuthnRelyingPartyOperations rp /** * Sets the {@link RequestMatcher} used to trigger this filter. + * By default, the {@link RequestMatcher} is {@code POST /webauthn/authenticate/options}. * @param requestMatcher the {@link RequestMatcher} to use + * @since 6.5 */ public void setRequestMatcher(RequestMatcher requestMatcher) { Assert.notNull(requestMatcher, "requestMatcher cannot be null"); diff --git a/web/src/main/java/org/springframework/security/web/webauthn/registration/PublicKeyCredentialCreationOptionsFilter.java b/web/src/main/java/org/springframework/security/web/webauthn/registration/PublicKeyCredentialCreationOptionsFilter.java index 453246feb1..6c9aa3b75e 100644 --- a/web/src/main/java/org/springframework/security/web/webauthn/registration/PublicKeyCredentialCreationOptionsFilter.java +++ b/web/src/main/java/org/springframework/security/web/webauthn/registration/PublicKeyCredentialCreationOptionsFilter.java @@ -84,7 +84,10 @@ public PublicKeyCredentialCreationOptionsFilter(WebAuthnRelyingPartyOperations r /** * Sets the {@link RequestMatcher} used to trigger this filter. + *

+ * By default, the {@link RequestMatcher} is {@code POST /webauthn/register/options}. * @param requestMatcher the {@link RequestMatcher} to use + * @since 6.5 */ public void setRequestMatcher(RequestMatcher requestMatcher) { Assert.notNull(requestMatcher, "requestMatcher cannot be null"); diff --git a/web/src/main/java/org/springframework/security/web/webauthn/registration/WebAuthnRegistrationFilter.java b/web/src/main/java/org/springframework/security/web/webauthn/registration/WebAuthnRegistrationFilter.java index ead41b669b..fb5c416436 100644 --- a/web/src/main/java/org/springframework/security/web/webauthn/registration/WebAuthnRegistrationFilter.java +++ b/web/src/main/java/org/springframework/security/web/webauthn/registration/WebAuthnRegistrationFilter.java @@ -106,8 +106,10 @@ public WebAuthnRegistrationFilter(UserCredentialRepository userCredentials, } /** - * Sets the {@link RequestMatcher} used to trigger this filter. + * Sets the {@link RequestMatcher} to trigger this filter's the credential registration operation . + * By default, the {@link RequestMatcher} is {@code POST /webauthn/register}. * @param registerCredentialMatcher the {@link RequestMatcher} to use + * @since 6.5 */ public void setRegisterCredentialMatcher(RequestMatcher registerCredentialMatcher) { Assert.notNull(registerCredentialMatcher, "registerCredentialMatcher cannot be null"); @@ -115,8 +117,10 @@ public void setRegisterCredentialMatcher(RequestMatcher registerCredentialMatche } /** - * Sets the {@link RequestMatcher} used to trigger this filter. + * Sets the {@link RequestMatcher} to trigger this filter's the credential removal operation . + * By default, the {@link RequestMatcher} is {@code DELETE /webauthn/register/{id}}. * @param removeCredentialMatcher the {@link RequestMatcher} to use + * @since 6.5 */ public void setRemoveCredentialMatcher(RequestMatcher removeCredentialMatcher) { Assert.notNull(removeCredentialMatcher, "removeCredentialMatcher cannot be null");