Update tov1.4.2 (#20)

abanthiy · Justin Boswell · bretambrose · web-flow · commit 5cebd2ad2be9 · 2021-07-22T10:39:16.000-07:00
* Imported greengrass SDK and packaging (#5) * Removed greengrass code that doesn't belong here * Sample fixup Co-authored-by: Justin Boswell <boswej@amazon.com> Co-authored-by: Bret Ambrose <bretambrose@gmail.com>
diff --git a/README.md b/README.md
@@ -64,6 +64,7 @@ mvn clean install
 ``` sh
 # NOTE: use the latest version of the CRT here
 
+
 git clone --branch v0.11.5 https://github.com/awslabs/aws-crt-java.git
 
 git clone https://github.com/awslabs/aws-iot-device-sdk-java-v2.git
diff --git a/samples/BasicPubSub/src/main/java/pubsub/PubSub.java b/samples/BasicPubSub/src/main/java/pubsub/PubSub.java
@@ -22,7 +22,6 @@
 import software.amazon.awssdk.iot.AwsIotMqttConnectionBuilder;
 import software.amazon.awssdk.iot.iotjobs.model.RejectedError;
 
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
diff --git a/samples/Greengrass/src/main/java/greengrass/BasicDiscovery.java b/samples/Greengrass/src/main/java/greengrass/BasicDiscovery.java
@@ -5,7 +5,6 @@
 
 package greengrass;
 
-import software.amazon.awssdk.crt.CRT;
 import software.amazon.awssdk.crt.CrtResource;
 import software.amazon.awssdk.crt.CrtRuntimeException;
 import software.amazon.awssdk.crt.Log;
@@ -25,7 +24,6 @@
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
-import java.util.regex.Pattern;
 
 import static software.amazon.awssdk.iot.discovery.DiscoveryClient.TLS_EXT_ALPN;
 
@@ -165,8 +163,8 @@ public static void main(String[] args) {
             try(final DiscoveryClientConfig discoveryClientConfig =
                         new DiscoveryClientConfig(clientBootstrap, tlsCtxOptions,
                         new SocketOptions(), region, 1, proxyOptions);
-                    final DiscoveryClient discoveryClient = new DiscoveryClient(discoveryClientConfig);
-                    final MqttClientConnection connection = getClientFromDiscovery(discoveryClient, clientBootstrap)) {
+                final DiscoveryClient discoveryClient = new DiscoveryClient(discoveryClientConfig);
+                final MqttClientConnection connection = getClientFromDiscovery(discoveryClient, clientBootstrap)) {
 
                 if ("subscribe".equals(mode) || "both".equals(mode)) {
                     final CompletableFuture<Integer> subFuture = connection.subscribe(topic, QualityOfService.AT_MOST_ONCE, message -> {
diff --git a/samples/Identity/src/main/java/identity/FleetProvisioningSample.java b/samples/Identity/src/main/java/identity/FleetProvisioningSample.java
@@ -28,14 +28,10 @@
 import software.amazon.awssdk.iot.iotidentity.model.RegisterThingSubscriptionRequest;
 
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.nio.file.Paths;
 
 import java.util.HashMap;
-import java.util.Map;
 import com.google.gson.Gson;
-import java.util.LinkedList;
-import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
diff --git a/samples/README.md b/samples/README.md
@@ -5,6 +5,7 @@
 * [fleet provisioning](#fleet-provisioning)
 
 **Additional sample apps not described below:**
+
 * [BasicPubSub](https://github.com/aws/aws-iot-device-sdk-java-v2/tree/main/samples/BasicPubSub)
 * [Greengrass](https://github.com/aws/aws-iot-device-sdk-java-v2/tree/main/samples/Greengrass)
 * [PubSubStress](https://github.com/aws/aws-iot-device-sdk-java-v2/tree/main/samples/PubSubStress)
diff --git a/samples/RawPubSub/src/main/java/rawpubsub/RawPubSub.java b/samples/RawPubSub/src/main/java/rawpubsub/RawPubSub.java
@@ -16,7 +16,6 @@
 import software.amazon.awssdk.crt.mqtt.*;
 import software.amazon.awssdk.iot.iotjobs.model.RejectedError;
 
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.List;
diff --git a/sdk/greengrass/.gitattributes b/sdk/greengrass/.gitattributes
@@ -0,0 +1,6 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# These are explicitly windows files and should use crlf
+*.bat           text eol=crlf
+
diff --git a/sdk/greengrass/.gitignore b/sdk/greengrass/.gitignore
@@ -0,0 +1,9 @@
+# Ignore Gradle project-specific cache directory
+.gradle
+
+# Ignore Gradle build output directory
+build
+
+.idea
+*.swp
+*.swo
diff --git a/sdk/greengrass/event-stream-rpc-client/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCClient.java b/sdk/greengrass/event-stream-rpc-client/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCClient.java
@@ -65,6 +65,7 @@ protected void onContinuationMessage(List<Header> headers, byte[] payload, Messa
                                 operationModelContext, continuation, isContinuationClosed);
                     }
                     //intentionally not else if here. We can have data, and the terminate flag set
+
                     if ((messageFlags & MessageFlags.TerminateStream.getByteValue()) != 0) {
                         this.close();
                         handleClose(initialResponseReceived, responseFuture, streamResponseHandler);
@@ -92,6 +93,7 @@ protected void onContinuationMessage(List<Header> headers, byte[] payload, Messa
 
                     //TODO: application errors always have TerminateStream flag set?
                     //first close the stream immediately if the other side hasn't already done so
+
                     if ((messageFlags & MessageFlags.TerminateStream.getByteValue()) != 0) {
                         try {
                             this.close();
@@ -154,8 +156,6 @@ protected void onContinuationClosed() {
         return response;
     }
 
-    
-
     /**
      * Sends an empty close message on the open stream. 
      * @param continuation continuation to send the close message on
diff --git a/sdk/greengrass/event-stream-rpc-client/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCConnection.java b/sdk/greengrass/event-stream-rpc-client/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCConnection.java
@@ -158,6 +158,7 @@ protected void onProtocolMessage(List<Header> headers, byte[] payload, MessageTy
                             LOGGER.severe("Erroneous connect message type received by client. Closing");
                             //TODO: client sends protocol error here?
                             disconnect();
+
                         } else if (MessageType.ProtocolError.equals(messageType) || MessageType.ServerError.equals(messageType)) {
                             LOGGER.severe("Received " + messageType.name() + ": " + CRT.awsErrorName(CRT.awsLastError()));
                             connectionState.closeReason = EventStreamError.create(headers, payload, messageType);                            
diff --git a/sdk/greengrass/event-stream-rpc-model/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCServiceModel.java b/sdk/greengrass/event-stream-rpc-model/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCServiceModel.java
@@ -171,6 +171,7 @@ public JsonElement serialize(Instant src, Type typeOfSrc, JsonSerializationConte
     static {
         //TODO: find a reliable way to verify all of these are set? reflection cannot scan a package
         FRAMEWORK_APPLICATION_MODEL_TYPES.put(AccessDeniedException.ERROR_CODE, AccessDeniedException.class);
+
         FRAMEWORK_APPLICATION_MODEL_TYPES.put(UnsupportedOperationException.ERROR_CODE, UnsupportedOperationException.class);
         FRAMEWORK_APPLICATION_MODEL_TYPES.put(ValidationException.ERROR_CODE, ValidationException.class);
     }
diff --git a/sdk/greengrass/event-stream-rpc-server/src/main/java/software/amazon/awssdk/eventstreamrpc/AuthenticationData.java b/sdk/greengrass/event-stream-rpc-server/src/main/java/software/amazon/awssdk/eventstreamrpc/AuthenticationData.java
@@ -0,0 +1,16 @@
+package software.amazon.awssdk.eventstreamrpc;
+
+/**
+ * Exact implementation of this is between the EventStreamRPCServiceHandler at the Authentication handler itself
+ */
+public interface AuthenticationData {
+
+    /**
+     * Return a human readable string for who the identity of the client/caller is. This
+     * string must be appropriate for audit logs and enable tracing specific callers/clients
+     * to relevant decision and operations executed
+     *
+     * @return
+     */
+    public String getIdentityLabel();
+}
diff --git a/sdk/greengrass/event-stream-rpc-server/src/main/java/software/amazon/awssdk/eventstreamrpc/AuthenticationHandler.java b/sdk/greengrass/event-stream-rpc-server/src/main/java/software/amazon/awssdk/eventstreamrpc/AuthenticationHandler.java
@@ -0,0 +1,14 @@
+package software.amazon.awssdk.eventstreamrpc;
+
+import software.amazon.awssdk.crt.eventstream.Header;
+
+import java.util.List;
+import java.util.function.BiFunction;
+
+/**
+ * apply() accepts the connection message and produces authentication data from it to at least be
+ * used for authorization decisions
+ *
+ * Exact implementation is up to service implementations to decide what it is and how to handle it
+ */
+public interface AuthenticationHandler extends BiFunction<List<Header>, byte[], AuthenticationData> { }
diff --git a/sdk/greengrass/event-stream-rpc-server/src/main/java/software/amazon/awssdk/eventstreamrpc/Authorization.java b/sdk/greengrass/event-stream-rpc-server/src/main/java/software/amazon/awssdk/eventstreamrpc/Authorization.java
@@ -0,0 +1,11 @@
+package software.amazon.awssdk.eventstreamrpc;
+
+/**
+ * Authorization decision object contains the decision in general
+ * and the authentication data along with it.
+ *
+ */
+public enum Authorization {
+    ACCEPT,
+    REJECT
+}
diff --git a/sdk/greengrass/event-stream-rpc-server/src/main/java/software/amazon/awssdk/eventstreamrpc/AuthorizationHandler.java b/sdk/greengrass/event-stream-rpc-server/src/main/java/software/amazon/awssdk/eventstreamrpc/AuthorizationHandler.java
@@ -0,0 +1,13 @@
+package software.amazon.awssdk.eventstreamrpc;
+
+import java.util.function.Function;
+
+/**
+ * Handler receives the input data of the connection message and produces an authorization result
+ * which is a decision on accept or rejecting the connection
+ *
+ * -The apply function must return an Authorization object with a non-null AuthenticationData object
+ * returned. It's great idea for implementations to log appropriate input
+ *
+ */
+public interface AuthorizationHandler extends Function<AuthenticationData, Authorization> { }
diff --git a/sdk/greengrass/event-stream-rpc-server/src/main/java/software/amazon/awssdk/eventstreamrpc/DebugLoggingOperationHandler.java b/sdk/greengrass/event-stream-rpc-server/src/main/java/software/amazon/awssdk/eventstreamrpc/DebugLoggingOperationHandler.java
@@ -0,0 +1,60 @@
+package software.amazon.awssdk.eventstreamrpc;
+
+import com.google.gson.Gson;
+import software.amazon.awssdk.eventstreamrpc.model.EventStreamJsonMessage;
+
+import java.nio.charset.StandardCharsets;
+import java.util.logging.Logger;
+
+/**
+ * Useful to set as a handler for an operation with no implementation yet.
+ */
+public class DebugLoggingOperationHandler extends OperationContinuationHandler
+        <EventStreamJsonMessage, EventStreamJsonMessage, EventStreamJsonMessage, EventStreamJsonMessage> {
+    private static final Logger LOGGER = Logger.getLogger(DebugLoggingOperationHandler.class.getName());
+    private final OperationModelContext operationModelContext;
+
+    public DebugLoggingOperationHandler(final OperationModelContext modelContext, final OperationContinuationHandlerContext context) {
+        super(context);
+        this.operationModelContext = modelContext;
+    }
+
+    @Override
+    public OperationModelContext<EventStreamJsonMessage, EventStreamJsonMessage, EventStreamJsonMessage, EventStreamJsonMessage> getOperationModelContext() {
+        return operationModelContext;
+    }
+
+    /**
+     * Called when the underlying continuation is closed. Gives operations a chance to cleanup whatever
+     * resources may be on the other end of an open stream. Also invoked when an underlying ServerConnection
+     * is closed associated with the stream/continuation
+     */
+    @Override
+    protected void onStreamClosed() {
+        LOGGER.info(String.format("%s operation onStreamClosed()",
+                operationModelContext.getOperationName()));
+    }
+
+    @Override
+    public EventStreamJsonMessage handleRequest(EventStreamJsonMessage request) {
+        LOGGER.info(String.format("%s operation handleRequest() ::  %s", operationModelContext.getOperationName(),
+                operationModelContext.getServiceModel().toJson(request)));
+        return new EventStreamJsonMessage() {
+            @Override
+            public byte[] toPayload(Gson gson) {
+                return "{}".getBytes(StandardCharsets.UTF_8);
+            }
+
+            @Override
+            public String getApplicationModelType() {
+                return operationModelContext.getResponseApplicationModelType();
+            }
+        };
+    }
+
+    @Override
+    public void handleStreamEvent(EventStreamJsonMessage streamRequestEvent) {
+        LOGGER.info(String.format("%s operation handleStreamEvent() ::  %s", operationModelContext.getOperationName(),
+                operationModelContext.getServiceModel().toJson(streamRequestEvent)));
+    }
+}
diff --git a/sdk/greengrass/event-stream-rpc-server/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCServiceHandler.java b/sdk/greengrass/event-stream-rpc-server/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCServiceHandler.java
@@ -0,0 +1,60 @@
+package software.amazon.awssdk.eventstreamrpc;
+
+import java.util.Collection;
+
+public abstract class EventStreamRPCServiceHandler implements OperationContinuationHandlerFactory {
+    private AuthenticationHandler authenticationHandler;
+    private AuthorizationHandler authorizationHandler;
+
+    public EventStreamRPCServiceHandler() {
+        authorizationHandler = null;
+    }
+
+    protected abstract EventStreamRPCServiceModel getServiceModel();
+
+    /**
+     * Probably only useful for logging
+     * @return Returns the service name for the set of RPC operations
+     */
+    public String getServiceName() {
+        return getServiceModel().getServiceName();
+    }
+
+    /**
+     * TODO: How may we want to protect this from being re-assigned after service creation?
+     * @param handler
+     */
+    public void setAuthorizationHandler(final AuthorizationHandler handler) {
+        this.authorizationHandler = handler;
+    }
+
+    /**
+     * Use this to determine if the connection should be accepted or rejected for this service
+     *
+     * @return
+     */
+    public AuthorizationHandler getAuthorizationHandler() {
+        return authorizationHandler;
+    }
+
+    @Override
+    public Collection<String> getAllOperations() {
+        return getServiceModel().getAllOperations();
+    }
+
+    /**
+     * Pulls caller/client identity when server connection occurs
+     * @return
+     */
+    public AuthenticationHandler getAuthenticationHandler() {
+        return authenticationHandler;
+    }
+
+    /**
+     * TODO: How may we want to protect this from being re-assigned after service creation?
+     * @param authenticationHandler
+     */
+    public void setAuthenticationHandler(AuthenticationHandler authenticationHandler) {
+        this.authenticationHandler = authenticationHandler;
+    }
+}
diff --git a/sdk/greengrass/event-stream-rpc-server/src/main/java/software/amazon/awssdk/eventstreamrpc/InvalidServiceConfigurationException.java b/sdk/greengrass/event-stream-rpc-server/src/main/java/software/amazon/awssdk/eventstreamrpc/InvalidServiceConfigurationException.java
@@ -0,0 +1,15 @@
+package software.amazon.awssdk.eventstreamrpc;
+
+public class InvalidServiceConfigurationException extends RuntimeException {
+    public InvalidServiceConfigurationException(String msg) {
+        super(msg);
+    }
+
+    public InvalidServiceConfigurationException(String msg, Throwable cause) {
+        super(msg, cause);
+    }
+
+    public InvalidServiceConfigurationException(Throwable cause) {
+        super(cause);
+    }
+}
diff --git a/sdk/greengrass/event-stream-rpc-server/src/main/java/software/amazon/awssdk/eventstreamrpc/IpcServer.java b/sdk/greengrass/event-stream-rpc-server/src/main/java/software/amazon/awssdk/eventstreamrpc/IpcServer.java
diff --git a/sdk/greengrass/event-stream-rpc-server/src/main/java/software/amazon/awssdk/eventstreamrpc/OperationContinuationHandler.java b/sdk/greengrass/event-stream-rpc-server/src/main/java/software/amazon/awssdk/eventstreamrpc/OperationContinuationHandler.java
diff --git a/sdk/greengrass/event-stream-rpc-server/src/main/java/software/amazon/awssdk/eventstreamrpc/OperationContinuationHandlerContext.java b/sdk/greengrass/event-stream-rpc-server/src/main/java/software/amazon/awssdk/eventstreamrpc/OperationContinuationHandlerContext.java
diff --git a/sdk/greengrass/event-stream-rpc-server/src/main/java/software/amazon/awssdk/eventstreamrpc/OperationContinuationHandlerFactory.java b/sdk/greengrass/event-stream-rpc-server/src/main/java/software/amazon/awssdk/eventstreamrpc/OperationContinuationHandlerFactory.java
diff --git a/sdk/greengrass/event-stream-rpc-server/src/main/java/software/amazon/awssdk/eventstreamrpc/ServiceOperationMappingContinuationHandler.java b/sdk/greengrass/event-stream-rpc-server/src/main/java/software/amazon/awssdk/eventstreamrpc/ServiceOperationMappingContinuationHandler.java
diff --git a/sdk/greengrass/event-stream-rpc-server/src/test/java/software/amazon/awssdk/eventstreamrpc/EchoTestServiceTests.java b/sdk/greengrass/event-stream-rpc-server/src/test/java/software/amazon/awssdk/eventstreamrpc/EchoTestServiceTests.java
diff --git a/sdk/greengrass/event-stream-rpc-server/src/test/java/software/amazon/awssdk/eventstreamrpc/IpcServerTests.java b/sdk/greengrass/event-stream-rpc-server/src/test/java/software/amazon/awssdk/eventstreamrpc/IpcServerTests.java
diff --git a/sdk/greengrass/event-stream-rpc-server/src/test/java/software/amazon/awssdk/eventstreamrpc/OperationContinuationHandlerTests.java b/sdk/greengrass/event-stream-rpc-server/src/test/java/software/amazon/awssdk/eventstreamrpc/OperationContinuationHandlerTests.java

-Original file line number
+Diff line change
@@ @@ -0,0 +1,9 @@ @@
 +# Ignore Gradle project-specific cache directory
 +.gradle
++
 +# Ignore Gradle build output directory
 +build
++
 +.idea
 +*.swp
 +*.swo