Cwikius-Spring/spring-security
1
0
Fork 0
mirror of synced 2026-05-22 21:33:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reformat code using spring-javaformat

Browse Source 
Run `./gradlew format` to reformat all java files.

Issue gh-8945
This commit is contained in:
Phillip Webb
2020-08-10 16:39:17 -05:00
committed by Rob Winch
parent 81d9c6cac5
commit b7fc18262d
2487 changed files with 41506 additions and 46548 deletions
Download Patch File Download Diff File Expand all files Collapse all files
itest/web/src/integration-test/java/org/springframework/security/integration/AbstractWebServerIntegrationTests.java
+3 -4
View File
@@ -33,6 +33,7 @@ import org.springframework.web.context.support.XmlWebApplicationContext;
* @author Luke Taylor
*/
public abstract class AbstractWebServerIntegrationTests {
protected ConfigurableApplicationContext context;
@After
@@ -53,9 +54,7 @@ public abstract class AbstractWebServerIntegrationTests {
context.refresh();
this.context = context;
return MockMvcBuilders
.webAppContextSetup(context)
.apply(springSecurity())
.build();
return MockMvcBuilders.webAppContextSetup(context).apply(springSecurity()).build();
}
}
itest/web/src/integration-test/java/org/springframework/security/integration/BasicAuthenticationTests.java
+8 -8
View File
@@ -28,17 +28,17 @@ public class BasicAuthenticationTests extends AbstractWebServerIntegrationTests
@Test
public void httpBasicWhenAuthenticationRequiredAndNotAuthenticatedThen401() throws Exception {
MockMvc mockMvc = createMockMvc("classpath:/spring/http-security-basic.xml", "classpath:/spring/in-memory-provider.xml", "classpath:/spring/testapp-servlet.xml");
mockMvc.perform(get("/secure/index"))
.andExpect(status().isUnauthorized());
MockMvc mockMvc = createMockMvc("classpath:/spring/http-security-basic.xml",
"classpath:/spring/in-memory-provider.xml", "classpath:/spring/testapp-servlet.xml");
mockMvc.perform(get("/secure/index")).andExpect(status().isUnauthorized());
}
@Test
public void httpBasicWhenProvidedThen200() throws Exception {
MockMvc mockMvc = createMockMvc("classpath:/spring/http-security-basic.xml", "classpath:/spring/in-memory-provider.xml", "classpath:/spring/testapp-servlet.xml");
MockHttpServletRequestBuilder request = get("/secure/index")
.with(httpBasic("johnc", "johncspassword"));
mockMvc.perform(request)
.andExpect(status().isOk());
MockMvc mockMvc = createMockMvc("classpath:/spring/http-security-basic.xml",
"classpath:/spring/in-memory-provider.xml", "classpath:/spring/testapp-servlet.xml");
MockHttpServletRequestBuilder request = get("/secure/index").with(httpBasic("johnc", "johncspassword"));
mockMvc.perform(request).andExpect(status().isOk());
}
}
itest/web/src/integration-test/java/org/springframework/security/integration/ConcurrentSessionManagementTests.java
+23 -34
View File
@@ -46,55 +46,44 @@ public class ConcurrentSessionManagementTests extends AbstractWebServerIntegrati
final MockHttpSession session1 = new MockHttpSession();
final MockHttpSession session2 = new MockHttpSession();
MockMvc mockMvc = createMockMvc("classpath:/spring/http-security-concurrency.xml", "classpath:/spring/in-memory-provider.xml", "classpath:/spring/testapp-servlet.xml");
MockMvc mockMvc = createMockMvc("classpath:/spring/http-security-concurrency.xml",
"classpath:/spring/in-memory-provider.xml", "classpath:/spring/testapp-servlet.xml");
mockMvc.perform(get("/secure/index").session(session1))
.andExpect(status().is3xxRedirection());
mockMvc.perform(get("/secure/index").session(session1)).andExpect(status().is3xxRedirection());
MockHttpServletRequestBuilder login1 = login()
.session(session1);
mockMvc.
perform(login1)
.andExpect(authenticated().withUsername("jimi"));
MockHttpServletRequestBuilder login1 = login().session(session1);
mockMvc.perform(login1).andExpect(authenticated().withUsername("jimi"));
MockHttpServletRequestBuilder login2 = login()
.session(session2);
mockMvc.perform(login2)
.andExpect(redirectedUrl("/login.jsp?login_error=true"));
MockHttpServletRequestBuilder login2 = login().session(session2);
mockMvc.perform(login2).andExpect(redirectedUrl("/login.jsp?login_error=true"));
Exception exception = (Exception) session2.getAttribute("SPRING_SECURITY_LAST_EXCEPTION");
assertThat(exception).isNotNull();
assertThat(exception.getMessage()).contains("Maximum sessions of 1 for this principal exceeded");
// Now logout to kill first session
mockMvc.perform(post("/logout").with(csrf()))
.andExpect(status().is3xxRedirection())
.andDo(result -> context.publishEvent(new SessionDestroyedEvent(session1) {
@Override
public List<SecurityContext> getSecurityContexts() {
return Collections.emptyList();
}
mockMvc.perform(post("/logout").with(csrf())).andExpect(status().is3xxRedirection())
.andDo(result -> context.publishEvent(new SessionDestroyedEvent(session1) {
@Override
public List<SecurityContext> getSecurityContexts() {
return Collections.emptyList();
}
@Override
public String getId() {
return session1.getId();
}
}));
@Override
public String getId() {
return session1.getId();
}
}));
// Try second session again
login2 = login()
.session(session2);
mockMvc.perform(login2)
.andExpect(authenticated().withUsername("jimi"));
login2 = login().session(session2);
mockMvc.perform(login2).andExpect(authenticated().withUsername("jimi"));
mockMvc.perform(get("/secure/index").session(session2))
.andExpect(content().string(containsString("A Secure Page")));
.andExpect(content().string(containsString("A Secure Page")));
}
private MockHttpServletRequestBuilder login() {
return post("/login")
.param("username", "jimi")
.param("password", "jimispassword")
.with(csrf());
return post("/login").param("username", "jimi").param("password", "jimispassword").with(csrf());
}
}
itest/web/src/main/java/org/springframework/security/itest/web/TestController.java
+1
View File
@@ -38,4 +38,5 @@ public class TestController {
public String secure() {
return "A Secure Page";
}
}