Add some more integration tests for forward proxy

- Test the difference in behavior with port numbers included in the uri and not
envoyproxy · Aug 22, 2017 · eea1f7f · alyssawilk · Aug 22, 2017 · eea1f7f
1 parent 363df1b
commit eea1f7f
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 0 deletions.
diff --git a/test/config/integration/server.json b/test/config/integration/server.json
@@ -148,6 +148,17 @@
                 }
               ]
             },
+            {
+              "name": "redirect",
+              "domains": [ "www.namewithport.com:1234" ],
+              "require_ssl": "all",
+              "routes": [
+                {
+                  "prefix": "/",
+                  "cluster": "cluster_1"
+                }
+              ]
+            },
             {
               "name": "integration",
               "domains": [ "*" ],

diff --git a/test/integration/integration.cc b/test/integration/integration.cc
@@ -967,6 +967,36 @@ void BaseIntegrationTest::testAbsolutePath() {
   EXPECT_FALSE(response.find("HTTP/1.1 404 Not Found\r\n") == 0);
 }
 
+void BaseIntegrationTest::testAbsolutePathWithPort() {
+  Buffer::OwnedImpl buffer("GET http://www.namewithport.com:1234 HTTP/1.1\r\nHost: host\r\n\r\n");
+  std::string response;
+  RawConnectionDriver connection(
+      lookupPort("http_forward"), buffer,
+      [&](Network::ClientConnection& client, const Buffer::Instance& data) -> void {
+        response.append(TestUtility::bufferToString(data));
+        client.close(Network::ConnectionCloseType::NoFlush);
+      },
+      version_);
+
+  connection.run();
+  EXPECT_FALSE(response.find("HTTP/1.1 404 Not Found\r\n") == 0);
+}
+
+void BaseIntegrationTest::testAbsolutePathWithoutPort() {
+  Buffer::OwnedImpl buffer("GET http://www.namewithport.com HTTP/1.1\r\nHost: host\r\n\r\n");
+  std::string response;
+  RawConnectionDriver connection(
+      lookupPort("http_forward"), buffer,
+      [&](Network::ClientConnection& client, const Buffer::Instance& data) -> void {
+        response.append(TestUtility::bufferToString(data));
+        client.close(Network::ConnectionCloseType::NoFlush);
+      },
+      version_);
+
+  connection.run();
+  EXPECT_TRUE(response.find("HTTP/1.1 404 Not Found\r\n") == 0);
+}
+
 void BaseIntegrationTest::testAllowAbsoluteSameRelative() {
   // Ensure that relative urls behave the same with allow_absolute_url enabled and without
   testEquivalent("GET /foo/bar HTTP/1.1\r\nHost: host\r\n\r\n");

diff --git a/test/integration/integration.h b/test/integration/integration.h
@@ -224,6 +224,8 @@ class BaseIntegrationTest : Logger::Loggable<Logger::Id::testing> {
   void testUpstreamProtocolError();
   void testBadPath();
   void testAbsolutePath();
+  void testAbsolutePathWithPort();
+  void testAbsolutePathWithoutPort();
   void testConnect();
   void testAllowAbsoluteSameRelative();
   // Test that a request returns the same content with both allow_absolute_urls enabled and

diff --git a/test/integration/integration_test.cc b/test/integration/integration_test.cc
@@ -131,6 +131,10 @@ TEST_P(IntegrationTest, BadPath) { testBadPath(); }
 
 TEST_P(IntegrationTest, AbsolutePath) { testAbsolutePath(); }
 
+TEST_P(IntegrationTest, AbsolutePathWithPort) { testAbsolutePathWithPort(); }
+
+TEST_P(IntegrationTest, AbsolutePathWithoutPort) { testAbsolutePathWithoutPort(); }
+
 TEST_P(IntegrationTest, Connect) { testConnect(); }
 
 TEST_P(IntegrationTest, ValidZeroLengthContent) {