ref #267

Author: afurer

grpc-spring-boot-starter-demo/src/main/java/org/lognet/springboot/grpc/demo/SecuredGreeterService.java

@@ -20,6 +20,18 @@
 @Secured("SCOPE_profile")
 public class SecuredGreeterService extends SecuredGreeterGrpc.SecuredGreeterImplBase{
 
+    @Override
+    public void securedMethodsWithUnderScoRes(Empty request, StreamObserver<Empty> responseObserver) {
+            responseObserver.onNext(Empty.newBuilder().build());
+            responseObserver.onCompleted();
+    }
+
+    @Override
+    public void anotherSecuredMethodsWithUnderScoRes(Empty request, StreamObserver<Empty> responseObserver) {
+        responseObserver.onNext(Empty.newBuilder().build());
+        responseObserver.onCompleted();
+    }
+
     @Override
     public void sayAuthHello(Empty request, StreamObserver<GreeterOuterClass.HelloReply> responseObserver) {
         final Authentication auth = GrpcSecurity.AUTHENTICATION_CONTEXT_KEY.get();

grpc-spring-boot-starter-demo/src/main/proto/greeter.proto

@@ -19,6 +19,9 @@ service SecuredGreeter {
     rpc SayAuthHello ( google.protobuf.Empty) returns (  HelloReply) {}
     rpc SayAuthHello2 ( google.protobuf.Empty) returns (  HelloReply) {}
 
+    rpc secured_methods_with_UnderScoRes(google.protobuf.Empty) returns (google.protobuf.Empty){}
+    rpc AnotherSecured_methods_with_UnderScoRes(google.protobuf.Empty) returns (google.protobuf.Empty){}
+
 
 }
 

grpc-spring-boot-starter-demo/src/test/java/org/lognet/springboot/grpc/auth/UserDetailsAuthTest.java

@@ -6,11 +6,9 @@
 import io.grpc.ClientInterceptors;
 import io.grpc.Status;
 import io.grpc.StatusRuntimeException;
-import io.grpc.examples.CalculatorGrpc;
-import io.grpc.examples.CalculatorOuterClass;
-import io.grpc.examples.GreeterGrpc;
-import io.grpc.examples.SecuredCalculatorGrpc;
+import io.grpc.examples.*;
 import io.grpc.stub.StreamObserver;
+import org.hamcrest.CoreMatchers;
 import org.hamcrest.Matchers;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -19,6 +17,7 @@
 import org.lognet.springboot.grpc.demo.DemoApp;
 import org.lognet.springboot.grpc.demo.DemoAppConfiguration;
 import org.lognet.springboot.grpc.demo.NotSpringBeanInterceptor;
+import org.lognet.springboot.grpc.demo.SecuredGreeterService;
 import org.lognet.springboot.grpc.security.AuthClientInterceptor;
 import org.lognet.springboot.grpc.security.AuthHeader;
 import org.lognet.springboot.grpc.security.GrpcSecurity;
@@ -77,6 +76,7 @@ public static UserDetails user() {
                     .username("user1")
                     .password(pwd)
                     .roles("reader")
+                    .authorities("SCOPE_profile")
                     .build();
         }
 
@@ -127,6 +127,16 @@ public void shouldFailWithPermissionDenied() {
         assertThat(statusRuntimeException.getStatus().getCode(), Matchers.is(Status.Code.PERMISSION_DENIED));
     }
 
+    @Test
+    public void methodNameWithUnderscore() {
+        Empty response = SecuredGreeterGrpc.newBlockingStub(selectedChanel)
+                .anotherSecuredMethodsWithUnderScoRes(Empty.newBuilder().build());
+        assertThat(response, CoreMatchers.notNullValue(Empty.class));
+
+        response = SecuredGreeterGrpc.newBlockingStub(selectedChanel)
+                .securedMethodsWithUnderScoRes(Empty.newBuilder().build());
+        assertThat(response, CoreMatchers.notNullValue(Empty.class));
+    }
 
     @Test
     public void serviceLevelSecurityAuthenticationWithoutAuthorization() {

grpc-spring-boot-starter/src/main/java/org/lognet/springboot/grpc/GRpcServicesRegistry.java

@@ -17,11 +17,7 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
@@ -127,7 +123,9 @@ public void setApplicationContext(ApplicationContext applicationContext) throws
         final Map<MethodDescriptor<?, ?>, GrpcServiceMethod> map = new HashMap<>();
 
         Function<String, ReflectionUtils.MethodFilter> filterFactory = name ->
-                method ->  method.getName().equalsIgnoreCase(name) ;
+                method ->
+             method.getName().equalsIgnoreCase(name.replaceAll("_",""));
+
 
         for (BindableService service : getBeanNameToServiceBeanMap().values()) {
             final ServerServiceDefinition serviceDefinition = service.bindService();