Skip to content

Fix: Incorrect ServerName with ALB #684

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Nov 19, 2023
Merged

Fix: Incorrect ServerName with ALB #684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions ...a-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/SecurityUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
*/
package com.amazonaws.serverless.proxy.internal;

import com.amazonaws.serverless.proxy.model.AlbContext;
import com.amazonaws.serverless.proxy.model.AwsProxyRequestContext;
import com.amazonaws.serverless.proxy.model.ContainerConfig;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import org.slf4j.Logger;
Expand All @@ -21,6 +23,7 @@
import java.io.IOException;
import java.util.HashSet;
import java.util.Locale;
import java.util.Objects;
import java.util.Set;

/**
Expand Down Expand Up @@ -60,11 +63,15 @@ public static boolean isValidScheme(String scheme) {
return SCHEMES.contains(scheme);
}

public static boolean isValidHost(String host, String apiId, String region) {
public static boolean isValidHost(String host, String apiId, AlbContext elb, String region) {
if (host == null) {
return false;
}
if (host.endsWith(".amazonaws.com")) {
if (!Objects.isNull(elb)) {
String albhost = new StringBuilder().append(region)
.append(".elb.amazonaws.com").toString();
return host.endsWith(albhost) || LambdaContainerHandler.getContainerConfig().getCustomDomainNames().contains(host);
} else if (host.endsWith(".amazonaws.com")) {
String defaultHost = new StringBuilder().append(apiId)
.append(".execute-api.")
.append(region)
Expand Down
2 changes: 1 addition & 1 deletion .../com/amazonaws/serverless/proxy/internal/servlet/AwsHttpApiV2ProxyHttpServletRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ public String getServerName() {

if (headers != null && headers.containsKey(HOST_HEADER_NAME)) {
String hostHeader = headers.getFirst(HOST_HEADER_NAME);
if (SecurityUtils.isValidHost(hostHeader, request.getRequestContext().getApiId(), region)) {
if (SecurityUtils.isValidHost(hostHeader, request.getRequestContext().getApiId(), request.getRequestContext().getElb(), region)) {
return hostHeader;
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsProxyHttpServletRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ public String getServerName() {

if (request.getMultiValueHeaders() != null && request.getMultiValueHeaders().containsKey(HOST_HEADER_NAME)) {
String hostHeader = request.getMultiValueHeaders().getFirst(HOST_HEADER_NAME);
if (SecurityUtils.isValidHost(hostHeader, request.getRequestContext().getApiId(), region)) {
if (SecurityUtils.isValidHost(hostHeader, request.getRequestContext().getApiId(), request.getRequestContext().getElb(), region)) {
return hostHeader;
}
}
Expand Down
11 changes: 11 additions & 0 deletions .../java/com/amazonaws/serverless/proxy/internal/servlet/AwsProxyHttpServletRequestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import com.amazonaws.serverless.proxy.internal.testutils.AwsProxyRequestBuilder;

import com.amazonaws.services.lambda.runtime.Context;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;

Expand Down Expand Up @@ -640,6 +641,16 @@ void serverName_hostHeader_returnsHostHeaderOnly(String type) {
assertEquals("testapi.com", serverName);
}

@Test
void serverName_albHostHeader_returnsHostHeader() {
initAwsProxyHttpServletRequestTest("ALB");
AwsProxyRequestBuilder proxyReq = new AwsProxyRequestBuilder("/test", "GET")
.header(HttpHeaders.HOST, "testapi.us-east-1.elb.amazonaws.com");
HttpServletRequest servletReq = getRequest(proxyReq, null, null);
String serverName = servletReq.getServerName();
assertEquals("testapi.us-east-1.elb.amazonaws.com", serverName);
}

private AwsProxyRequestBuilder getRequestWithHeaders() {
return new AwsProxyRequestBuilder("/hello", "GET")
.header(CUSTOM_HEADER_KEY, CUSTOM_HEADER_VALUE)
Expand Down