Skip to content

Commit 04a0e63

Browse files
committed
fix ArrayIndexOutOfBoundsException on getRemotePort()
1 parent b0058d1 commit 04a0e63

1 file changed

Lines changed: 5 additions & 6 deletions

File tree

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -444,10 +444,10 @@ public String getRemoteAddr() {
444444
@Override
445445
public String getRemoteHost() {
446446
if (Objects.nonNull(request.getRequestContext().getElb())) {
447-
String host_header = request.getHeaders().get(HttpHeaders.HOST);
447+
String hostHeader = request.getHeaders().get(HttpHeaders.HOST);
448448

449449
// the host header has the form host:port, so we split the string to get the host part
450-
return Arrays.asList(host_header.split(":")).get(0);
450+
return Arrays.asList(hostHeader.split(":")).get(0);
451451
}
452452

453453
return request.getMultiValueHeaders().getFirst(HttpHeaders.HOST);
@@ -481,10 +481,9 @@ public RequestDispatcher getRequestDispatcher(String s) {
481481
@Override
482482
public int getRemotePort() {
483483
if (Objects.nonNull(request.getRequestContext().getElb())) {
484-
String hostHeader = request.getHeaders().get(HttpHeaders.HOST);
485-
String port = Arrays.asList(hostHeader.split(":")).get(1);
486-
if (Objects.nonNull(port))
487-
return Integer.parseInt(port);
484+
String hostHeader = request.getHeaders().get(PORT_HEADER_NAME);
485+
if (Objects.nonNull(hostHeader))
486+
return Integer.parseInt(hostHeader);
488487
}
489488
return 0;
490489
}

0 commit comments

Comments
 (0)