[java-idp-plugin-webauthn] branch main updated: Improve defaults

[Phil Smart]

This is an automated email from the git hooks/post-receive script.

philsmart pushed a commit to branch main
in repository java-idp-plugin-webauthn.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-webauthn.git;a=commit;h=13438c83cf42d37d8861a868a7ac15bf94807649

The following commit(s) were added to refs/heads/main by this push:
     new 13438c8  Improve defaults
13438c8 is described below

commit 13438c83cf42d37d8861a868a7ac15bf94807649
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Thu May 16 16:27:15 2024 +0100

    Improve defaults
---
 .../authn/webauthn/{ => principal}/WebAuthnUserIdPrinicpal.java       | 2 +-
 .../idp/plugin/authn/webauthn/impl/ValidateWebAuthnAssertion.java     | 2 +-
 .../src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml     | 4 ++--
 .../net/shibboleth/idp/flows/authn/WebAuthn/webauthn-beans.xml        | 2 +-
 .../idp/plugin/authn/webauthn/conf/authn/webauthn.properties          | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/webauthn-api/src/main/java/net/shibboleth/idp/plugin/authn/webauthn/WebAuthnUserIdPrinicpal.java b/webauthn-api/src/main/java/net/shibboleth/idp/plugin/authn/webauthn/principal/WebAuthnUserIdPrinicpal.java
similarity index 98%
rename from webauthn-api/src/main/java/net/shibboleth/idp/plugin/authn/webauthn/WebAuthnUserIdPrinicpal.java
rename to webauthn-api/src/main/java/net/shibboleth/idp/plugin/authn/webauthn/principal/WebAuthnUserIdPrinicpal.java
index 3b6e772..8ac2dec 100644
--- a/webauthn-api/src/main/java/net/shibboleth/idp/plugin/authn/webauthn/WebAuthnUserIdPrinicpal.java
+++ b/webauthn-api/src/main/java/net/shibboleth/idp/plugin/authn/webauthn/principal/WebAuthnUserIdPrinicpal.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.idp.plugin.authn.webauthn;
+package net.shibboleth.idp.plugin.authn.webauthn.principal;
 
 import javax.annotation.Nonnull;
 
diff --git a/webauthn-impl/src/main/java/net/shibboleth/idp/plugin/authn/webauthn/impl/ValidateWebAuthnAssertion.java b/webauthn-impl/src/main/java/net/shibboleth/idp/plugin/authn/webauthn/impl/ValidateWebAuthnAssertion.java
index 4830a42..6ac925d 100644
--- a/webauthn-impl/src/main/java/net/shibboleth/idp/plugin/authn/webauthn/impl/ValidateWebAuthnAssertion.java
+++ b/webauthn-impl/src/main/java/net/shibboleth/idp/plugin/authn/webauthn/impl/ValidateWebAuthnAssertion.java
@@ -20,11 +20,11 @@ import net.shibboleth.idp.authn.AbstractValidationAction;
 import net.shibboleth.idp.authn.AuthnEventIds;
 import net.shibboleth.idp.authn.context.AuthenticationContext;
 import net.shibboleth.idp.authn.principal.UsernamePrincipal;
-import net.shibboleth.idp.plugin.authn.webauthn.WebAuthnUserIdPrinicpal;
 import net.shibboleth.idp.plugin.authn.webauthn.authn.AssertionResult;
 import net.shibboleth.idp.plugin.authn.webauthn.client.WebAuthnAuthenticationClient;
 import net.shibboleth.idp.plugin.authn.webauthn.context.WebAuthnAuthenticationContext;
 import net.shibboleth.idp.plugin.authn.webauthn.exception.AssertionFailureException;
+import net.shibboleth.idp.plugin.authn.webauthn.principal.WebAuthnUserIdPrinicpal;
 import net.shibboleth.idp.plugin.authn.webauthn.storage.StorageServiceCredentialRepository;
 import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.shared.annotation.constraint.NonnullBeforeExec;
diff --git a/webauthn-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml b/webauthn-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
index 1c37da8..d374eca 100644
--- a/webauthn-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
+++ b/webauthn-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
@@ -83,7 +83,7 @@
         </property>
         <property name="defaultAuthenticationMethodsByString">
             <bean parent="shibboleth.CommaDelimStringArray"
-                c:_0="#{'%{idp.authn.webauthn.admin.management.defaultAuthenticationMethods:}'.trim()}" />
+                c:_0="#{'%{idp.authn.webauthn.admin.management.defaultAuthenticationMethods:saml2/http://example.org/ac/classes/mfa}'.trim()}" />
          </property>
     </bean>
     
@@ -173,7 +173,7 @@
             c:claz="net.shibboleth.idp.authn.duo.DuoPrincipal">
         <constructor-arg name="serializer">
             <bean class="net.shibboleth.idp.authn.principal.SimplePrincipalSerializer"
-                c:claz=" net.shibboleth.idp.plugin.authn.webauthn.WebAuthnUserIdPrinicpal" c:name="WEBAUTHNUSERID" />
+                c:claz=" net.shibboleth.idp.plugin.authn.webauthn.principal.WebAuthnUserIdPrinicpal" c:name="WEBAUTHNUSERID" />
         </constructor-arg>
     </bean>
 
diff --git a/webauthn-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/WebAuthn/webauthn-beans.xml b/webauthn-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/WebAuthn/webauthn-beans.xml
index fcfe5b4..4e12cc5 100644
--- a/webauthn-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/WebAuthn/webauthn-beans.xml
+++ b/webauthn-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/WebAuthn/webauthn-beans.xml
@@ -64,7 +64,7 @@
     
     <bean id="IsUsernamelessFlow" scope="prototype"
         class="net.shibboleth.idp.plugin.authn.webauthn.context.logic.UsernamelessFlowEnabled"
-        p:enabled="%{idp.authn.webauthn.usernameless.enabled:true}"/>
+        p:enabled="%{idp.authn.webauthn.usernameless.enabled:false}"/>
 
     <bean id="IsDiscoverableCredentialRequired" scope="prototype"
         class="net.shibboleth.idp.plugin.authn.webauthn.context.logic.IsDiscoverableCredentialRequired" />
diff --git a/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/conf/authn/webauthn.properties b/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/conf/authn/webauthn.properties
index 93fe889..b5d10f1 100644
--- a/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/conf/authn/webauthn.properties
+++ b/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/conf/authn/webauthn.properties
@@ -74,7 +74,7 @@ idp.authn.webauthn.supportedPrincipals = \
 #idp.authn.webauthn.metadata.metadataBlobFile = 
 
 # Which authentication flows to require
-#idp.authn.webauthn.admin.registration.defaultAuthenticationMethods=saml2/urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport
+#idp.authn.webauthn.admin.registration.defaultAuthenticationMethods =
 
 # Require a resident/discoverable key (passkey) to be created when registering a credential. One-of 'discouraged', 'preferred', 'required'
 #idp.authn.webauthn.registration.residentKey = preferred
@@ -104,7 +104,7 @@ idp.authn.webauthn.supportedPrincipals = \
 #idp.authn.webauthn.admin.management.resolveAttributes = false
 #idp.authn.webauthn.admin.management.authenticationFlows = 
 #idp.authn.webauthn.admin.management.postAuthenticationFlows = 
-#idp.authn.webauthn.admin.management.defaultAuthenticationMethod = 
+#idp.authn.webauthn.admin.management.defaultAuthenticationMethods = saml2/http://example.org/ac/classes/mfa
 #idp.authn.webauthn.admin.management.authenticated = true
 
 #### Authentication properties

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.