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

Update to Spring Framework 6.0

Browse Source 
Issue gh-10360
This commit is contained in:
Marcus Da Coregio
2021-10-11 16:01:02 -03:00
parent 4f0cc132f6
commit db60df2f9c
549 changed files with 1241 additions and 1236 deletions
Download Patch File Download Diff File Expand all files Collapse all files
messaging/spring-security-messaging.gradle
+1 -1
View File
@@ -12,7 +12,7 @@ dependencies {
optional project(':spring-security-web')
optional 'org.springframework:spring-websocket'
optional 'io.projectreactor:reactor-core'
optional 'javax.servlet:javax.servlet-api'
optional 'jakarta.servlet:jakarta.servlet-api'
testImplementation project(path: ':spring-security-core', configuration: 'tests')
testImplementation 'commons-codec:commons-codec'
messaging/src/main/java/org/springframework/security/messaging/context/SecurityContextChannelInterceptor.java
+2 -3
View File
@@ -22,7 +22,7 @@ import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.MessageHandler;
import org.springframework.messaging.simp.SimpMessageHeaderAccessor;
import org.springframework.messaging.support.ChannelInterceptorAdapter;
import org.springframework.messaging.support.ChannelInterceptor;
import org.springframework.messaging.support.ExecutorChannelInterceptor;
import org.springframework.security.authentication.AnonymousAuthenticationToken;
import org.springframework.security.core.Authentication;
@@ -40,8 +40,7 @@ import org.springframework.util.Assert;
* @author Rob Winch
* @since 4.0
*/
public final class SecurityContextChannelInterceptor extends ChannelInterceptorAdapter
implements ExecutorChannelInterceptor {
public final class SecurityContextChannelInterceptor implements ExecutorChannelInterceptor, ChannelInterceptor {
private static final SecurityContext EMPTY_CONTEXT = SecurityContextHolder.createEmptyContext();
messaging/src/main/java/org/springframework/security/messaging/web/csrf/CsrfChannelInterceptor.java
+5 -5
View File
@@ -22,7 +22,7 @@ import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.simp.SimpMessageHeaderAccessor;
import org.springframework.messaging.simp.SimpMessageType;
import org.springframework.messaging.support.ChannelInterceptorAdapter;
import org.springframework.messaging.support.ChannelInterceptor;
import org.springframework.security.messaging.util.matcher.MessageMatcher;
import org.springframework.security.messaging.util.matcher.SimpMessageTypeMatcher;
import org.springframework.security.web.csrf.CsrfToken;
@@ -30,14 +30,14 @@ import org.springframework.security.web.csrf.InvalidCsrfTokenException;
import org.springframework.security.web.csrf.MissingCsrfTokenException;
/**
* {@link ChannelInterceptorAdapter} that validates that a valid CSRF is included in the
* header of any {@link SimpMessageType#CONNECT} message. The expected {@link CsrfToken}
* is populated by CsrfTokenHandshakeInterceptor.
* {@link ChannelInterceptor} that validates that a valid CSRF is included in the header
* of any {@link SimpMessageType#CONNECT} message. The expected {@link CsrfToken} is
* populated by CsrfTokenHandshakeInterceptor.
*
* @author Rob Winch
* @since 4.0
*/
public final class CsrfChannelInterceptor extends ChannelInterceptorAdapter {
public final class CsrfChannelInterceptor implements ChannelInterceptor {
private final MessageMatcher<Object> matcher = new SimpMessageTypeMatcher(SimpMessageType.CONNECT);
messaging/src/main/java/org/springframework/security/messaging/web/socket/server/CsrfTokenHandshakeInterceptor.java
+1 -1
View File
@@ -18,7 +18,7 @@ package org.springframework.security.messaging.web.socket.server;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import org.springframework.http.server.ServerHttpRequest;
import org.springframework.http.server.ServerHttpResponse;