Skip to content

Commit

Permalink
Fix NPE in ForwardedParser#authority() vert-x3#2629
Browse files Browse the repository at this point in the history
  • Loading branch information
b8b committed Jul 3, 2024
1 parent f0d037b commit a7edbe4
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ private void calculate() {
break;
}

if (((scheme.equalsIgnoreCase(HTTP_SCHEME) && port == 80) || (scheme.equalsIgnoreCase(HTTPS_SCHEME) && port == 443))) {
if ((scheme == null) || (scheme.equalsIgnoreCase(HTTP_SCHEME) && port == 80) || (scheme.equalsIgnoreCase(HTTPS_SCHEME) && port == 443)) {
port = -1;
}

Expand Down Expand Up @@ -192,8 +192,13 @@ private void calculateXForward() {
}

private void setHostAndPort(HostAndPort authority) {
host = authority.host();
port = authority.port();
if (authority == null) {
host = null;
port = -1;
} else {
host = authority.host();
port = authority.port();
}
}

private SocketAddress parseFor(String forToParse, int defaultPort) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
package io.vertx.ext.web.impl;

import io.vertx.core.http.HttpServerRequest;
import io.vertx.core.http.impl.HttpServerRequestInternal;
import io.vertx.ext.web.AllowForwardHeaders;
import org.junit.Test;

import static org.junit.Assert.assertNull;
import static org.mockito.Mockito.mock;

public class HttpServerRequestWrapperTest {

@Test
public void test_authority_can_be_null() {
HttpServerRequest request = mock(HttpServerRequestInternal.class);
HttpServerRequestWrapper wrapper = new HttpServerRequestWrapper(request, AllowForwardHeaders.NONE);
assertNull(request.authority());
assertNull(wrapper.authority());
}

@Test
public void test_scheme_can_be_null() {
HttpServerRequest request = mock(HttpServerRequestInternal.class);
HttpServerRequestWrapper wrapper = new HttpServerRequestWrapper(request, AllowForwardHeaders.NONE);
assertNull(request.scheme());
assertNull(wrapper.scheme());
}

@Test
public void test_path_can_be_null() {
HttpServerRequest request = mock(HttpServerRequestInternal.class);
HttpServerRequestWrapper wrapper = new HttpServerRequestWrapper(request, AllowForwardHeaders.NONE);
assertNull(request.path());
assertNull(wrapper.path());
}

@Test
public void test_query_can_be_null() {
HttpServerRequest request = mock(HttpServerRequestInternal.class);
HttpServerRequestWrapper wrapper = new HttpServerRequestWrapper(request, AllowForwardHeaders.NONE);
assertNull(request.query());
assertNull(wrapper.query());
}
}

0 comments on commit a7edbe4

Please sign in to comment.