SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update spring security: 5.6.0-M3

Browse Source
This commit is contained in:
Jonatan Ivanov
2021-09-30 15:22:34 -07:00
parent 4f30b5e012
commit 565d00c73a
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -77,7 +77,7 @@
<opentracing.version>0.32.0</opentracing.version>
<spring-security-boot-autoconfigure.version>2.3.4.RELEASE</spring-security-boot-autoconfigure.version>
<spring-security-oauth2.version>2.2.0.RELEASE</spring-security-oauth2.version>
<spring-security-version>5.6.0-M2</spring-security-version>
<spring-security-version>5.6.0-M3</spring-security-version>
<disable.nohttp.checks>false</disable.nohttp.checks>
<okhttp.version>4.9.0</okhttp.version>
<mockwebserver.version>4.8.0</mockwebserver.version>

4
spring-cloud-sleuth-instrumentation/src/main/java/org/springframework/cloud/sleuth/instrument/security/TracingSecurityContextChangedListener.java
View File

@@ -51,8 +51,8 @@ public class TracingSecurityContextChangedListener implements SecurityContextCha
@Override
public void securityContextChanged(SecurityContextChangedEvent securityContextChangedEvent) {
SecurityContext previousContext = securityContextChangedEvent.getPreviousContext();
SecurityContext currentContext = securityContextChangedEvent.getCurrentContext();
SecurityContext previousContext = securityContextChangedEvent.getOldContext();
SecurityContext currentContext = securityContextChangedEvent.getNewContext();
Authentication previousAuthentication = previousContext != null ? previousContext.getAuthentication() : null;
Authentication currentAuthentication = currentContext != null ? currentContext.getAuthentication() : null;

6
tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/security/SpringSecurityTests.java
View File

@@ -32,8 +32,10 @@ import org.springframework.cloud.sleuth.test.TestSpanHandler;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.context.ListeningSecurityContextHolderStrategy;
import org.springframework.security.core.context.SecurityContextChangedListener;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.context.SecurityContextHolderStrategy;
import org.springframework.security.core.userdetails.User;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.provisioning.InMemoryUserDetailsManager;
@@ -106,7 +108,9 @@ public abstract class SpringSecurityTests {
// TODO: Remove this after Spring Boot auto-configuration is available
Config(List<SecurityContextChangedListener> listeners) {
listeners.forEach(SecurityContextHolder::addListener);
SecurityContextHolderStrategy strategy = new ListeningSecurityContextHolderStrategy(
SecurityContextHolder.getContextHolderStrategy(), listeners);
SecurityContextHolder.setContextHolderStrategy(strategy);
}
@Bean