Added HttpGatewayAuthenticator

Author: artem-v

services-gateway/src/main/java/io/scalecube/services/gateway/http/HttpGateway.java

@@ -35,6 +35,7 @@ public class HttpGateway implements Gateway {
   private final int port;
   private final Function<ServiceCall, ServiceCall> callFactory;
   private final ServiceProviderErrorMapper errorMapper;
+  private final HttpGatewayAuthenticator authenticator;
   private final boolean corsEnabled;
   private final CorsConfigBuilder corsConfigBuilder;
 
@@ -46,6 +47,7 @@ private HttpGateway(Builder builder) {
     this.port = builder.port;
     this.callFactory = builder.callFactory;
     this.errorMapper = builder.errorMapper;
+    this.authenticator = builder.authenticator;
     this.corsEnabled = builder.corsEnabled;
     this.corsConfigBuilder = builder.corsConfigBuilder;
   }
@@ -76,7 +78,8 @@ public Gateway start(ServiceCall call, ServiceRegistry serviceRegistry) {
                     }
                   })
               .handle(
-                  new HttpGatewayAcceptor(callFactory.apply(call), serviceRegistry, errorMapper))
+                  new HttpGatewayAcceptor(
+                      callFactory.apply(call), serviceRegistry, errorMapper, authenticator))
               .bind()
               .toFuture()
               .get();
@@ -117,6 +120,7 @@ public static class Builder {
     private int port;
     private Function<ServiceCall, ServiceCall> callFactory = call -> call;
     private ServiceProviderErrorMapper errorMapper = DefaultErrorMapper.INSTANCE;
+    private HttpGatewayAuthenticator authenticator = HttpGatewayAuthenticator.DEFAULT_INSTANCE;
     private boolean corsEnabled = false;
     private CorsConfigBuilder corsConfigBuilder =
         CorsConfigBuilder.forAnyOrigin()
@@ -158,6 +162,15 @@ public Builder errorMapper(ServiceProviderErrorMapper errorMapper) {
       return this;
     }
 
+    public HttpGatewayAuthenticator authenticator() {
+      return authenticator;
+    }
+
+    public Builder authenticator(HttpGatewayAuthenticator authenticator) {
+      this.authenticator = authenticator;
+      return this;
+    }
+
     public boolean corsEnabled() {
       return corsEnabled;
     }

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

@@ -31,6 +31,7 @@
 import io.scalecube.services.transport.api.DataCodec;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import org.reactivestreams.Publisher;
@@ -53,14 +54,17 @@ public class HttpGatewayAcceptor
   private final ServiceCall serviceCall;
   private final ServiceRegistry serviceRegistry;
   private final ServiceProviderErrorMapper errorMapper;
+  private final HttpGatewayAuthenticator authenticator;
 
   public HttpGatewayAcceptor(
       ServiceCall serviceCall,
       ServiceRegistry serviceRegistry,
-      ServiceProviderErrorMapper errorMapper) {
+      ServiceProviderErrorMapper errorMapper,
+      HttpGatewayAuthenticator authenticator) {
     this.serviceCall = serviceCall;
     this.serviceRegistry = serviceRegistry;
     this.errorMapper = errorMapper;
+    this.authenticator = authenticator;
   }
 
   @Override
@@ -77,15 +81,22 @@ public Publisher<Void> apply(HttpServerRequest httpRequest, HttpServerResponse h
       return methodNotAllowed(httpResponse);
     }
 
-    if (httpRequest.isMultipart()) {
-      return handleFileUploadRequest(httpRequest, httpResponse);
-    } else {
-      return handleServiceRequest(httpRequest, httpResponse);
-    }
+    return authenticator
+        .authenticate(httpRequest)
+        .flatMap(
+            principal -> {
+              if (httpRequest.isMultipart()) {
+                return handleFileUploadRequest(principal, httpRequest, httpResponse);
+              } else {
+                return handleServiceRequest(principal, httpRequest, httpResponse);
+              }
+            });
   }
 
   private Mono<Void> handleFileUploadRequest(
-      HttpServerRequest httpRequest, HttpServerResponse httpResponse) {
+      Map<String, String> principal,
+      HttpServerRequest httpRequest,
+      HttpServerResponse httpResponse) {
     return httpRequest
         .receiveForm()
         .flatMap(
@@ -100,8 +111,10 @@ private Mono<Void> handleFileUploadRequest(
                                         builder -> {
                                           final var filename =
                                               ((FileUpload) httpData).getFilename();
-                                          builder.header(HEADER_UPLOAD_FILENAME, filename);
-                                          builder.data(data);
+                                          builder
+                                              .headers(principal)
+                                              .header(HEADER_UPLOAD_FILENAME, filename)
+                                              .data(data);
                                         })))
                     .last()
                     .flatMap(
@@ -115,7 +128,9 @@ private Mono<Void> handleFileUploadRequest(
   }
 
   private Mono<Void> handleServiceRequest(
-      HttpServerRequest httpRequest, HttpServerResponse httpResponse) {
+      Map<String, String> principal,
+      HttpServerRequest httpRequest,
+      HttpServerResponse httpResponse) {
     return httpRequest
         .receive()
         .reduceWith(
@@ -132,7 +147,8 @@ private Mono<Void> handleServiceRequest(
         .defaultIfEmpty(Unpooled.EMPTY_BUFFER)
         .flatMap(
             data -> {
-              final var message = toMessage(httpRequest, builder -> builder.data(data));
+              final var message =
+                  toMessage(httpRequest, builder -> builder.headers(principal).data(data));
 
               // Match and handle file request
 

services-gateway/src/main/java/io/scalecube/services/gateway/http/HttpGatewayAuthenticator.java

@@ -0,0 +1,15 @@
+package io.scalecube.services.gateway.http;
+
+import java.util.Collections;
+import java.util.Map;
+import reactor.core.publisher.Mono;
+import reactor.netty.http.server.HttpServerRequest;
+
+public interface HttpGatewayAuthenticator {
+
+  HttpGatewayAuthenticator DEFAULT_INSTANCE = new HttpGatewayAuthenticator() {};
+
+  default Mono<Map<String, String>> authenticate(HttpServerRequest request) {
+    return Mono.just(Collections.emptyMap());
+  }
+}