Skip to content

Commit e70226b

Browse files
committed
Adapt to breaking changes in Spring Security internals
See gh-34948
1 parent 4535f4a commit e70226b

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerAutoConfigurationTests.java

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.util.Collections;
2525
import java.util.HashMap;
2626
import java.util.Map;
27-
import java.util.Set;
2827
import java.util.stream.Stream;
2928

3029
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -53,6 +52,7 @@
5352
import org.springframework.security.core.userdetails.MapReactiveUserDetailsService;
5453
import org.springframework.security.oauth2.core.DelegatingOAuth2TokenValidator;
5554
import org.springframework.security.oauth2.core.OAuth2TokenValidator;
55+
import org.springframework.security.oauth2.jose.jws.SignatureAlgorithm;
5656
import org.springframework.security.oauth2.jwt.Jwt;
5757
import org.springframework.security.oauth2.jwt.JwtClaimValidator;
5858
import org.springframework.security.oauth2.jwt.JwtIssuerValidator;
@@ -113,7 +113,6 @@ void autoConfigurationShouldConfigureResourceServer() {
113113
});
114114
}
115115

116-
@SuppressWarnings("unchecked")
117116
@Test
118117
@Deprecated
119118
void autoConfigurationUsingJwkSetUriShouldConfigureResourceServerUsingJwsAlgorithm() {
@@ -122,8 +121,9 @@ void autoConfigurationUsingJwkSetUriShouldConfigureResourceServerUsingJwsAlgorit
122121
"spring.security.oauth2.resourceserver.jwt.jws-algorithm=RS512")
123122
.run((context) -> {
124123
NimbusReactiveJwtDecoder nimbusReactiveJwtDecoder = context.getBean(NimbusReactiveJwtDecoder.class);
125-
assertThat(nimbusReactiveJwtDecoder).extracting("jwtProcessor.arg$2.arg$1.jwsAlgs")
126-
.matches((algorithms) -> ((Set<JWSAlgorithm>) algorithms).contains(JWSAlgorithm.RS512));
124+
assertThat(nimbusReactiveJwtDecoder).extracting("jwtProcessor.arg$1.signatureAlgorithms")
125+
.asInstanceOf(InstanceOfAssertFactories.collection(SignatureAlgorithm.class))
126+
.containsExactlyInAnyOrder(SignatureAlgorithm.RS512);
127127
});
128128
}
129129

@@ -134,9 +134,9 @@ void autoConfigurationUsingJwkSetUriShouldConfigureResourceServerUsingSingleJwsA
134134
"spring.security.oauth2.resourceserver.jwt.jws-algorithms=RS512")
135135
.run((context) -> {
136136
NimbusReactiveJwtDecoder nimbusReactiveJwtDecoder = context.getBean(NimbusReactiveJwtDecoder.class);
137-
assertThat(nimbusReactiveJwtDecoder).extracting("jwtProcessor.arg$2.arg$1.jwsAlgs")
138-
.asInstanceOf(InstanceOfAssertFactories.collection(JWSAlgorithm.class))
139-
.containsExactlyInAnyOrder(JWSAlgorithm.RS512);
137+
assertThat(nimbusReactiveJwtDecoder).extracting("jwtProcessor.arg$1.signatureAlgorithms")
138+
.asInstanceOf(InstanceOfAssertFactories.collection(SignatureAlgorithm.class))
139+
.containsExactlyInAnyOrder(SignatureAlgorithm.RS512);
140140
});
141141
}
142142

@@ -147,9 +147,10 @@ void autoConfigurationUsingJwkSetUriShouldConfigureResourceServerUsingMultipleJw
147147
"spring.security.oauth2.resourceserver.jwt.jws-algorithms=RS256, RS384, RS512")
148148
.run((context) -> {
149149
NimbusReactiveJwtDecoder nimbusReactiveJwtDecoder = context.getBean(NimbusReactiveJwtDecoder.class);
150-
assertThat(nimbusReactiveJwtDecoder).extracting("jwtProcessor.arg$2.arg$1.jwsAlgs")
151-
.asInstanceOf(InstanceOfAssertFactories.collection(JWSAlgorithm.class))
152-
.containsExactlyInAnyOrder(JWSAlgorithm.RS256, JWSAlgorithm.RS384, JWSAlgorithm.RS512);
150+
assertThat(nimbusReactiveJwtDecoder).extracting("jwtProcessor.arg$1.signatureAlgorithms")
151+
.asInstanceOf(InstanceOfAssertFactories.collection(SignatureAlgorithm.class))
152+
.containsExactlyInAnyOrder(SignatureAlgorithm.RS256, SignatureAlgorithm.RS384,
153+
SignatureAlgorithm.RS512);
153154
});
154155
}
155156

0 commit comments

Comments
 (0)