Merge pull request #129 from scalecube/update-sc-services-rc6

Update sc services rc7

Author: segabriel

pom.xml

@@ -23,11 +23,11 @@
 
   <properties>
     <scalecube-commons.version>1.0.2</scalecube-commons.version>
-    <scalecube-services.version>2.9.1-RC5</scalecube-services.version>
+    <scalecube-services.version>2.9.1-RC7</scalecube-services.version>
     <scalecube-benchmarks.version>1.2.2</scalecube-benchmarks.version>
     <scalecube-config.version>0.4.3</scalecube-config.version>
     <reactor.version>Dysprosium-SR7</reactor.version>
-    <rsocket.version>1.0.0-RC7</rsocket.version>
+    <rsocket.version>1.0.0</rsocket.version>
     <netty.version>4.1.48.Final</netty.version>
     <jackson.version>2.11.0</jackson.version>
     <metrics.version>3.1.2</metrics.version>

services-gateway-client-transport/src/main/java/io/scalecube/services/gateway/transport/http/HttpGatewayClient.java

@@ -73,7 +73,7 @@ public Mono<ServiceMessage> requestResponse(ServiceMessage request) {
               };
           return httpClient
               .post()
-              .uri(request.qualifier())
+              .uri("/" + request.qualifier())
               .send(sender)
               .responseSingle(
                   (httpResponse, bbMono) ->

services-gateway-netty/src/main/java/io/scalecube/services/gateway/http/HttpGatewayAcceptor.java

@@ -63,7 +63,7 @@ private Mono<Void> handleRequest(
       ByteBuf content, HttpServerRequest httpRequest, HttpServerResponse httpResponse) {
 
     ServiceMessage request =
-        ServiceMessage.builder().qualifier(httpRequest.uri()).data(content).build();
+        ServiceMessage.builder().qualifier(getQualifier(httpRequest)).data(content).build();
 
     return serviceCall
         .requestOne(request)
@@ -79,7 +79,11 @@ private Mono<Void> handleRequest(
   }
 
   private Mono<ServiceMessage> emptyMessage(HttpServerRequest httpRequest) {
-    return Mono.just(ServiceMessage.builder().qualifier(httpRequest.uri()).build());
+    return Mono.just(ServiceMessage.builder().qualifier(getQualifier(httpRequest)).build());
+  }
+
+  private static String getQualifier(HttpServerRequest httpRequest) {
+    return httpRequest.uri().substring(1);
   }
 
   private Publisher<Void> methodNotAllowed(HttpServerResponse httpResponse) {

services-gateway-tests/src/test/java/io/scalecube/services/gateway/SecuredService.java

@@ -6,7 +6,7 @@
 import io.scalecube.services.annotations.Service;
 import io.scalecube.services.annotations.ServiceMethod;
 import io.scalecube.services.api.ServiceMessage;
-import io.scalecube.services.auth.Auth;
+import io.scalecube.services.auth.Secured;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -21,11 +21,11 @@ public interface SecuredService {
 
   @ServiceMethod
   @RequestType(String.class)
-  @Auth
+  @Secured
   Mono<String> requestOne(String req);
 
   @ServiceMethod
   @RequestType(Integer.class)
-  @Auth
+  @Secured
   Flux<String> requestN(Integer req);
 }

services-gateway-tests/src/test/java/io/scalecube/services/gateway/SecuredServiceImpl.java

@@ -14,6 +14,8 @@
 public class SecuredServiceImpl implements SecuredService {
   private static final Logger LOGGER = LoggerFactory.getLogger(SecuredServiceImpl.class);
 
+  private static final String ALLOWED_USER = "VASYA_PUPKIN";
+
   private final AuthRegistry authRegistry;
 
   public SecuredServiceImpl(AuthRegistry authRegistry) {
@@ -38,6 +40,7 @@ public Mono<String> createSession(ServiceMessage request) {
   @Override
   public Mono<String> requestOne(String req) {
     return Mono.deferWithContext(context -> Mono.just(context.get(Authenticator.AUTH_CONTEXT_KEY)))
+        .doOnNext(this::checkPermissions)
         .cast(String.class)
         .flatMap(
             auth -> {
@@ -49,6 +52,7 @@ public Mono<String> requestOne(String req) {
   @Override
   public Flux<String> requestN(Integer times) {
     return Mono.deferWithContext(context -> Mono.just(context.get(Authenticator.AUTH_CONTEXT_KEY)))
+        .doOnNext(this::checkPermissions)
         .cast(String.class)
         .flatMapMany(
             auth -> {
@@ -58,4 +62,13 @@ public Flux<String> requestN(Integer times) {
               return Flux.fromStream(IntStream.range(0, times).mapToObj(String::valueOf));
             });
   }
+
+  private void checkPermissions(Object authData) {
+    if (authData == null) {
+      throw new ForbiddenException("Not allowed (authData is null)");
+    }
+    if (!authData.equals(ALLOWED_USER)) {
+      throw new ForbiddenException("Not allowed (wrong user)");
+    }
+  }
 }