forked from envoyproxy/envoy
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
envoy: allowing alt-svc from IPs, fixing HTTP/3 cert bypass (envoypro…
…xy#35551) This adds a real HTTP/3 test for Envoy mobile's Cronet APIs. In order for this to work it fixes 2 issues in Envoy, the first that the connection grid didn't do lookups for ip based hostname. The second that ACCEPT_UNTRUSTED didn't fully work for QUIC. Risk Level: low Testing: e2e test Docs Changes: n/a Release Notes: inline [Optional Runtime guard:] guarded both functional changes --------- Signed-off-by: Alyssa Wilk <[email protected]>
- Loading branch information
1 parent
dae96ec
commit aa8d0f7
Showing
19 changed files
with
260 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| package org.chromium.net; | ||
|
|
||
| import static org.chromium.net.testing.CronetTestRule.getContext; | ||
| import static org.junit.Assert.assertEquals; | ||
|
|
||
| import org.chromium.net.impl.CronvoyUrlRequestContext; | ||
| import io.envoyproxy.envoymobile.engine.EnvoyEngine; | ||
| import org.chromium.net.impl.CronvoyLogger; | ||
| import androidx.test.core.app.ApplicationProvider; | ||
| import androidx.test.filters.SmallTest; | ||
| import org.chromium.net.impl.CronvoyUrlRequestContext; | ||
| import org.chromium.net.impl.NativeCronvoyEngineBuilderImpl; | ||
| import org.chromium.net.testing.CronetTestRule; | ||
| import org.chromium.net.testing.CronetTestRule.CronetTestFramework; | ||
| import org.chromium.net.testing.CronetTestRule.RequiresMinApi; | ||
| import org.chromium.net.testing.Feature; | ||
| import org.chromium.net.testing.TestUrlRequestCallback; | ||
| import org.chromium.net.testing.TestUrlRequestCallback.ResponseStep; | ||
| import io.envoyproxy.envoymobile.engine.JniLibrary; | ||
| import org.junit.After; | ||
| import org.junit.Before; | ||
| import org.junit.BeforeClass; | ||
| import org.junit.Rule; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
| import org.robolectric.RobolectricTestRunner; | ||
| import io.envoyproxy.envoymobile.engine.testing.HttpTestServerFactory; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
| import java.util.Collections; | ||
|
|
||
| /** | ||
| * Test CronetEngine with production HTTP/3 logic | ||
| */ | ||
| @RunWith(RobolectricTestRunner.class) | ||
| public class CronetHttp3Test { | ||
| @Rule public final CronetTestRule mTestRule = new CronetTestRule(); | ||
|
|
||
| private static final String TAG = CronetHttp3Test.class.getSimpleName(); | ||
|
|
||
| // URLs used for tests. | ||
|
|
||
| // If true, dump envoy logs on test completion. | ||
| // Ideally we could override this from the command line but that's TBD. | ||
| private boolean printEnvoyLogs = false; | ||
| // The HTTP/2 server, set up to alt-svc to the HTTP/3 server | ||
| private HttpTestServerFactory.HttpTestServer http2TestServer; | ||
| // The HTTP/3 server | ||
| private HttpTestServerFactory.HttpTestServer http3TestServer; | ||
| // An optional CronvoyLogger, set up if printEnvoyLogs is true. | ||
| private CronvoyLogger logger; | ||
| // The engine for this test. | ||
| private CronvoyUrlRequestContext cronvoyEngine; | ||
|
|
||
| @BeforeClass | ||
| public static void loadJniLibrary() { | ||
| JniLibrary.loadTestLibrary(); | ||
| } | ||
|
|
||
| public void setUp(boolean setUpLogging) throws Exception { | ||
| // Set up the HTTP/3 server | ||
| Map<String, String> headers = new HashMap<>(); | ||
| http3TestServer = HttpTestServerFactory.start(HttpTestServerFactory.Type.HTTP3, 0, headers, | ||
| "This is a simple text file served by QUIC.\n", | ||
| Collections.emptyMap()); | ||
| // Next set up the HTTP/2 server, advertising HTTP/3 support for the HTTP/3 server | ||
| String altSvc = "h3=\":" + http3TestServer.getPort() + "\"; ma=86400"; | ||
| headers.put("alt-svc", altSvc); | ||
| // Note that the HTTP/2 server must start on the same port as Envoy currently does not accept | ||
| // alt-svc with differing ports. This may cause problems if this UDP port is in use at which | ||
| // point listening on 127.0.0.N where N!=1 may improve flakiness. | ||
| http2TestServer = HttpTestServerFactory.start( | ||
| HttpTestServerFactory.Type.HTTP2_WITH_TLS, http3TestServer.getPort(), headers, | ||
| "This is a simple text file served by QUIC.\n", Collections.emptyMap()); | ||
|
|
||
| // Optionally, set up logging. This will slow down the tests a bit but make debugging much | ||
| // easier. | ||
| if (setUpLogging) { | ||
| logger = new CronvoyLogger() { | ||
| @Override | ||
| public void log(int logLevel, String message) { | ||
| System.out.print(message); | ||
| } | ||
| }; | ||
| } | ||
| } | ||
|
|
||
| @After | ||
| public void tearDown() throws Exception { | ||
| // Shut down Envoy and the test servers. | ||
| cronvoyEngine.shutdown(); | ||
| http2TestServer.shutdown(); | ||
| http3TestServer.shutdown(); | ||
| } | ||
|
|
||
| @Test | ||
| @SmallTest | ||
| @Feature({"Cronet"}) | ||
| public void testInitEngineAndStartRequest() throws Exception { | ||
| // Ideally we could override this from the command line but that's TBD. | ||
| setUp(printEnvoyLogs); | ||
|
|
||
| // Set up the Envoy engine. | ||
| NativeCronvoyEngineBuilderImpl nativeCronetEngineBuilder = | ||
| new NativeCronvoyEngineBuilderImpl(ApplicationProvider.getApplicationContext()); | ||
| if (printEnvoyLogs) { | ||
| nativeCronetEngineBuilder.setLogger(logger); | ||
| nativeCronetEngineBuilder.setLogLevel(EnvoyEngine.LogLevel.TRACE); | ||
| } | ||
| // Make sure the handshake will work despite lack of real certs. | ||
| nativeCronetEngineBuilder.setMockCertVerifierForTesting(); | ||
| cronvoyEngine = new CronvoyUrlRequestContext(nativeCronetEngineBuilder); | ||
|
|
||
| // Do a request to https://127.0.0.1:test_server_port/ | ||
| TestUrlRequestCallback callback1 = new TestUrlRequestCallback(); | ||
| String newUrl = "https://" + http2TestServer.getAddress() + "/"; | ||
| UrlRequest.Builder urlRequestBuilder = | ||
| cronvoyEngine.newUrlRequestBuilder(newUrl, callback1, callback1.getExecutor()); | ||
| urlRequestBuilder.build().start(); | ||
| callback1.blockForDone(); | ||
|
|
||
| // Make sure the request succeeded. It should go out over HTTP/2 as it's the first | ||
| // request and HTTP/3 support is not established. | ||
| assertEquals(200, callback1.mResponseInfo.getHttpStatusCode()); | ||
| assertEquals("h2", callback1.mResponseInfo.getNegotiatedProtocol()); | ||
|
|
||
| // Set up a second request, which will hopefully go out over HTTP/3 due to alt-svc | ||
| // advertisement. | ||
| TestUrlRequestCallback callback2 = new TestUrlRequestCallback(); | ||
| UrlRequest.Builder urlRequestBuilder2 = | ||
| cronvoyEngine.newUrlRequestBuilder(newUrl, callback2, callback2.getExecutor()); | ||
| urlRequestBuilder2.build().start(); | ||
| callback2.blockForDone(); | ||
|
|
||
| // Verify the second request used HTTP/3 | ||
| assertEquals(200, callback2.mResponseInfo.getHttpStatusCode()); | ||
| assertEquals("h3", callback2.mResponseInfo.getNegotiatedProtocol()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.