From df499ee416961f98453b9c9654a01b6c2af25afd Mon Sep 17 00:00:00 2001 From: sunjinghan Date: Fri, 18 Sep 2020 11:34:01 +0800 Subject: [PATCH] =?UTF-8?q?Title:=E4=BF=AE=E6=94=B9=E5=8D=95=E7=82=B9?= =?UTF-8?q?=E6=B3=A8=E9=94=80=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20Issue-ID:appstore=E6=A8=A1=E5=9D=97=E9=80=80=E5=87=BA?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=90=8E=EF=BC=8C=E5=9C=A8develop=E9=87=8C?= =?UTF-8?q?=E9=9D=A2=E7=82=B9=E5=87=BB=E6=8F=92=E4=BB=B6=E5=88=97=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=E4=BE=9D=E7=84=B6=E5=8F=AF=E4=BB=A5=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=EF=BC=8C=E6=9F=A5=E7=9C=8B=E6=8F=92=E4=BB=B6=E5=88=97=E8=A1=A8?= =?UTF-8?q?=20https://gitee.com/OSDT/dashboard/issues=3Fid=3DI1VG05?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Detail: --- .../website/config/ClientWebSecurityConfigurer.java | 6 ++++-- .../website/controller/OAuthClientController.java | 3 +-- .../org/edgegallery/website/TestOAuthClientController.java | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/edgegallery/website/config/ClientWebSecurityConfigurer.java b/src/main/java/org/edgegallery/website/config/ClientWebSecurityConfigurer.java index 6818c4a..30deefc 100644 --- a/src/main/java/org/edgegallery/website/config/ClientWebSecurityConfigurer.java +++ b/src/main/java/org/edgegallery/website/config/ClientWebSecurityConfigurer.java @@ -75,10 +75,12 @@ public class ClientWebSecurityConfigurer extends WebSecurityConfigurerAdapter { @Override public void configure(final HttpSecurity http) throws Exception { - http.authorizeRequests().antMatchers("/login", "/auth/logout").permitAll().anyRequest() + http.authorizeRequests().antMatchers("/login", "/auth/logout").permitAll() + .anyRequest() .authenticated().and() .addFilterBefore(oauth2ClientAuthenticationProcessingFilter(), BasicAuthenticationFilter.class).logout() - .logoutUrl("/logout").logoutSuccessUrl(authServerAddress + "/auth/logout").and().csrf() + .logoutUrl("/logout").logoutSuccessUrl(authServerAddress + "/auth/logout") + .and().csrf() .csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse()); } diff --git a/src/main/java/org/edgegallery/website/controller/OAuthClientController.java b/src/main/java/org/edgegallery/website/controller/OAuthClientController.java index 1c944af..e819a02 100644 --- a/src/main/java/org/edgegallery/website/controller/OAuthClientController.java +++ b/src/main/java/org/edgegallery/website/controller/OAuthClientController.java @@ -72,8 +72,7 @@ public class OAuthClientController { /** * logout. */ - @RequestMapping(value = "/logout", method = RequestMethod.POST, consumes = "application/json", - produces = "application/json") + @RequestMapping(value = "/logout", method = RequestMethod.GET, produces = "application/json") @ApiOperation(value = "logout", response = String.class, notes = "Logout by global sessionId") public ResponseEntity logout(HttpServletRequest request) { String ssoSessionId = request.getParameter("ssoSessionId"); diff --git a/src/test/java/org/edgegallery/website/TestOAuthClientController.java b/src/test/java/org/edgegallery/website/TestOAuthClientController.java index 9b9f44b..49bf8a8 100644 --- a/src/test/java/org/edgegallery/website/TestOAuthClientController.java +++ b/src/test/java/org/edgegallery/website/TestOAuthClientController.java @@ -99,7 +99,7 @@ public class TestOAuthClientController { @Test public void should_successfully_when_logout() throws Exception { - mvc.perform(MockMvcRequestBuilders.post("/auth/logout").contentType(MediaType.APPLICATION_JSON_VALUE) + mvc.perform(MockMvcRequestBuilders.get("/auth/logout").contentType(MediaType.APPLICATION_JSON_VALUE) .header("ssoSessionId", "test_sso_session_id") .accept(MediaType.APPLICATION_JSON_VALUE)).andExpect(MockMvcResultMatchers.status().isOk()); } -- Gitee