From d4f150414533b95324b2a1c8a81c11d92efb71ec Mon Sep 17 00:00:00 2001 From: xufenglei <xufenglei> Date: Tue, 13 Mar 2018 16:25:20 +0800 Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2.git --- src/main/java/com/moral/security/config/WebSecurityConfig.java | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/moral/security/config/WebSecurityConfig.java b/src/main/java/com/moral/security/config/WebSecurityConfig.java index 41b91dc..c237db9 100644 --- a/src/main/java/com/moral/security/config/WebSecurityConfig.java +++ b/src/main/java/com/moral/security/config/WebSecurityConfig.java @@ -1,6 +1,7 @@ package com.moral.security.config; import com.fasterxml.jackson.databind.ObjectMapper; +import com.moral.common.util.ResourceUtil; import com.moral.security.CustomCorsFilter; import com.moral.security.RestAuthenticationEntryPoint; import com.moral.security.auth.login.LoginAuthenticationProvider; @@ -9,6 +10,8 @@ import com.moral.security.auth.jwt.JwtTokenAuthenticationProcessingFilter; import com.moral.security.auth.jwt.SkipPathRequestMatcher; import com.moral.security.auth.jwt.extractor.TokenExtractor; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -22,6 +25,7 @@ import org.springframework.security.web.authentication.AuthenticationSuccessHandler; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -36,6 +40,8 @@ @EnableWebSecurity public class WebSecurityConfig extends WebSecurityConfigurerAdapter { public static final String AUTHENTICATION_HEADER_NAME = "X-Authorization"; + public static final String REFRESH_TOKEN_HEADER_NAME = "X-Refrsh-Token"; + public static final String AUTHENTICATION_PARAM_NAME = "_token"; public static final String AUTHENTICATION_URL = "/auth/login"; public static final String REFRESH_TOKEN_URL = "/auth/token"; public static final String API_ROOT_URL = "/**/*"; @@ -88,12 +94,19 @@ @Override protected void configure(HttpSecurity http) throws Exception { - List<String> permitAllEndpointList = Arrays.asList( - AUTHENTICATION_URL, - REFRESH_TOKEN_URL, - "/screen/**" - ); + List<String> permitAllEndpointList = new ArrayList<>(Arrays.asList( + AUTHENTICATION_URL, + REFRESH_TOKEN_URL + )); + // ������������������url + String noFilters = ResourceUtil.getValue("noFilters"); + if(!StringUtils.isBlank(noFilters)){ + String[] noFilterArray = noFilters.split(","); + if(!ArrayUtils.isEmpty(noFilterArray)){ + permitAllEndpointList.addAll(Arrays.asList(noFilterArray)); + } + } http .csrf().disable() // We don't need CSRF for JWT based authentication .exceptionHandling() -- Gitblit v1.8.0