Update Samples to Latest

Author: jzheaux

servlet/spring-boot/java/authentication/mfa/formLogin+ott/src/main/java/org/example/magiclink/CustomPagesSecurityConfig.java

@@ -1,9 +1,12 @@
 package org.example.magiclink;
 
+import jakarta.servlet.http.HttpServletRequest;
+
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.core.Authentication;
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -20,8 +23,11 @@ public String login() {
 			return "login";
 		}
 
-		@GetMapping("/login/ott")
-		public String ott() {
+		@GetMapping("/commence/ott")
+		public String ott(HttpServletRequest request, Authentication authentication) {
+			if (authentication != null) {
+				request.setAttribute("username", authentication.getName());
+			}
 			return "ott";
 		}
 	}
@@ -32,7 +38,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
 		http
 			.authorizeHttpRequests((authorize) -> authorize.anyRequest().authenticated())
 			.formLogin((form) -> form.loginPage("/login/form").permitAll())
-			.oneTimeTokenLogin((ott) -> ott.loginPage("/login/ott").permitAll());
+			.oneTimeTokenLogin((ott) -> ott.loginPage("/commence/ott").permitAll());
 		// @formatter:on
 		return http.build();
 	}

servlet/spring-boot/java/authentication/mfa/formLogin+ott/src/main/java/org/example/magiclink/DefaultSecurityConfig.java

@@ -19,6 +19,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
+import org.springframework.security.authorization.AuthorizationManagerFactory;
 import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.web.SecurityFilterChain;
@@ -39,7 +40,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
 	}
 
 	@Bean
-	FactorAuthorizationManagerFactory authz() {
+	AuthorizationManagerFactory<?> authz() {
 		return new FactorAuthorizationManagerFactory("FACTOR_PASSWORD", "FACTOR_OTT");
 	}
 

servlet/spring-boot/java/authentication/mfa/formLogin+ott/src/main/java/org/example/magiclink/ElevatedSecurityPageSecurityConfig.java

@@ -1,9 +1,12 @@
 package org.example.magiclink;
 
+import jakarta.servlet.http.HttpServletRequest;
+
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.core.Authentication;
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -20,8 +23,11 @@ public String login() {
 			return "login";
 		}
 
-		@GetMapping("/login/ott")
-		public String ott() {
+		@GetMapping("/commence/ott")
+		public String ott(HttpServletRequest request, Authentication authentication) {
+			if (authentication != null) {
+				request.setAttribute("username", authentication.getName());
+			}
 			return "ott";
 		}
 	}
@@ -32,7 +38,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
 		http
 			.authorizeHttpRequests((authorize) -> authorize.anyRequest().authenticated())
 			.formLogin((form) -> form.loginPage("/login/form").permitAll())
-			.oneTimeTokenLogin((ott) -> ott.loginPage("/login/ott").permitAll());
+			.oneTimeTokenLogin((ott) -> ott.loginPage("/commence/ott").permitAll());
 
 		// @formatter:on
 		return http.build();

servlet/spring-boot/java/authentication/mfa/formLogin+ott/src/main/java/org/example/magiclink/MagicLinkOneTimeTokenGenerationSuccessHandler.java

@@ -35,7 +35,12 @@ public class MagicLinkOneTimeTokenGenerationSuccessHandler implements OneTimeTok
 	@Override
 	public void handle(HttpServletRequest request, HttpServletResponse response, OneTimeToken oneTimeToken)
 			throws IOException {
-		this.logger.info("Use this one-time token: " + oneTimeToken.getTokenValue());
+		this.logger.info(String.format("""
+		********************************************************
+		
+		Use this one-time token: %s
+		
+		********************************************************""", oneTimeToken.getTokenValue()));
 		response.sendRedirect("/login/ott");
 	}
 

servlet/spring-boot/java/authentication/mfa/formLogin+ott/src/main/resources/templates/login.html

@@ -15,7 +15,7 @@ <h2>Please sign in</h2>
 
         <p>
             <label for="username" class="screenreader">Username</label>
-            <input type="text" id="username" name="username" placeholder="Username" required autofocus>
+            <input type="text" id="username" name="username" th:value="${username}" placeholder="Username" required autofocus>
         </p>
         <p>
             <label for="password" class="screenreader">Password</label>

servlet/spring-boot/java/authentication/mfa/formLogin+ott/src/main/resources/templates/ott.html

@@ -10,15 +10,15 @@
 </head>
 <body>
 <div class="content">
-    <form class="login-form" method="post" th:action="@{/login/ott}">
-        <h2>Please supply a token</h2>
+    <form class="ott" method="post" th:action="@{/ott/generate}">
+        <h2>Please click below to send a one-time token</h2>
 
         <p>
-            <label for="token" class="screenreader">Token</label>
-            <input type="text" id="token" name="token" placeholder="Token" required autofocus>
+            <label for="username" class="screenreader">Username</label>
+            <input type="text" id="username" name="username" th:value="${username}" placeholder="Username" required autofocus>
         </p>
 
-        <button type="submit" class="primary">Use this Token</button>
+        <button type="submit" class="primary">Send Token</button>
     </form>
 </div>
 </body>

servlet/spring-boot/java/authentication/mfa/oauth2/src/main/java/org/example/magiclink/SecurityConfig.java

@@ -61,7 +61,10 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http, Authentication
 			)
 			.oauth2Login(Customizer.withDefaults())
 			.exceptionHandling((exceptions) -> exceptions
-				.defaultAuthenticationEntryPointFor(oauth2, "SCOPE_https://www.googleapis.com/auth/gmail.readonly")
+				.missingAuthoritiesHandler((handler) -> handler
+					.authorities("SCOPE_https://www.googleapis.com/auth/gmail.readonly")
+					.commence(oauth2)
+				)
 			);
 		// @formatter:on
 		return http.build();

servlet/spring-boot/java/authentication/mfa/x509+webauthn/src/main/java/example/SecurityConfig.java

@@ -54,7 +54,10 @@ SecurityFilterChain web(HttpSecurity http) throws Exception {
 				.allowedOrigins("https://api.127.0.0.1.nip.io:8443")
 			)
 			.exceptionHandling((exceptions) -> exceptions
-				.defaultAuthenticationEntryPointFor(new LoginUrlAuthenticationEntryPoint("/webauthn"), "FACTOR_WEBAUTHN")
+				.missingAuthoritiesHandler((handler) -> handler
+					.authorities("FACTOR_WEBAUTHN")
+					.commence(new LoginUrlAuthenticationEntryPoint("/webauthn"))
+				)
 			);
 		// @formatter:on
 		return http.build();