From 19a56e1216e1c9643b0a79c5767216ae2820327b Mon Sep 17 00:00:00 2001 From: twilight0620 Date: Mon, 18 Jul 2022 10:07:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=E5=87=BA=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../edgegallery/website/config/AuthentionSuccessFilter.java | 3 --- .../website/config/ClientWebSecurityConfigurer.java | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/edgegallery/website/config/AuthentionSuccessFilter.java b/src/main/java/org/edgegallery/website/config/AuthentionSuccessFilter.java index b23be1f..89c311f 100644 --- a/src/main/java/org/edgegallery/website/config/AuthentionSuccessFilter.java +++ b/src/main/java/org/edgegallery/website/config/AuthentionSuccessFilter.java @@ -13,15 +13,12 @@ import org.edgegallery.website.controller.JwtServer; import org.edgegallery.website.controller.OAuthClientController; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.oauth2.provider.authentication.OAuth2AuthenticationDetails; public class AuthentionSuccessFilter implements Filter { private static final Logger LOGGER = LoggerFactory.getLogger(OAuthClientController.class); - @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { diff --git a/src/main/java/org/edgegallery/website/config/ClientWebSecurityConfigurer.java b/src/main/java/org/edgegallery/website/config/ClientWebSecurityConfigurer.java index 7327caf..115f3f9 100644 --- a/src/main/java/org/edgegallery/website/config/ClientWebSecurityConfigurer.java +++ b/src/main/java/org/edgegallery/website/config/ClientWebSecurityConfigurer.java @@ -96,7 +96,7 @@ public class ClientWebSecurityConfigurer extends WebSecurityConfigurerAdapter { .antMatchers(HttpMethod.GET, "/mecm-inventory/inventory/v1/mechosts").permitAll() .antMatchers(HttpMethod.GET, "/health").permitAll().antMatchers("/webssh").permitAll() .antMatchers("/wsserver/**").permitAll().anyRequest().authenticated().and() - .addFilterBefore(new AuthentionSuccessFilter(), ExceptionTranslationFilter.class).logout() + .addFilterBefore(oauth2ClientAuthenticationProcessingFilter(), ExceptionTranslationFilter.class).logout() .addLogoutHandler(new LogoutHandler() { @Override public void logout(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, @@ -114,6 +114,7 @@ public class ClientWebSecurityConfigurer extends WebSecurityConfigurerAdapter { /** * oauth2ClientAuthenticationProcessingFilter. */ + @Bean public OAuth2ClientAuthenticationProcessingFilter oauth2ClientAuthenticationProcessingFilter() { LOGGER.info("oauth2ClientAuthenticationProcessingFilter in."); OAuth2ClientAuthenticationProcessingFilter filter = new OAuth2ClientAuthenticationProcessingFilter("/login"); -- Gitee