Skip to content

Commit a86db67

Browse files
committed
Add extra defensive condition
1 parent 2846526 commit a86db67

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/server/security/GrpcSecurityAutoConfiguration.java

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
@ConditionalOnClass(ObjectPostProcessor.class)
4646
@ConditionalOnGrpcServerEnabled
4747
@AutoConfiguration(before = GrpcExceptionHandlerAutoConfiguration.class, after = SecurityAutoConfiguration.class)
48-
4948
@Import({ ExceptionHandlerAutoConfiguration.class, GrpcNativeSecurityConfigurerAutoConfiguration.class,
5049
GrpcServletSecurityConfigurerAutoConfiguration.class })
5150
public class GrpcSecurityAutoConfiguration {

spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/server/security/OAuth2ResourceServerAutoConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import org.springframework.grpc.server.GlobalServerInterceptor;
5050
import org.springframework.grpc.server.security.AuthenticationProcessInterceptor;
5151
import org.springframework.grpc.server.security.GrpcSecurity;
52+
import org.springframework.security.config.ObjectPostProcessor;
5253
import org.springframework.security.oauth2.core.DelegatingOAuth2TokenValidator;
5354
import org.springframework.security.oauth2.core.OAuth2TokenValidator;
5455
import org.springframework.security.oauth2.jose.jws.SignatureAlgorithm;
@@ -75,7 +76,7 @@
7576
after = { GrpcServerFactoryAutoConfiguration.class,
7677
org.springframework.boot.autoconfigure.security.oauth2.resource.servlet.OAuth2ResourceServerAutoConfiguration.class })
7778
@EnableConfigurationProperties(OAuth2ResourceServerProperties.class)
78-
@ConditionalOnClass(BearerTokenAuthenticationToken.class)
79+
@ConditionalOnClass({ BearerTokenAuthenticationToken.class, ObjectPostProcessor.class })
7980
@ConditionalOnMissingBean(GrpcServletConfiguration.class)
8081
@ConditionalOnBean(BindableService.class)
8182
@Import({ Oauth2ResourceServerConfiguration.JwtConfiguration.class,

0 commit comments

Comments
 (0)