Support VPC Lattice as an event source

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

@@ -27,6 +27,13 @@
             <version>1.2.3</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>24.0.1</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
@@ -63,6 +70,12 @@
             <version>6.2.3</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.30</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -0,0 +1,13 @@
+package com.amazonaws.serverless.proxy;
+
+import com.amazonaws.serverless.proxy.internal.jaxrs.AwsVpcLatticeV2SecurityContext;
+import com.amazonaws.serverless.proxy.model.VPCLatticeV2RequestEvent;
+import com.amazonaws.services.lambda.runtime.Context;
+import jakarta.ws.rs.core.SecurityContext;
+
+public class AwsVPCLatticeV2SecurityContextWriter implements SecurityContextWriter<VPCLatticeV2RequestEvent>{
+    @Override
+    public SecurityContext writeSecurityContext(VPCLatticeV2RequestEvent event, Context lambdaContext) {
+        return new AwsVpcLatticeV2SecurityContext(lambdaContext, event);
+    }
+}

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

@@ -40,6 +40,11 @@ public abstract class RequestReader<RequestType, ContainerRequestType> {
      */
     public static final String API_GATEWAY_CONTEXT_PROPERTY = "com.amazonaws.apigateway.request.context";
 
+    /**
+     * The key for the <strong>VPC Lattice V2 context</strong> property in the PropertiesDelegate object
+     */
+    public static final String VPC_LATTICE_V2_CONTEXT_PROPERTY = "com.amazonaws.vpclattice.request.context";
+
     /**
      * The key for the <strong>API Gateway stage variables</strong> property in the PropertiesDelegate object
      */
@@ -55,6 +60,11 @@ public abstract class RequestReader<RequestType, ContainerRequestType> {
      */
     public static final String API_GATEWAY_EVENT_PROPERTY = "com.amazonaws.apigateway.request";
 
+    /**
+     * The key to store the entire VPC Lattice V2 event
+     */
+    public static final String VPC_LATTICE_V2_EVENT_PROPERTY = "com.amazonaws.vpclattice.request";
+
     /**
      * The key for the <strong>AWS Lambda context</strong> property in the PropertiesDelegate object
      */

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

@@ -0,0 +1,55 @@
+package com.amazonaws.serverless.proxy.internal.jaxrs;
+
+import com.amazonaws.serverless.proxy.model.VPCLatticeV2RequestEvent;
+import com.amazonaws.services.lambda.runtime.Context;
+import jakarta.ws.rs.core.SecurityContext;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.security.Principal;
+import java.util.Objects;
+
+/**
+ * default implementation of the <code>SecurityContext</code> object. This class supports 1 VPC Lattice authentication type:
+ * AWS_IAM.
+ */
+@Getter
+@AllArgsConstructor
+public class AwsVpcLatticeV2SecurityContext implements SecurityContext {
+
+    static final String AUTH_SCHEME_AWS_IAM = "AWS_IAM";
+
+
+    private final Context lambdaContext;
+    private final VPCLatticeV2RequestEvent event;
+
+    //-------------------------------------------------------------
+    // Implementation - SecurityContext
+    //-------------------------------------------------------------
+    @Override
+    public Principal getUserPrincipal() {
+        if (Objects.equals(getAuthenticationScheme(), AUTH_SCHEME_AWS_IAM)) {
+            return () -> getEvent().getRequestContext().getIdentity().getPrincipal();
+        }
+        return null;
+    }
+
+    @Override
+    public boolean isUserInRole(String role) {
+        return role.equals(event.getRequestContext().getIdentity().getPrincipal());
+    }
+
+    @Override
+    public boolean isSecure() {
+        return getAuthenticationScheme() != null;
+    }
+
+    @Override
+    public String getAuthenticationScheme() {
+        if (Objects.equals(getEvent().getRequestContext().getIdentity().getType(), AUTH_SCHEME_AWS_IAM)) {
+            return AUTH_SCHEME_AWS_IAM;
+        } else {
+            return null;
+        }
+    }
+}

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

@@ -125,7 +125,7 @@ public String format(ContainerRequestType servletRequest, ContainerResponseType
         logLineBuilder.append(" ");
         logLineBuilder.append(servletRequest.getRequestURI());
         logLineBuilder.append(" ");
-        logLineBuilder.append(servletRequest.getProtocol());
+        //logLineBuilder.append(servletRequest.getProtocol());
         logLineBuilder.append("\" ");
 
         // %>s

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

@@ -108,56 +108,27 @@ public Cookie[] getCookies() {
 
     @Override
     public long getDateHeader(String s) {
-        if (headers == null) {
-            return -1L;
-        }
-        String dateString = headers.getFirst(s);
-        if (dateString == null) {
-            return -1L;
-        }
-        try {
-            return Instant.from(ZonedDateTime.parse(dateString, dateFormatter)).toEpochMilli();
-        } catch (DateTimeParseException e) {
-            log.warn("Invalid date header in request: " + SecurityUtils.crlf(dateString));
-            return -1L;
-        }
+        return getDateHeader(s, headers);
     }
 
     @Override
     public String getHeader(String s) {
-        if (headers == null) {
-            return null;
-        }
-        return headers.getFirst(s);
+        return getHeader(s, headers);
     }
 
     @Override
     public Enumeration<String> getHeaders(String s) {
-        if (headers == null || !headers.containsKey(s)) {
-            return Collections.emptyEnumeration();
-        }
-        return Collections.enumeration(headers.get(s));
+        return getHeaders(s, headers);
     }
 
     @Override
     public Enumeration<String> getHeaderNames() {
-        if (headers == null) {
-            return Collections.emptyEnumeration();
-        }
-        return Collections.enumeration(headers.keySet());
+        return getHeaderNames(headers);
     }
 
     @Override
     public int getIntHeader(String s) {
-        if (headers == null) {
-            return -1;
-        }
-        String headerValue = headers.getFirst(s);
-        if (headerValue == null || "".equals(headerValue)) {
-            return -1;
-        }
-
-        return Integer.parseInt(headerValue);
+        return getIntHeader(s, headers);
     }
 
     @Override
@@ -250,30 +221,17 @@ public String getCharacterEncoding() {
 
     @Override
     public void setCharacterEncoding(String s) throws UnsupportedEncodingException {
-        if (headers == null || !headers.containsKey(HttpHeaders.CONTENT_TYPE)) {
-            log.debug("Called set character encoding to " + SecurityUtils.crlf(s) + " on a request without a content type. Character encoding will not be set");
-            return;
-        }
-        String currentContentType = headers.getFirst(HttpHeaders.CONTENT_TYPE);
-        headers.putSingle(HttpHeaders.CONTENT_TYPE, appendCharacterEncoding(currentContentType, s));
+        setCharacterEncoding(s, headers);
     }
 
     @Override
     public int getContentLength() {
-        String headerValue = headers.getFirst(HttpHeaders.CONTENT_LENGTH);
-        if (headerValue == null) {
-            return -1;
-        }
-        return Integer.parseInt(headerValue);
+        return getContentLength(headers);
     }
 
     @Override
     public long getContentLengthLong() {
-        String headerValue = headers.getFirst(HttpHeaders.CONTENT_LENGTH);
-        if (headerValue == null) {
-            return -1;
-        }
-        return Long.parseLong(headerValue);
+        return getContentLengthLong(headers);
     }
 
     @Override
@@ -286,17 +244,7 @@ public String getContentType() {
 
     @Override
     public String getParameter(String s) {
-        String queryStringParameter = getFirstQueryParamValue(queryString, s, config.isQueryStringCaseSensitive());
-        if (queryStringParameter != null) {
-            return queryStringParameter;
-        }
-
-        String[] bodyParams = getFormBodyParameterCaseInsensitive(s);
-        if (bodyParams.length == 0) {
-            return null;
-        } else {
-            return bodyParams[0];
-        }
+        return getParameter(queryString, s, config.isQueryStringCaseSensitive());
     }
 
     @Override
@@ -315,7 +263,7 @@ public String[] getParameterValues(String s) {
 
         values.addAll(Arrays.asList(getFormBodyParameterCaseInsensitive(s)));
 
-        if (values.size() == 0) {
+        if (values.isEmpty()) {
             return null;
         } else {
             return values.toArray(new String[0]);
@@ -456,6 +404,8 @@ public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse se
         return asyncContext;
     }
 
+
+
     @Override
     public AsyncContext getAsyncContext() {
         if (asyncContext == null) {
@@ -505,7 +455,7 @@ private MultiValuedTreeMap<String, String> parseRawQueryString(String qs) {
         return qsMap;
     }
 
-    private Headers headersMapToMultiValue(Map<String, String> headers) {
+    protected static Headers headersMapToMultiValue(Map<String, String> headers) {
         if (headers == null || headers.size() == 0) {
             return new Headers();
         }