Skip to content

Commit a3e8665

Browse files
therepanicdsyer
authored andcommitted
consider checkstyle in the docs module
Signed-off-by: Andrey Litvitski <[email protected]>
1 parent a94e628 commit a3e8665

File tree

11 files changed

+347
-476
lines changed

11 files changed

+347
-476
lines changed

spring-grpc-docs/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<configprops.path>${project.basedir}/src/main/antora/modules/ROOT/partials/_configprops.adoc</configprops.path>
2020
<configprops.inclusionPattern>spring.grpc.*</configprops.inclusionPattern>
2121
<jruby.version>9.4.6.0</jruby.version>
22+
<disable.checkstyle.checks>true</disable.checkstyle.checks>
2223
</properties>
2324
<!-- Dependencies used to build the config props doc generator -->
2425
<dependencies>

spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/client/GrpcChannelFactoryConfigurations.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.springframework.grpc.client.NettyGrpcChannelFactory;
3535
import org.springframework.grpc.client.ShadedNettyGrpcChannelFactory;
3636

37+
import io.grpc.Channel;
3738
import io.grpc.inprocess.InProcessChannelBuilder;
3839
import io.grpc.netty.NettyChannelBuilder;
3940

@@ -71,8 +72,7 @@ ShadedNettyGrpcChannelFactory shadedNettyGrpcChannelFactory(GrpcClientProperties
7172
}
7273

7374
@Configuration(proxyBeanMethods = false)
74-
@ConditionalOnClass({ io.grpc.netty.shaded.io.netty.channel.Channel.class,
75-
io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder.class })
75+
@ConditionalOnClass({ Channel.class, NettyChannelBuilder.class })
7676
@ConditionalOnMissingBean(value = GrpcChannelFactory.class, ignored = InProcessGrpcChannelFactory.class)
7777
@ConditionalOnProperty(prefix = "spring.grpc.client.inprocess.", name = "exclusive", havingValue = "false",
7878
matchIfMissing = true)

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

Lines changed: 0 additions & 34 deletions
This file was deleted.

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

Lines changed: 0 additions & 44 deletions
This file was deleted.

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

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,35 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
//CHECKSTYLE:OFF
1617
package org.springframework.grpc.autoconfigure.server.security;
1718

1819
import org.springframework.boot.autoconfigure.AutoConfiguration;
20+
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
1921
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
22+
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2023
import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
24+
import org.springframework.context.ApplicationContext;
25+
import org.springframework.context.annotation.Bean;
26+
import org.springframework.context.annotation.Conditional;
27+
import org.springframework.context.annotation.Configuration;
2128
import org.springframework.context.annotation.Import;
2229
import org.springframework.grpc.autoconfigure.server.ConditionalOnGrpcServerEnabled;
30+
import org.springframework.grpc.autoconfigure.server.GrpcServerExecutorProvider;
31+
import org.springframework.grpc.autoconfigure.server.GrpcServerFactoryAutoConfiguration;
2332
import org.springframework.grpc.autoconfigure.server.exception.GrpcExceptionHandlerAutoConfiguration;
33+
import org.springframework.grpc.server.GlobalServerInterceptor;
34+
import org.springframework.grpc.server.exception.GrpcExceptionHandler;
35+
import org.springframework.grpc.server.security.GrpcSecurity;
36+
import org.springframework.grpc.server.security.SecurityContextServerInterceptor;
37+
import org.springframework.grpc.server.security.SecurityGrpcExceptionHandler;
38+
import org.springframework.security.concurrent.DelegatingSecurityContextExecutor;
2439
import org.springframework.security.config.ObjectPostProcessor;
40+
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
41+
import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
42+
import org.springframework.security.web.SecurityFilterChain;
43+
44+
import io.grpc.internal.GrpcUtil;
2545

2646
@ConditionalOnClass(ObjectPostProcessor.class)
2747
@ConditionalOnGrpcServerEnabled
@@ -31,3 +51,51 @@
3151
public class GrpcSecurityAutoConfiguration {
3252

3353
}
54+
55+
@Configuration(proxyBeanMethods = false)
56+
@Import(AuthenticationConfiguration.class)
57+
class ExceptionHandlerAutoConfiguration {
58+
59+
@Bean
60+
public GrpcExceptionHandler accessExceptionHandler() {
61+
return new SecurityGrpcExceptionHandler();
62+
}
63+
64+
}
65+
66+
@ConditionalOnBean(ObjectPostProcessor.class)
67+
@Configuration(proxyBeanMethods = false)
68+
@Conditional(GrpcServerFactoryAutoConfiguration.OnNativeGrpcServerCondition.class)
69+
class GrpcNativeSecurityConfigurerAutoConfiguration {
70+
71+
@Bean
72+
public GrpcSecurity grpcSecurity(ObjectPostProcessor<Object> objectPostProcessor,
73+
AuthenticationConfiguration authenticationConfiguration, ApplicationContext context) throws Exception {
74+
AuthenticationManagerBuilder authenticationManagerBuilder = authenticationConfiguration
75+
.authenticationManagerBuilder(objectPostProcessor, context);
76+
authenticationManagerBuilder
77+
.parentAuthenticationManager(authenticationConfiguration.getAuthenticationManager());
78+
return new GrpcSecurity(objectPostProcessor, authenticationManagerBuilder, context);
79+
}
80+
81+
}
82+
83+
@ConditionalOnBean(SecurityFilterChain.class)
84+
@Conditional(GrpcServerFactoryAutoConfiguration.OnGrpcServletCondition.class)
85+
@Configuration(proxyBeanMethods = false)
86+
class GrpcServletSecurityConfigurerAutoConfiguration {
87+
88+
@Bean
89+
@GlobalServerInterceptor
90+
public SecurityContextServerInterceptor securityContextInterceptor() {
91+
return new SecurityContextServerInterceptor();
92+
}
93+
94+
@Bean
95+
@ConditionalOnMissingBean(GrpcServerExecutorProvider.class)
96+
public GrpcServerExecutorProvider grpcServerExecutorProvider() {
97+
return () -> new DelegatingSecurityContextExecutor(GrpcUtil.SHARED_CHANNEL_EXECUTOR.create());
98+
}
99+
100+
}
101+
// CHECKSTYLE:ON

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

Lines changed: 0 additions & 49 deletions
This file was deleted.

0 commit comments

Comments
 (0)