Merge pull request #202 from awslabs/core

Merging 1.2 changes from core branch

Author: sapessi

README.md

@@ -1,11 +1,12 @@
 # Serverless Java container [![Build Status](https://travis-ci.org/awslabs/aws-serverless-java-container.svg?branch=master)](https://travis-ci.org/awslabs/aws-serverless-java-container) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.amazonaws.serverless/aws-serverless-java-container/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.amazonaws.serverless/aws-serverless-java-container) [![Help](http://img.shields.io/badge/help-gitter-E91E63.svg?style=flat-square)](https://gitter.im/awslabs/aws-serverless-java-container)
-The `aws-serverless-java-container` makes it easy to run Java applications written with frameworks such as [Spring](https://spring.io/), [Spring Boot](https://projects.spring.io/spring-boot/), [Jersey](https://jersey.java.net/), or [Spark](http://sparkjava.com/) in [AWS Lambda](https://aws.amazon.com/lambda/).
+The `aws-serverless-java-container` makes it easy to run Java applications written with frameworks such as [Spring](https://spring.io/), [Spring Boot](https://projects.spring.io/spring-boot/), [Apache Struts](http://struts.apache.org/), [Jersey](https://jersey.java.net/), or [Spark](http://sparkjava.com/) in [AWS Lambda](https://aws.amazon.com/lambda/).
 
 Serverless Java Container natively supports API Gateway's proxy integration models for requests and responses, you can create and inject custom models for methods that use custom mappings.
 
 Follow the quick start guides in [our wiki](https://github.com/awslabs/aws-serverless-java-container/wiki) to integrate Serverless Java Container with your project:
 * [Spring quick start](https://github.com/awslabs/aws-serverless-java-container/wiki/Quick-start---Spring)
 * [Spring Boot quick start](https://github.com/awslabs/aws-serverless-java-container/wiki/Quick-start---Spring-Boot)
+* [Apache Struts quick start](https://github.com/awslabs/aws-serverless-java-container/wiki/Quick-start-Struts)
 * [Jersey quick start](https://github.com/awslabs/aws-serverless-java-container/wiki/Quick-start---Jersey)
 * [Spark quick start](https://github.com/awslabs/aws-serverless-java-container/wiki/Quick-start---Spark)   
 
@@ -28,9 +29,6 @@ public class StreamLambdaHandler implements RequestStreamHandler {
     public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context)
             throws IOException {
         handler.proxyStream(inputStream, outputStream, context);
-
-        // just in case it wasn't closed by the mapper
-        outputStream.close();
     }
 }
 ``` 

aws-serverless-java-container-core/pom.xml

@@ -12,10 +12,11 @@
         <groupId>com.amazonaws.serverless</groupId>
         <artifactId>aws-serverless-java-container</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>..</relativePath>
     </parent>
 
     <properties>
-        <jackson.version>2.9.5</jackson.version>
+        <jackson.version>2.9.7</jackson.version>
         <jaxrs.version>2.1</jaxrs.version>
         <servlet.version>3.1.0</servlet.version>
     </properties>
@@ -49,6 +50,14 @@
             <version>${jackson.version}</version>
         </dependency>
 
+        <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.module/jackson-module-afterburner -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-afterburner</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+
+
         <!-- https://mvnrepository.com/artifact/commons-fileupload/commons-fileupload -->
         <dependency>
             <groupId>commons-fileupload</groupId>
@@ -67,6 +76,50 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.8.1</version>
+                <configuration>
+                    <destFile>${basedir}/target/coverage-reports/jacoco-unit.exec</destFile>
+                    <dataFile>${basedir}/target/coverage-reports/jacoco-unit.exec</dataFile>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>default-prepare-agent</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>jacoco-site</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>jacoco-check</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                        <configuration>
+                            <haltOnFailure>true</haltOnFailure>
+                            <rules><rule>
+                                <element>BUNDLE</element>
+                                <limits>
+                                    <limit>
+                                        <counter>INSTRUCTION</counter>
+                                        <value>COVEREDRATIO</value>
+                                        <minimum>${jacoco.minCoverage}</minimum>
+                                    </limit>
+                                </limits>
+                            </rule></rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs-maven-plugin</artifactId>
@@ -109,7 +162,7 @@
             <plugin>
                 <groupId>org.owasp</groupId>
                 <artifactId>dependency-check-maven</artifactId>
-                <version>3.1.1</version>
+                <version>3.3.2</version>
                 <configuration>
                     <skipProvidedScope>true</skipProvidedScope>
                     <suppressionFiles>

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/AwsProxyExceptionHandler.java

@@ -16,6 +16,7 @@
 import com.amazonaws.serverless.proxy.internal.LambdaContainerHandler;
 import com.amazonaws.serverless.proxy.model.AwsProxyResponse;
 import com.amazonaws.serverless.proxy.model.ErrorModel;
+import com.amazonaws.serverless.proxy.model.MultiValuedTreeMap;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -57,14 +58,14 @@ public class AwsProxyExceptionHandler
     // Variables - Private - Static
     //-------------------------------------------------------------
 
-    private static Map<String, String> headers = new HashMap<>();
+    private static MultiValuedTreeMap<String, String> headers = new MultiValuedTreeMap<>(String.CASE_INSENSITIVE_ORDER);
 
     //-------------------------------------------------------------
     // Constructors
     //-------------------------------------------------------------
 
     static {
-        headers.put(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON);
+        headers.putSingle(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON);
     }
 
 

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/LambdaContainerHandler.java

@@ -28,6 +28,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectReader;
 import com.fasterxml.jackson.databind.ObjectWriter;
+import com.fasterxml.jackson.module.afterburner.AfterburnerModule;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -81,6 +82,9 @@ public abstract class LambdaContainerHandler<RequestType, ResponseType, Containe
 
     private static ContainerConfig config = ContainerConfig.defaultConfig();
     private static ObjectMapper objectMapper = new ObjectMapper();
+    static {
+        objectMapper.registerModule(new AfterburnerModule());
+    }
 
 
 
@@ -135,8 +139,13 @@ public static ObjectMapper getObjectMapper() {
      * @param basePath The base path to be stripped from the request
      */
     public void stripBasePath(String basePath) {
-        config.setStripBasePath(true);
-        config.setServiceBasePath(basePath);
+        if (basePath == null || "".equals(basePath)) {
+            config.setStripBasePath(false);
+            config.setServiceBasePath(null);
+        } else {
+            config.setStripBasePath(true);
+            config.setServiceBasePath(basePath);
+        }
     }
 
     /**
@@ -206,6 +215,9 @@ public void proxyStream(InputStream input, OutputStream output, Context context)
         } catch (JsonMappingException e) {
             log.error("Error while mapping object to RequestType class", e);
             getObjectMapper().writeValue(output, exceptionHandler.handle(e));
+        } finally {
+            output.flush();
+            output.close();
         }
     }
 

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/SecurityUtils.java

@@ -168,12 +168,16 @@ public static String getValidFilePath(String inputPath) {
      * @throws IllegalArgumentException If the given path is not valid or outside of /tmp
      */
     @SuppressFBWarnings("PATH_TRAVERSAL_IN")
-    public static String getValidFilePath(String inputPath, boolean isWrite) {
+    public static String getValidFilePath(final String inputPath, boolean isWrite) {
         if (inputPath == null || "".equals(inputPath.trim())) {
             return null;
         }
+        String testInputPath = inputPath;
+        if (testInputPath.startsWith("file://")) {
+            testInputPath = testInputPath.substring(6);
+        }
 
-        File f = new File(inputPath);
+        File f = new File(testInputPath);
         try {
             String canonicalPath = f.getCanonicalPath();
 
@@ -192,9 +196,9 @@ public static String getValidFilePath(String inputPath, boolean isWrite) {
                 throw new IllegalArgumentException("File path not allowed: " + encode(canonicalPath));
             }
 
-            return canonicalPath;
+            return (inputPath.startsWith("file://") ? "file://" + canonicalPath : canonicalPath);
         } catch (IOException e) {
-            log.error("Invalid file path: {}", encode(inputPath));
+            log.error("Invalid file path: {}", encode(testInputPath));
             throw new IllegalArgumentException("Invalid file path", e);
         }
     }

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/ApacheCombinedServletLogFormatter.java

@@ -108,7 +108,7 @@ public String format(ContainerRequestType servletRequest, ContainerResponseType
         logLineBuilder.append("\"");
         logLineBuilder.append(servletRequest.getMethod().toUpperCase(Locale.ENGLISH));
         logLineBuilder.append(" ");
-        logLineBuilder.append(servletRequest.getPathInfo());
+        logLineBuilder.append(servletRequest.getRequestURI());
         logLineBuilder.append(" ");
         logLineBuilder.append(servletRequest.getProtocol());
         logLineBuilder.append("\" ");