Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix RSocket Package Tangle 

Issue gh-7360
This commit is contained in:
Rob Winch 2019-09-05 16:27:57 -05:00
parent 2a1f3f6aa7
commit 9639962e27
34 changed files with 98 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
config/src/main/java/org/springframework/security/config/annotation/rsocket/RSocketSecurity.java
View File

@ -28,18 +28,18 @@ import org.springframework.security.authorization.ReactiveAuthorizationManager;
import org.springframework.security.config.Customizer;
import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder;
import org.springframework.security.oauth2.server.resource.authentication.JwtReactiveAuthenticationManager;
import org.springframework.security.rsocket.interceptor.PayloadInterceptor;
import org.springframework.security.rsocket.interceptor.PayloadSocketAcceptorInterceptor;
import org.springframework.security.rsocket.interceptor.authentication.AnonymousPayloadInterceptor;
import org.springframework.security.rsocket.interceptor.authentication.AuthenticationPayloadInterceptor;
import org.springframework.security.rsocket.interceptor.authentication.BearerPayloadExchangeConverter;
import org.springframework.security.rsocket.interceptor.authorization.AuthorizationPayloadInterceptor;
import org.springframework.security.rsocket.interceptor.authorization.PayloadExchangeMatcherReactiveAuthorizationManager;
import org.springframework.security.rsocket.util.PayloadExchangeAuthorizationContext;
import org.springframework.security.rsocket.util.PayloadExchangeMatcher;
import org.springframework.security.rsocket.util.PayloadExchangeMatcherEntry;
import org.springframework.security.rsocket.util.PayloadExchangeMatchers;
import org.springframework.security.rsocket.util.RoutePayloadExchangeMatcher;
import org.springframework.security.rsocket.PayloadInterceptor;
import org.springframework.security.rsocket.PayloadSocketAcceptorInterceptor;
import org.springframework.security.rsocket.authentication.AnonymousPayloadInterceptor;
import org.springframework.security.rsocket.authentication.AuthenticationPayloadInterceptor;
import org.springframework.security.rsocket.authentication.BearerPayloadExchangeConverter;
import org.springframework.security.rsocket.authorization.AuthorizationPayloadInterceptor;
import org.springframework.security.rsocket.authorization.PayloadExchangeMatcherReactiveAuthorizationManager;
import org.springframework.security.rsocket.util.matcher.PayloadExchangeAuthorizationContext;
import org.springframework.security.rsocket.util.matcher.PayloadExchangeMatcher;
import org.springframework.security.rsocket.util.matcher.PayloadExchangeMatcherEntry;
import org.springframework.security.rsocket.util.matcher.PayloadExchangeMatchers;
import org.springframework.security.rsocket.util.matcher.RoutePayloadExchangeMatcher;
import reactor.core.publisher.Mono;
import java.util.ArrayList;

2
config/src/test/java/org/springframework/security/config/annotation/rsocket/JwtITests.java
View File

@ -34,7 +34,7 @@ import org.springframework.security.config.Customizer;
import org.springframework.security.oauth2.core.oidc.IdTokenClaimNames;
import org.springframework.security.oauth2.jwt.Jwt;
import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder;
import org.springframework.security.rsocket.interceptor.PayloadSocketAcceptorInterceptor;
import org.springframework.security.rsocket.PayloadSocketAcceptorInterceptor;
import org.springframework.security.rsocket.metadata.BasicAuthenticationEncoder;
import org.springframework.security.rsocket.metadata.BearerTokenMetadata;
import org.springframework.stereotype.Controller;

4
config/src/test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerConnectionITests.java
View File

@ -32,12 +32,10 @@ import org.springframework.messaging.rsocket.RSocketRequester;
import org.springframework.messaging.rsocket.RSocketStrategies;
import org.springframework.messaging.rsocket.annotation.support.RSocketMessageHandler;
import org.springframework.security.config.Customizer;
import org.springframework.security.config.annotation.rsocket.EnableRSocketSecurity;
import org.springframework.security.config.annotation.rsocket.RSocketSecurity;
import org.springframework.security.core.userdetails.MapReactiveUserDetailsService;
import org.springframework.security.core.userdetails.User;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.rsocket.interceptor.PayloadSocketAcceptorInterceptor;
import org.springframework.security.rsocket.PayloadSocketAcceptorInterceptor;
import org.springframework.security.rsocket.metadata.BasicAuthenticationEncoder;
import org.springframework.security.rsocket.metadata.UsernamePasswordMetadata;
import org.springframework.stereotype.Controller;

4
config/src/test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerITests.java
View File

@ -33,12 +33,10 @@ import org.springframework.messaging.rsocket.RSocketRequester;
import org.springframework.messaging.rsocket.RSocketStrategies;
import org.springframework.messaging.rsocket.annotation.support.RSocketMessageHandler;
import org.springframework.security.config.Customizer;
import org.springframework.security.config.annotation.rsocket.EnableRSocketSecurity;
import org.springframework.security.config.annotation.rsocket.RSocketSecurity;
import org.springframework.security.core.userdetails.MapReactiveUserDetailsService;
import org.springframework.security.core.userdetails.User;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.rsocket.interceptor.PayloadSocketAcceptorInterceptor;
import org.springframework.security.rsocket.PayloadSocketAcceptorInterceptor;
import org.springframework.security.rsocket.metadata.BasicAuthenticationEncoder;
import org.springframework.security.rsocket.metadata.UsernamePasswordMetadata;
import org.springframework.stereotype.Controller;

2
rsocket/src/main/java/org/springframework/security/rsocket/interceptor/ContextPayloadInterceptorChain.java → rsocket/src/main/java/org/springframework/security/rsocket/ContextPayloadInterceptorChain.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.security.rsocket.interceptor;
package org.springframework.security.rsocket;
import reactor.core.publisher.Mono;
import reactor.util.context.Context;

2
rsocket/src/main/java/org/springframework/security/rsocket/interceptor/DefaultPayloadExchange.java → rsocket/src/main/java/org/springframework/security/rsocket/DefaultPayloadExchange.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.security.rsocket.interceptor;
package org.springframework.security.rsocket;
import io.rsocket.Payload;
import org.springframework.util.Assert;

2
rsocket/src/main/java/org/springframework/security/rsocket/interceptor/PayloadExchange.java → rsocket/src/main/java/org/springframework/security/rsocket/PayloadExchange.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.security.rsocket.interceptor;
package org.springframework.security.rsocket;
import io.rsocket.Payload;
import org.springframework.util.MimeType;

2
rsocket/src/main/java/org/springframework/security/rsocket/interceptor/PayloadExchangeType.java → rsocket/src/main/java/org/springframework/security/rsocket/PayloadExchangeType.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.security.rsocket.interceptor;
package org.springframework.security.rsocket;
/**
* The {@link PayloadExchange} type

2
rsocket/src/main/java/org/springframework/security/rsocket/interceptor/PayloadInterceptor.java → rsocket/src/main/java/org/springframework/security/rsocket/PayloadInterceptor.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.security.rsocket.interceptor;
package org.springframework.security.rsocket;
import reactor.core.publisher.Mono;

2
rsocket/src/main/java/org/springframework/security/rsocket/interceptor/PayloadInterceptorChain.java → rsocket/src/main/java/org/springframework/security/rsocket/PayloadInterceptorChain.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.security.rsocket.interceptor;
package org.springframework.security.rsocket;
import reactor.core.publisher.Mono;

2
rsocket/src/main/java/org/springframework/security/rsocket/interceptor/PayloadInterceptorRSocket.java → rsocket/src/main/java/org/springframework/security/rsocket/PayloadInterceptorRSocket.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.security.rsocket.interceptor;
package org.springframework.security.rsocket;
import io.rsocket.Payload;
import io.rsocket.RSocket;

2
rsocket/src/main/java/org/springframework/security/rsocket/interceptor/PayloadSocketAcceptor.java → rsocket/src/main/java/org/springframework/security/rsocket/PayloadSocketAcceptor.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.security.rsocket.interceptor;
package org.springframework.security.rsocket;
import io.rsocket.ConnectionSetupPayload;
import io.rsocket.Payload;

2
rsocket/src/main/java/org/springframework/security/rsocket/interceptor/PayloadSocketAcceptorInterceptor.java → rsocket/src/main/java/org/springframework/security/rsocket/PayloadSocketAcceptorInterceptor.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.security.rsocket.interceptor;
package org.springframework.security.rsocket;
import io.rsocket.SocketAcceptor;
import io.rsocket.metadata.WellKnownMimeType;

8
rsocket/src/main/java/org/springframework/security/rsocket/interceptor/authentication/AnonymousPayloadInterceptor.java → rsocket/src/main/java/org/springframework/security/rsocket/authentication/AnonymousPayloadInterceptor.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.security.rsocket.interceptor.authentication;
package org.springframework.security.rsocket.authentication;
import org.springframework.security.authentication.AnonymousAuthenticationToken;
import org.springframework.security.core.GrantedAuthority;
@ -22,9 +22,9 @@ import org.springframework.security.core.authority.AuthorityUtils;
import org.springframework.security.core.context.ReactiveSecurityContextHolder;
import org.springframework.util.Assert;
import reactor.core.publisher.Mono;
import org.springframework.security.rsocket.interceptor.PayloadInterceptorChain;
import org.springframework.security.rsocket.interceptor.PayloadExchange;
import org.springframework.security.rsocket.interceptor.PayloadInterceptor;
import org.springframework.security.rsocket.PayloadInterceptorChain;
import org.springframework.security.rsocket.PayloadExchange;
import org.springframework.security.rsocket.PayloadInterceptor;
import java.util.List;

8
rsocket/src/main/java/org/springframework/security/rsocket/interceptor/authentication/AuthenticationPayloadInterceptor.java → rsocket/src/main/java/org/springframework/security/rsocket/authentication/AuthenticationPayloadInterceptor.java
View File

@ -14,14 +14,14 @@
* limitations under the License.
*/
package org.springframework.security.rsocket.interceptor.authentication;
package org.springframework.security.rsocket.authentication;
import org.springframework.security.authentication.ReactiveAuthenticationManager;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.ReactiveSecurityContextHolder;
import org.springframework.security.rsocket.interceptor.PayloadExchange;
import org.springframework.security.rsocket.interceptor.PayloadInterceptor;
import org.springframework.security.rsocket.interceptor.PayloadInterceptorChain;
import org.springframework.security.rsocket.PayloadExchange;
import org.springframework.security.rsocket.PayloadInterceptor;
import org.springframework.security.rsocket.PayloadInterceptorChain;
import org.springframework.util.Assert;
import reactor.core.publisher.Mono;

4
rsocket/src/main/java/org/springframework/security/rsocket/interceptor/authentication/BasicAuthenticationPayloadExchangeConverter.java → rsocket/src/main/java/org/springframework/security/rsocket/authentication/BasicAuthenticationPayloadExchangeConverter.java
View File

@ -14,14 +14,14 @@
* limitations under the License.
*/
package org.springframework.security.rsocket.interceptor.authentication;
package org.springframework.security.rsocket.authentication;
import io.rsocket.metadata.WellKnownMimeType;
import org.springframework.messaging.rsocket.DefaultMetadataExtractor;
import org.springframework.messaging.rsocket.MetadataExtractor;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.security.rsocket.interceptor.PayloadExchange;
import org.springframework.security.rsocket.PayloadExchange;
import org.springframework.security.rsocket.metadata.BasicAuthenticationDecoder;
import org.springframework.security.rsocket.metadata.UsernamePasswordMetadata;
import org.springframework.util.MimeType;

4
rsocket/src/main/java/org/springframework/security/rsocket/interceptor/authentication/BearerPayloadExchangeConverter.java → rsocket/src/main/java/org/springframework/security/rsocket/authentication/BearerPayloadExchangeConverter.java
View File

@ -14,13 +14,13 @@
* limitations under the License.
*/
package org.springframework.security.rsocket.interceptor.authentication;
package org.springframework.security.rsocket.authentication;
import io.netty.buffer.ByteBuf;
import io.rsocket.metadata.CompositeMetadata;
import org.springframework.security.core.Authentication;
import org.springframework.security.oauth2.server.resource.BearerTokenAuthenticationToken;
import org.springframework.security.rsocket.interceptor.PayloadExchange;
import org.springframework.security.rsocket.PayloadExchange;
import org.springframework.security.rsocket.metadata.BearerTokenMetadata;
import reactor.core.publisher.Mono;

4
rsocket/src/main/java/org/springframework/security/rsocket/interceptor/authentication/PayloadExchangeAuthenticationConverter.java → rsocket/src/main/java/org/springframework/security/rsocket/authentication/PayloadExchangeAuthenticationConverter.java
View File

@ -14,10 +14,10 @@
* limitations under the License.
*/
package org.springframework.security.rsocket.interceptor.authentication;
package org.springframework.security.rsocket.authentication;
import org.springframework.security.core.Authentication;
import org.springframework.security.rsocket.interceptor.PayloadExchange;
import org.springframework.security.rsocket.PayloadExchange;
import reactor.core.publisher.Mono;
/**

8
rsocket/src/main/java/org/springframework/security/rsocket/interceptor/authorization/AuthorizationPayloadInterceptor.java → rsocket/src/main/java/org/springframework/security/rsocket/authorization/AuthorizationPayloadInterceptor.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.security.rsocket.interceptor.authorization;
package org.springframework.security.rsocket.authorization;
import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException;
import org.springframework.security.authorization.ReactiveAuthorizationManager;
@ -22,9 +22,9 @@ import org.springframework.security.core.context.ReactiveSecurityContextHolder;
import org.springframework.security.core.context.SecurityContext;
import org.springframework.util.Assert;
import reactor.core.publisher.Mono;
import org.springframework.security.rsocket.interceptor.PayloadInterceptorChain;
import org.springframework.security.rsocket.interceptor.PayloadExchange;
import org.springframework.security.rsocket.interceptor.PayloadInterceptor;
import org.springframework.security.rsocket.PayloadInterceptorChain;
import org.springframework.security.rsocket.PayloadExchange;
import org.springframework.security.rsocket.PayloadInterceptor;
/**
* Provides authorization of the {@link PayloadExchange}.

10
rsocket/src/main/java/org/springframework/security/rsocket/interceptor/authorization/PayloadExchangeMatcherReactiveAuthorizationManager.java → rsocket/src/main/java/org/springframework/security/rsocket/authorization/PayloadExchangeMatcherReactiveAuthorizationManager.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.security.rsocket.interceptor.authorization;
package org.springframework.security.rsocket.authorization;
import org.springframework.security.authorization.AuthorizationDecision;
import org.springframework.security.authorization.ReactiveAuthorizationManager;
@ -22,10 +22,10 @@ import org.springframework.security.core.Authentication;
import org.springframework.util.Assert;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import org.springframework.security.rsocket.interceptor.PayloadExchange;
import org.springframework.security.rsocket.util.PayloadExchangeAuthorizationContext;
import org.springframework.security.rsocket.util.PayloadExchangeMatcher;
import org.springframework.security.rsocket.util.PayloadExchangeMatcherEntry;
import org.springframework.security.rsocket.PayloadExchange;
import org.springframework.security.rsocket.util.matcher.PayloadExchangeAuthorizationContext;
import org.springframework.security.rsocket.util.matcher.PayloadExchangeMatcher;
import org.springframework.security.rsocket.util.matcher.PayloadExchangeMatcherEntry;
import java.util.ArrayList;
import java.util.List;

4
rsocket/src/main/java/org/springframework/security/rsocket/util/PayloadExchangeAuthorizationContext.java → rsocket/src/main/java/org/springframework/security/rsocket/util/matcher/PayloadExchangeAuthorizationContext.java
View File

@ -14,9 +14,9 @@
* limitations under the License.
*/
package org.springframework.security.rsocket.util;
package org.springframework.security.rsocket.util.matcher;
import org.springframework.security.rsocket.interceptor.PayloadExchange;
import org.springframework.security.rsocket.PayloadExchange;
import java.util.Collections;
import java.util.Map;

4
rsocket/src/main/java/org/springframework/security/rsocket/util/PayloadExchangeMatcher.java → rsocket/src/main/java/org/springframework/security/rsocket/util/matcher/PayloadExchangeMatcher.java
View File

@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.security.rsocket.util;
package org.springframework.security.rsocket.util.matcher;
import org.springframework.security.rsocket.interceptor.PayloadExchange;
import org.springframework.security.rsocket.PayloadExchange;
import reactor.core.publisher.Mono;
import java.util.Collections;

2
rsocket/src/main/java/org/springframework/security/rsocket/util/PayloadExchangeMatcherEntry.java → rsocket/src/main/java/org/springframework/security/rsocket/util/matcher/PayloadExchangeMatcherEntry.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.security.rsocket.util;
package org.springframework.security.rsocket.util.matcher;
/**
* @author Rob Winch

6
rsocket/src/main/java/org/springframework/security/rsocket/util/PayloadExchangeMatchers.java → rsocket/src/main/java/org/springframework/security/rsocket/util/matcher/PayloadExchangeMatchers.java
View File

@ -14,10 +14,10 @@
* limitations under the License.
*/
package org.springframework.security.rsocket.util;
package org.springframework.security.rsocket.util.matcher;
import org.springframework.security.rsocket.interceptor.PayloadExchange;
import org.springframework.security.rsocket.interceptor.PayloadExchangeType;
import org.springframework.security.rsocket.PayloadExchange;
import org.springframework.security.rsocket.PayloadExchangeType;
import reactor.core.publisher.Mono;
/**

4
rsocket/src/main/java/org/springframework/security/rsocket/util/RoutePayloadExchangeMatcher.java → rsocket/src/main/java/org/springframework/security/rsocket/util/matcher/RoutePayloadExchangeMatcher.java
View File

@ -14,10 +14,10 @@
* limitations under the License.
*/
package org.springframework.security.rsocket.util;
package org.springframework.security.rsocket.util.matcher;
import org.springframework.messaging.rsocket.MetadataExtractor;
import org.springframework.security.rsocket.interceptor.PayloadExchange;
import org.springframework.security.rsocket.PayloadExchange;
import org.springframework.util.Assert;
import org.springframework.util.RouteMatcher;
import reactor.core.publisher.Mono;

8
rsocket/src/test/java/org/springframework/security/rsocket/interceptor/PayloadInterceptorRSocketTests.java → rsocket/src/test/java/org/springframework/security/rsocket/PayloadInterceptorRSocketTests.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.security.rsocket.interceptor;
package org.springframework.security.rsocket;
import io.rsocket.Payload;
import io.rsocket.RSocket;
@ -33,6 +33,12 @@ import org.springframework.security.authentication.TestingAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.ReactiveSecurityContextHolder;
import org.springframework.security.core.context.SecurityContext;
import org.springframework.security.rsocket.DefaultPayloadExchange;
import org.springframework.security.rsocket.PayloadExchange;
import org.springframework.security.rsocket.PayloadExchangeType;
import org.springframework.security.rsocket.PayloadInterceptor;
import org.springframework.security.rsocket.PayloadInterceptorChain;
import org.springframework.security.rsocket.PayloadInterceptorRSocket;
import org.springframework.util.MimeType;
import org.springframework.util.MimeTypeUtils;
import reactor.core.publisher.Flux;

8
rsocket/src/test/java/org/springframework/security/rsocket/interceptor/PayloadSocketAcceptorInterceptorTests.java → rsocket/src/test/java/org/springframework/security/rsocket/PayloadSocketAcceptorInterceptorTests.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.security.rsocket.interceptor;
package org.springframework.security.rsocket;
import io.rsocket.ConnectionSetupPayload;
import io.rsocket.Payload;
@ -28,6 +28,10 @@ import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.springframework.http.MediaType;
import org.springframework.security.rsocket.PayloadExchange;
import org.springframework.security.rsocket.PayloadInterceptor;
import org.springframework.security.rsocket.PayloadInterceptorRSocket;
import org.springframework.security.rsocket.PayloadSocketAcceptorInterceptor;
import reactor.core.publisher.Mono;
import java.util.Arrays;
@ -118,4 +122,4 @@ public class PayloadSocketAcceptorInterceptorTests {
verify(this.interceptor, times(2)).intercept(exchangeArg.capture(), any());
return exchangeArg.getValue();
}
}
}

8
rsocket/src/test/java/org/springframework/security/rsocket/interceptor/PayloadSocketAcceptorTests.java → rsocket/src/test/java/org/springframework/security/rsocket/PayloadSocketAcceptorTests.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.security.rsocket.interceptor;
package org.springframework.security.rsocket;
import io.rsocket.ConnectionSetupPayload;
import io.rsocket.Payload;
@ -28,6 +28,10 @@ import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.springframework.http.MediaType;
import org.springframework.security.rsocket.PayloadExchange;
import org.springframework.security.rsocket.PayloadInterceptor;
import org.springframework.security.rsocket.PayloadInterceptorRSocket;
import org.springframework.security.rsocket.PayloadSocketAcceptor;
import reactor.core.publisher.Mono;
import java.util.Arrays;
@ -157,4 +161,4 @@ public class PayloadSocketAcceptorTests {
verify(this.interceptor, times(2)).intercept(exchangeArg.capture(), any());
return exchangeArg.getValue();
}
}
}

5
rsocket/src/test/java/org/springframework/security/rsocket/authentication/AnonymousPayloadInterceptorTests.java
View File

@ -27,8 +27,7 @@ import org.springframework.security.core.Authentication;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.AuthorityUtils;
import org.springframework.security.core.context.ReactiveSecurityContextHolder;
import org.springframework.security.rsocket.interceptor.PayloadExchange;
import org.springframework.security.rsocket.interceptor.authentication.AnonymousPayloadInterceptor;
import org.springframework.security.rsocket.PayloadExchange;
import java.util.List;
@ -105,4 +104,4 @@ public class AnonymousPayloadInterceptorTests {
assertThat(authentication).isEqualTo(expected);
}
}
}

4
rsocket/src/test/java/org/springframework/security/rsocket/authentication/AuthenticationPayloadInterceptorChain.java
View File

@ -20,8 +20,8 @@ import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.ReactiveSecurityContextHolder;
import org.springframework.security.core.context.SecurityContext;
import reactor.core.publisher.Mono;
import org.springframework.security.rsocket.interceptor.PayloadInterceptorChain;
import org.springframework.security.rsocket.interceptor.PayloadExchange;
import org.springframework.security.rsocket.PayloadInterceptorChain;
import org.springframework.security.rsocket.PayloadExchange;
/**
* @author Rob Winch

9
rsocket/src/test/java/org/springframework/security/rsocket/authentication/AuthenticationPayloadInterceptorTests.java
View File

@ -37,8 +37,7 @@ import org.springframework.security.authentication.ReactiveAuthenticationManager
import org.springframework.security.authentication.TestingAuthenticationToken;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.security.rsocket.interceptor.PayloadExchangeType;
import org.springframework.security.rsocket.interceptor.authentication.AuthenticationPayloadInterceptor;
import org.springframework.security.rsocket.PayloadExchangeType;
import org.springframework.security.rsocket.metadata.BasicAuthenticationEncoder;
import org.springframework.security.rsocket.metadata.UsernamePasswordMetadata;
import org.springframework.util.MimeType;
@ -46,9 +45,9 @@ import org.springframework.util.MimeTypeUtils;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
import reactor.test.publisher.PublisherProbe;
import org.springframework.security.rsocket.interceptor.DefaultPayloadExchange;
import org.springframework.security.rsocket.interceptor.PayloadInterceptorChain;
import org.springframework.security.rsocket.interceptor.PayloadExchange;
import org.springframework.security.rsocket.DefaultPayloadExchange;
import org.springframework.security.rsocket.PayloadInterceptorChain;
import org.springframework.security.rsocket.PayloadExchange;
import java.util.Map;

7
rsocket/src/test/java/org/springframework/security/rsocket/authorization/AuthorizationPayloadInterceptorTests.java
View File

@ -25,13 +25,12 @@ import org.springframework.security.authentication.AuthenticationCredentialsNotF
import org.springframework.security.authentication.TestingAuthenticationToken;
import org.springframework.security.authorization.ReactiveAuthorizationManager;
import org.springframework.security.core.context.ReactiveSecurityContextHolder;
import org.springframework.security.rsocket.interceptor.authorization.AuthorizationPayloadInterceptor;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
import reactor.test.publisher.PublisherProbe;
import reactor.util.context.Context;
import org.springframework.security.rsocket.interceptor.PayloadInterceptorChain;
import org.springframework.security.rsocket.interceptor.PayloadExchange;
import org.springframework.security.rsocket.PayloadInterceptorChain;
import org.springframework.security.rsocket.PayloadExchange;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.when;
@ -115,4 +114,4 @@ public class AuthorizationPayloadInterceptorTests {
.then(() -> this.chainResult.assertWasSubscribed())
.verifyComplete();
}
}
}

12
rsocket/src/test/java/org/springframework/security/rsocket/interceptor/authorization/PayloadExchangeMatcherReactiveAuthorizationManagerTest.java → rsocket/src/test/java/org/springframework/security/rsocket/authorization/PayloadExchangeMatcherReactiveAuthorizationManagerTest.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.security.rsocket.interceptor.authorization;
package org.springframework.security.rsocket.authorization;
import org.junit.Test;
import org.junit.runner.RunWith;
@ -22,11 +22,11 @@ import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.security.authorization.AuthorizationDecision;
import org.springframework.security.authorization.ReactiveAuthorizationManager;
import org.springframework.security.rsocket.interceptor.PayloadExchange;
import org.springframework.security.rsocket.util.PayloadExchangeAuthorizationContext;
import org.springframework.security.rsocket.util.PayloadExchangeMatcher;
import org.springframework.security.rsocket.util.PayloadExchangeMatcherEntry;
import org.springframework.security.rsocket.util.PayloadExchangeMatchers;
import org.springframework.security.rsocket.PayloadExchange;
import org.springframework.security.rsocket.util.matcher.PayloadExchangeAuthorizationContext;
import org.springframework.security.rsocket.util.matcher.PayloadExchangeMatcher;
import org.springframework.security.rsocket.util.matcher.PayloadExchangeMatcherEntry;
import org.springframework.security.rsocket.util.matcher.PayloadExchangeMatchers;
import reactor.core.publisher.Mono;
import static org.assertj.core.api.Assertions.assertThat;

10
rsocket/src/test/java/org/springframework/security/rsocket/util/RoutePayloadExchangeMatcherTests.java → rsocket/src/test/java/org/springframework/security/rsocket/util/matcher/RoutePayloadExchangeMatcherTests.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.security.rsocket.util;
package org.springframework.security.rsocket.util.matcher;
import io.rsocket.Payload;
import io.rsocket.metadata.WellKnownMimeType;
@ -25,9 +25,9 @@ import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.springframework.http.MediaType;
import org.springframework.messaging.rsocket.MetadataExtractor;
import org.springframework.security.rsocket.interceptor.DefaultPayloadExchange;
import org.springframework.security.rsocket.interceptor.PayloadExchange;
import org.springframework.security.rsocket.interceptor.PayloadExchangeType;
import org.springframework.security.rsocket.DefaultPayloadExchange;
import org.springframework.security.rsocket.PayloadExchange;
import org.springframework.security.rsocket.PayloadExchangeType;
import org.springframework.util.MimeType;
import org.springframework.util.MimeTypeUtils;
import org.springframework.util.RouteMatcher;
@ -113,4 +113,4 @@ public class RoutePayloadExchangeMatcherTests {
assertThat(result.isMatch()).isTrue();
assertThat(result.getVariables()).containsAllEntriesOf(variables);
}
}
}