Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-05-31 09:12:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Use Spring Framework version 6.0.0-M3"

Browse Source 
This reverts commit b803e845e75da8e8927182dd5cb392bb592d51b6.
This commit is contained in:
Marcus Da Coregio 2022-05-11 08:36:14 -03:00
parent 806e05855c
commit 000b87f9aa
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -1,7 +1,7 @@
aspectjVersion=1.9.8 aspectjVersion=1.9.8
springJavaformatVersion=0.0.31 springJavaformatVersion=0.0.31
springBootVersion=2.4.2 springBootVersion=2.4.2
springFrameworkVersion=6.0.0-M3 springFrameworkVersion=6.0.0-SNAPSHOT
openSamlVersion=3.4.6 openSamlVersion=3.4.6
version=6.0.0-SNAPSHOT version=6.0.0-SNAPSHOT
kotlinVersion=1.6.20-M1 kotlinVersion=1.6.20-M1

4
oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/userinfo/DefaultReactiveOAuth2UserService.java
View File

@ -27,7 +27,7 @@ import reactor.core.publisher.Mono;
import org.springframework.core.ParameterizedTypeReference; import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatusCode;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority;
@ -108,7 +108,7 @@ public class DefaultReactiveOAuth2UserService implements ReactiveOAuth2UserServi
authenticationMethod); authenticationMethod);
// @formatter:off // @formatter:off
Mono<Map<String, Object>> userAttributes = requestHeadersSpec.retrieve() Mono<Map<String, Object>> userAttributes = requestHeadersSpec.retrieve()
.onStatus(HttpStatus::isError, (response) -> .onStatus(HttpStatusCode::isError, (response) ->
parse(response) parse(response)
.map((userInfoErrorResponse) -> { .map((userInfoErrorResponse) -> {
String description = userInfoErrorResponse.getErrorObject().getDescription(); String description = userInfoErrorResponse.getErrorObject().getDescription();

6
oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/http/OAuth2ErrorResponseErrorHandlerTests.java
View File

@ -28,7 +28,6 @@ import org.springframework.mock.http.MockHttpInputMessage;
import org.springframework.mock.http.client.MockClientHttpResponse; import org.springframework.mock.http.client.MockClientHttpResponse;
import org.springframework.security.oauth2.core.OAuth2AuthorizationException; import org.springframework.security.oauth2.core.OAuth2AuthorizationException;
import org.springframework.security.oauth2.core.OAuth2Error; import org.springframework.security.oauth2.core.OAuth2Error;
import org.springframework.web.client.UnknownHttpStatusCodeException;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
@ -102,8 +101,9 @@ public class OAuth2ErrorResponseErrorHandlerTests {
@Test @Test
public void handleErrorWhenErrorResponseWithInvalidStatusCodeThenHandled() { public void handleErrorWhenErrorResponseWithInvalidStatusCodeThenHandled() {
CustomMockClientHttpResponse response = new CustomMockClientHttpResponse(new byte[0], 596); CustomMockClientHttpResponse response = new CustomMockClientHttpResponse(new byte[0], 596);
assertThatExceptionOfType(UnknownHttpStatusCodeException.class) assertThatExceptionOfType(IllegalArgumentException.class)
.isThrownBy(() -> this.errorHandler.handleError(response)).withMessage("596 : [no body]"); .isThrownBy(() -> this.errorHandler.handleError(response))
.withMessage("No matching constant for [596]");
} }
private static final class CustomMockClientHttpResponse extends MockHttpInputMessage implements ClientHttpResponse { private static final class CustomMockClientHttpResponse extends MockHttpInputMessage implements ClientHttpResponse {

2
oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/server/DefaultServerOAuth2AuthorizationRequestResolverTests.java
View File

@ -81,7 +81,7 @@ public class DefaultServerOAuth2AuthorizationRequestResolverTests {
given(this.clientRegistrationRepository.findByRegistrationId(any())).willReturn(Mono.empty()); given(this.clientRegistrationRepository.findByRegistrationId(any())).willReturn(Mono.empty());
assertThatExceptionOfType(ResponseStatusException.class) assertThatExceptionOfType(ResponseStatusException.class)
.isThrownBy(() -> resolve("/oauth2/authorization/not-found-id")) .isThrownBy(() -> resolve("/oauth2/authorization/not-found-id"))
.satisfies((ex) -> assertThat(ex.getStatus()).isEqualTo(HttpStatus.BAD_REQUEST)); .satisfies((ex) -> assertThat(ex.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST));
} }
@Test @Test

4
web/src/test/java/org/springframework/security/web/util/matcher/AntPathRequestMatcherTests.java
View File

@ -93,10 +93,10 @@ public class AntPathRequestMatcherTests {
AntPathRequestMatcher matcher = new AntPathRequestMatcher("/**/{id}"); AntPathRequestMatcher matcher = new AntPathRequestMatcher("/**/{id}");
assertThat(matcher.matches(createRequest("/blah/1234"))).isTrue(); assertThat(matcher.matches(createRequest("/blah/1234"))).isTrue();
assertThat(matcher.matches(createRequest("/bleh/4567"))).isTrue(); assertThat(matcher.matches(createRequest("/bleh/4567"))).isTrue();
assertThat(matcher.matches(createRequest("/paskos/blah/"))).isTrue(); assertThat(matcher.matches(createRequest("/paskos/blah/"))).isFalse();
assertThat(matcher.matches(createRequest("/12345/blah/xxx"))).isTrue(); assertThat(matcher.matches(createRequest("/12345/blah/xxx"))).isTrue();
assertThat(matcher.matches(createRequest("/12345/blaha"))).isTrue(); assertThat(matcher.matches(createRequest("/12345/blaha"))).isTrue();
assertThat(matcher.matches(createRequest("/paskos/bleh/"))).isTrue(); assertThat(matcher.matches(createRequest("/paskos/bleh/"))).isFalse();
} }
@Test @Test