./gradlew format

rwinch · rwinch · commit 652a06660cab · 2025-10-28T12:09:09.000-05:00
diff --git a/servlet/spring-boot/java/authentication/mfa/formLogin+ott/src/main/java/example/FormLoginConfig.java b/servlet/spring-boot/java/authentication/mfa/formLogin+ott/src/main/java/example/FormLoginConfig.java
@@ -12,19 +12,21 @@
 @Controller
 @Profile("custom-pages")
 class FormLoginConfig {
-    static final String PATH = "/auth/password";
 
-    @GetMapping(PATH)
-    String auth() {
-        return "password";
-    }
+	static final String PATH = "/auth/password";
 
-    @Bean
-    Customizer<HttpSecurity> formLogin() {
-        // @formatter:off
+	@GetMapping(PATH)
+	String auth() {
+		return "password";
+	}
+
+	@Bean
+	Customizer<HttpSecurity> formLogin() {
+		// @formatter:off
         return (http) -> http
             .authorizeHttpRequests((authz) -> authz.requestMatchers(PATH).permitAll())
             .formLogin((form) -> form.loginPage(PATH));
         // @formatter:on
-    }
+	}
+
 }
diff --git a/servlet/spring-boot/java/authentication/mfa/formLogin+ott/src/main/java/example/FormLoginOttMfaApplication.java b/servlet/spring-boot/java/authentication/mfa/formLogin+ott/src/main/java/example/FormLoginOttMfaApplication.java
@@ -28,11 +28,14 @@ public static void main(String[] args) {
 		SpringApplication.run(FormLoginOttMfaApplication.class, args);
 	}
 
-    @Controller
-    static class AppController {
-        @GetMapping("/profile")
-        String profile() {
-            return "profile";
-        }
-    }
+	@Controller
+	static class AppController {
+
+		@GetMapping("/profile")
+		String profile() {
+			return "profile";
+		}
+
+	}
+
 }
diff --git a/servlet/spring-boot/java/authentication/mfa/formLogin+ott/src/main/java/example/OttLoginConfig.java b/servlet/spring-boot/java/authentication/mfa/formLogin+ott/src/main/java/example/OttLoginConfig.java
@@ -12,20 +12,21 @@
 @Controller
 @Profile("custom-pages")
 class OttLoginConfig {
-    static final String PATH = "/auth/ott";
 
-    @GetMapping(PATH)
-    String auth() {
-        return "ott";
-    }
+	static final String PATH = "/auth/ott";
 
-    @Bean
-    Customizer<HttpSecurity> ottLogin() {
-        // @formatter:off
+	@GetMapping(PATH)
+	String auth() {
+		return "ott";
+	}
+
+	@Bean
+	Customizer<HttpSecurity> ottLogin() {
+		// @formatter:off
         return (http) -> http
             .authorizeHttpRequests((authz) -> authz.requestMatchers(PATH).permitAll())
             .oneTimeTokenLogin((ott) -> ott.loginPage(PATH));
         // @formatter:on
-    }
+	}
 
 }
diff --git a/servlet/spring-boot/java/authentication/mfa/formLogin+ott/src/main/java/example/SecurityDefaultsConfig.java b/servlet/spring-boot/java/authentication/mfa/formLogin+ott/src/main/java/example/SecurityDefaultsConfig.java
@@ -28,57 +28,54 @@
 @Configuration(proxyBeanMethods = false)
 @EnableGlobalMultiFactorAuthentication(authorities = { PASSWORD_AUTHORITY, OTT_AUTHORITY })
 class SecurityDefaultsConfig {
-    @Bean
-    SecurityFilterChain app(HttpSecurity http, AuthorizationManager<Object> passwordIn5m) {
-        http
-            .authorizeHttpRequests((authz) -> authz
-                .requestMatchers("/profile").access(passwordIn5m)
-                .anyRequest().authenticated()
-            )
-            .formLogin(Customizer.withDefaults())
-            .oneTimeTokenLogin(Customizer.withDefaults());
-        return http.build();
-    }
-
-    @Bean
-    AuthorizationManager<Object> passwordIn5m() {
-        return AuthorizationManagerFactories.multiFactor()
-                .requireFactor((f) -> f.passwordAuthority().validDuration(Duration.ofMinutes(5)))
-                .requireFactor((f) -> f.ottAuthority()).build().authenticated();
-    }
-
-    @Bean
-    UserDetailsService users() {
-        return new InMemoryUserDetailsManager(User.withDefaultPasswordEncoder()
-                .username("user")
-                .password("password")
-                .authorities("app")
-                .build());
-    }
-
-    @Bean
-    OneTimeTokenGenerationSuccessHandler ottSuccessHandler() {
-        return new LoggingOneTimeTokenGenerationSuccessHandler();
-    }
-
-    static final class LoggingOneTimeTokenGenerationSuccessHandler implements OneTimeTokenGenerationSuccessHandler {
-
-        private static final String TOKEN_TEMPLATE = """
-		********************************************************
-		
-		Use this one-time token: %s
-		
-		********************************************************""";
-
-        private final Log logger = LogFactory.getLog(this.getClass());
-
-        @Override
-        public void handle(HttpServletRequest request, HttpServletResponse response, OneTimeToken oneTimeToken)
-                throws IOException {
-            this.logger.info(String.format(TOKEN_TEMPLATE, oneTimeToken.getTokenValue()));
-            response.sendRedirect("/login/ott");
-        }
-
-    }
+
+	@Bean
+	SecurityFilterChain app(HttpSecurity http, AuthorizationManager<Object> passwordIn5m) {
+		http.authorizeHttpRequests(
+				(authz) -> authz.requestMatchers("/profile").access(passwordIn5m).anyRequest().authenticated())
+			.formLogin(Customizer.withDefaults())
+			.oneTimeTokenLogin(Customizer.withDefaults());
+		return http.build();
+	}
+
+	@Bean
+	AuthorizationManager<Object> passwordIn5m() {
+		return AuthorizationManagerFactories.multiFactor()
+			.requireFactor((f) -> f.passwordAuthority().validDuration(Duration.ofMinutes(5)))
+			.requireFactor((f) -> f.ottAuthority())
+			.build()
+			.authenticated();
+	}
+
+	@Bean
+	UserDetailsService users() {
+		return new InMemoryUserDetailsManager(
+				User.withDefaultPasswordEncoder().username("user").password("password").authorities("app").build());
+	}
+
+	@Bean
+	OneTimeTokenGenerationSuccessHandler ottSuccessHandler() {
+		return new LoggingOneTimeTokenGenerationSuccessHandler();
+	}
+
+	static final class LoggingOneTimeTokenGenerationSuccessHandler implements OneTimeTokenGenerationSuccessHandler {
+
+		private static final String TOKEN_TEMPLATE = """
+				********************************************************
+
+				Use this one-time token: %s
+
+				********************************************************""";
+
+		private final Log logger = LogFactory.getLog(this.getClass());
+
+		@Override
+		public void handle(HttpServletRequest request, HttpServletResponse response, OneTimeToken oneTimeToken)
+				throws IOException {
+			this.logger.info(String.format(TOKEN_TEMPLATE, oneTimeToken.getTokenValue()));
+			response.sendRedirect("/login/ott");
+		}
+
+	}
 
 }
diff --git a/servlet/spring-boot/java/authentication/mfa/formLogin+ott/src/test/java/example/CustomPagesConfigTests.java b/servlet/spring-boot/java/authentication/mfa/formLogin+ott/src/test/java/example/CustomPagesConfigTests.java
@@ -19,6 +19,7 @@
 @AutoConfigureMockMvc
 @ActiveProfiles("custom-pages")
 class CustomPagesConfigTests {
+
 	@Autowired
 	private MockMvc mvc;
 
@@ -52,4 +53,5 @@ void indexWhenAuthenticatedWithPasswordThenRedirectsToOtt() throws Exception {
 			.andExpect(status().is3xxRedirection())
 			.andExpect(redirectedUrl("http://localhost/auth/ott?factor=ott"));
 	}
+
 }
diff --git a/servlet/spring-boot/java/authentication/mfa/formLogin+ott/src/test/java/example/DefaultConfigTests.java b/servlet/spring-boot/java/authentication/mfa/formLogin+ott/src/test/java/example/DefaultConfigTests.java
@@ -19,6 +19,7 @@
 @AutoConfigureMockMvc
 @ActiveProfiles("default")
 class DefaultConfigTests {
+
 	@Autowired
 	private MockMvc mvc;
 
@@ -52,4 +53,5 @@ void indexWhenAuthenticatedWithPasswordThenRedirectsToOtt() throws Exception {
 			.andExpect(status().is3xxRedirection())
 			.andExpect(redirectedUrl("http://localhost/login?factor=ott"));
 	}
+
 }
diff --git a/servlet/spring-boot/java/authentication/mfa/formLogin+ott/src/test/java/example/ElevatedSecurityPageConfigTests.java b/servlet/spring-boot/java/authentication/mfa/formLogin+ott/src/test/java/example/ElevatedSecurityPageConfigTests.java
@@ -19,6 +19,7 @@
 @AutoConfigureMockMvc
 @ActiveProfiles("elevated-security")
 class ElevatedSecurityPageConfigTests {
+
 	@Autowired
 	private MockMvc mvc;
 
@@ -32,22 +33,19 @@ void indexWhenUnauthenticatedThenRedirectsToLogin() throws Exception {
 	@Test
 	@WithMockUser
 	void indexWhenAuthenticatedButNoFactorsThenAllows() throws Exception {
-		this.mvc.perform(get("/"))
-			.andExpect(status().isOk());
+		this.mvc.perform(get("/")).andExpect(status().isOk());
 	}
 
 	@Test
 	@WithMockUser(authorities = OTT_AUTHORITY)
 	void indexWhenAuthenticatedWithOttThenAllows() throws Exception {
-		this.mvc.perform(get("/"))
-			.andExpect(status().isOk());
+		this.mvc.perform(get("/")).andExpect(status().isOk());
 	}
 
 	@Test
 	@WithMockUser(authorities = PASSWORD_AUTHORITY)
 	void indexWhenAuthenticatedWithPasswordThenAllows() throws Exception {
-		this.mvc.perform(get("/"))
-			.andExpect(status().isOk());
+		this.mvc.perform(get("/")).andExpect(status().isOk());
 	}
 
 	@Test
@@ -61,7 +59,7 @@ void profileWhenAuthenticatedWithPasswordThenRedirectsToOtt() throws Exception {
 	@Test
 	@WithMockUser(authorities = OTT_AUTHORITY)
 	void profileWhenAuthenticatedWithOttThenAllows() throws Exception {
-		this.mvc.perform(get("/profile"))
-			.andExpect(status().isOk());
+		this.mvc.perform(get("/profile")).andExpect(status().isOk());
 	}
+
 }
diff --git a/servlet/spring-boot/java/authentication/mfa/oauth2/src/main/java/example/FormLoginOAuth2Application.java b/servlet/spring-boot/java/authentication/mfa/oauth2/src/main/java/example/FormLoginOAuth2Application.java
@@ -34,10 +34,12 @@ public static void main(String[] args) {
 
 	@Controller
 	static class AppController {
+
 		@GetMapping("/profile")
 		String profile() {
 			return "profile";
 		}
+
 	}
 
 	@Bean
@@ -49,4 +51,5 @@ InMemoryUserDetailsManager userDetailsService() {
 			.build();
 		return new InMemoryUserDetailsManager(user);
 	}
+
 }
diff --git a/servlet/spring-boot/java/authentication/mfa/oauth2/src/main/java/example/SecurityConfig.java b/servlet/spring-boot/java/authentication/mfa/oauth2/src/main/java/example/SecurityConfig.java
@@ -47,7 +47,8 @@ class SecurityConfig {
 	static final String SCOPE = "https://www.googleapis.com/auth/gmail.readonly";
 
 	@Bean
-	public SecurityFilterChain securityFilterChain(HttpSecurity http, AuthenticationEntryPoint oauth2) throws Exception {
+	public SecurityFilterChain securityFilterChain(HttpSecurity http, AuthenticationEntryPoint oauth2)
+			throws Exception {
 		// @formatter:off
 		http
 			.authorizeHttpRequests((authz) -> authz
@@ -79,20 +80,23 @@ static class OAuth2ScopeAuthenticationEntryPoint implements AuthenticationEntryP
 
 		private final OAuth2AuthorizationRequestResolver authorizationRequestResolver;
 
-		private final AuthorizationRequestRepository<OAuth2AuthorizationRequest> authorizationRequestRepository =
-			new HttpSessionOAuth2AuthorizationRequestRepository();
+		private final AuthorizationRequestRepository<OAuth2AuthorizationRequest> authorizationRequestRepository = new HttpSessionOAuth2AuthorizationRequestRepository();
 
 		OAuth2ScopeAuthenticationEntryPoint(ClientRegistrationRepository clients) {
 			this.google = clients.findByRegistrationId("google");
 			this.authorizationRequestResolver = new DefaultOAuth2AuthorizationRequestResolver(clients);
 		}
 
 		@Override
-		public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException ex) throws IOException, ServletException {
-			OAuth2AuthorizationRequest oauth2 = this.authorizationRequestResolver.resolve(request, this.google.getRegistrationId());
+		public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException ex)
+				throws IOException, ServletException {
+			OAuth2AuthorizationRequest oauth2 = this.authorizationRequestResolver.resolve(request,
+					this.google.getRegistrationId());
 			oauth2 = OAuth2AuthorizationRequest.from(oauth2).scopes(Set.of(SCOPE)).build();
 			this.authorizationRequestRepository.saveAuthorizationRequest(oauth2, request, response);
 			response.sendRedirect(oauth2.getAuthorizationRequestUri());
 		}
+
 	}
+
 }
diff --git a/servlet/spring-boot/java/authentication/mfa/oauth2/src/test/java/example/FormLoginOAuth2ApplicationTests.java b/servlet/spring-boot/java/authentication/mfa/oauth2/src/test/java/example/FormLoginOAuth2ApplicationTests.java
@@ -39,23 +39,22 @@ class FormLoginOAuth2ApplicationTests {
 	@Test
 	@WithMockUser
 	void indexWhenAuthenticatedThenAllows() throws Exception {
-		this.mvc.perform(get("/"))
-			.andExpect(status().isOk());
+		this.mvc.perform(get("/")).andExpect(status().isOk());
 	}
 
 	@Test
 	@WithMockUser
 	void profileWhenAuthenticatedThenRedirectsToAuthorizationServer() throws Exception {
 		this.mvc.perform(get("/profile"))
 			.andExpect(status().is3xxRedirection())
-			.andExpect(header().string("Location", startsWith("https://accounts.google.com/o/oauth2/v2/auth?response_type=code&client_id=id&scope=https://www.googleapis.com/auth/gmail.readonly")));
+			.andExpect(header().string("Location", startsWith(
+					"https://accounts.google.com/o/oauth2/v2/auth?response_type=code&client_id=id&scope=https://www.googleapis.com/auth/gmail.readonly")));
 	}
 
 	@Test
 	@WithMockUser(authorities = "SCOPE_" + SecurityConfig.SCOPE)
 	void profileWhenAuthenticatedWithScopeThenAllows() throws Exception {
-		this.mvc.perform(get("/profile"))
-			.andExpect(status().isOk());
+		this.mvc.perform(get("/profile")).andExpect(status().isOk());
 	}
 
 }
diff --git a/servlet/spring-boot/java/authentication/mfa/x509+formLogin/src/main/java/example/SecurityConfig.java b/servlet/spring-boot/java/authentication/mfa/x509+formLogin/src/main/java/example/SecurityConfig.java
@@ -47,12 +47,7 @@ SecurityFilterChain web(HttpSecurity http) throws Exception {
 	@Bean
 	public UserDetailsService users() {
 		return new InMemoryUserDetailsManager(
-			User.withDefaultPasswordEncoder()
-				.username("josh")
-				.password("password")
-				.authorities("app")
-				.build()
-		);
+				User.withDefaultPasswordEncoder().username("josh").password("password").authorities("app").build());
 	}
 
 }
diff --git a/servlet/spring-boot/java/authentication/mfa/x509+formLogin/src/test/java/example/MfaApplicationTests.java b/servlet/spring-boot/java/authentication/mfa/x509+formLogin/src/test/java/example/MfaApplicationTests.java
@@ -50,8 +50,7 @@ void indexWhenUnauthenticatedThenRedirectsToLogin() throws Exception {
 	@Test
 	@WithMockUser
 	void indexWhenAuthenticatedButNoFactorsThenForbidden() throws Exception {
-		this.mvc.perform(get("/"))
-			.andExpect(status().isForbidden());
+		this.mvc.perform(get("/")).andExpect(status().isForbidden());
 	}
 
 	@Test
@@ -65,9 +64,7 @@ void indexWhenAuthenticatedWithX509ThenRedirectsToLogin() throws Exception {
 	@Test
 	@WithMockUser(authorities = PASSWORD_AUTHORITY)
 	void indexWhenAuthenticatedWithPasswordThenForbidden() throws Exception {
-		this.mvc.perform(get("/"))
-			.andExpect(status().isForbidden());
+		this.mvc.perform(get("/")).andExpect(status().isForbidden());
 	}
 
-
 }
diff --git a/servlet/spring-boot/java/authentication/mfa/x509+webauthn/src/main/java/example/SecurityConfig.java b/servlet/spring-boot/java/authentication/mfa/x509+webauthn/src/main/java/example/SecurityConfig.java
diff --git a/servlet/spring-boot/java/authentication/mfa/x509+webauthn/src/test/java/example/X509WebAuthnMfaApplicationTests.java b/servlet/spring-boot/java/authentication/mfa/x509+webauthn/src/test/java/example/X509WebAuthnMfaApplicationTests.java

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`@AutoConfigureMockMvc`
`20`	`20`	`@ActiveProfiles("custom-pages")`
`21`	`21`	`class CustomPagesConfigTests {`
	`22`	`+`
`22`	`23`	`@Autowired`
`23`	`24`	`private MockMvc mvc;`
`24`	`25`
`@@ -52,4 +53,5 @@ void indexWhenAuthenticatedWithPasswordThenRedirectsToOtt() throws Exception {`
`52`	`53`	`.andExpect(status().is3xxRedirection())`
`53`	`54`	`.andExpect(redirectedUrl("http://localhost/auth/ott?factor=ott"));`
`54`	`55`	`}`
	`56`	`+`
`55`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,10 +34,12 @@ public static void main(String[] args) {`
`34`	`34`
`35`	`35`	`@Controller`
`36`	`36`	`static class AppController {`
	`37`	`+`
`37`	`38`	`@GetMapping("/profile")`
`38`	`39`	`String profile() {`
`39`	`40`	`return "profile";`
`40`	`41`	`}`
	`42`	`+`
`41`	`43`	`}`
`42`	`44`
`43`	`45`	`@Bean`
`@@ -49,4 +51,5 @@ InMemoryUserDetailsManager userDetailsService() {`
`49`	`51`	`.build();`
`50`	`52`	`return new InMemoryUserDetailsManager(user);`
`51`	`53`	`}`
	`54`	`+`
`52`	`55`	`}`