TEST: add e2e test for proxy-proctol on haproxy side

Mo3m3n · Mo3m3n · commit 1bf6e37efd8e · 2021-11-29T03:12:15.000+01:00
diff --git a/deploy/tests/e2e/client.go b/deploy/tests/e2e/client.go
@@ -20,10 +20,13 @@ import (
 	"context"
 	"crypto/tls"
 	"fmt"
+	"io/ioutil"
 	"net"
 	"net/http"
 	"os"
 	"strings"
+
+	proxyproto "github.com/pires/go-proxyproto"
 )
 
 type Client struct {
@@ -128,6 +131,52 @@ func (c *Client) Do() (res *http.Response, close func() error, err error) {
 	return
 }
 
+func ProxyProtoConn() (result []byte, err error) {
+	kindURL := os.Getenv("KIND_URL")
+	if kindURL == "" {
+		kindURL = "127.0.0.1"
+	}
+	dstPort := HTTP_PORT
+
+	target, errAddr := net.ResolveTCPAddr("tcp", fmt.Sprintf("%s:%d", kindURL, dstPort))
+	if errAddr != nil {
+		return nil, errAddr
+	}
+
+	conn, errConn := net.DialTCP("tcp", nil, target)
+	if err != nil {
+		return nil, errConn
+	}
+	defer conn.Close()
+
+	// Create a proxyprotocol header
+	header := &proxyproto.Header{
+		Version:           1,
+		Command:           proxyproto.PROXY,
+		TransportProtocol: proxyproto.TCPv4,
+		SourceAddr: &net.TCPAddr{
+			IP:   net.ParseIP("10.1.1.1"),
+			Port: 1000,
+		},
+		DestinationAddr: &net.TCPAddr{
+			IP:   net.ParseIP("20.2.2.2"),
+			Port: 2000,
+		},
+	}
+
+	_, err = header.WriteTo(conn)
+	if err != nil {
+		return
+	}
+
+	_, err = conn.Write([]byte("HEAD / HTTP/1.0\r\n\r\n"))
+	if err != nil {
+		return
+	}
+
+	return ioutil.ReadAll(conn)
+}
+
 func GetGlobalHAProxyInfo() (info GlobalHAProxyInfo, err error) {
 	kindURL := os.Getenv("KIND_URL")
 	if kindURL == "" {
diff --git a/deploy/tests/e2e/global-config/config/configmap-maxconn.yaml b/deploy/tests/e2e/global-config/config/configmap-maxconn.yaml
diff --git a/deploy/tests/e2e/global-config/config/configmap-pp-1.yaml b/deploy/tests/e2e/global-config/config/configmap-pp-1.yaml
@@ -0,0 +1,22 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: haproxy-configmap
+ namespace: haproxy-controller
+data:
+  # Mandatory config
+  global-config-snippet: |
+    stats socket 0.0.0.0:31024
+  syslog-server: |
+    address: stdout, format: raw, facility:daemon
+  # Optional config
+  proxy-protocol: 0.0.0.0/0
+  maxconn: "1000"
+  server-slots: "4"
+  timeout-client: 50s
+  timeout-connect: 5s
+  timeout-http-keep-alive: 1m
+  timeout-http-request: 5s
+  timeout-queue: 5s
+  timeout-server: 50s
+  timeout-tunnel: 1h
diff --git a/deploy/tests/e2e/global-config/config/configmap-pp-2.yaml b/deploy/tests/e2e/global-config/config/configmap-pp-2.yaml
@@ -0,0 +1,22 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: haproxy-configmap
+ namespace: haproxy-controller
+data:
+  # Mandatory config
+  global-config-snippet: |
+    stats socket 0.0.0.0:31024
+  syslog-server: |
+    address: stdout, format: raw, facility:daemon
+  # Optional config
+  proxy-protocol: 192.168.1.1
+  maxconn: "1000"
+  server-slots: "4"
+  timeout-client: 50s
+  timeout-connect: 5s
+  timeout-http-keep-alive: 1m
+  timeout-http-request: 5s
+  timeout-queue: 5s
+  timeout-server: 50s
+  timeout-tunnel: 1h
diff --git a/deploy/tests/e2e/global-config/maxconn_test.go b/deploy/tests/e2e/global-config/maxconn_test.go
@@ -21,7 +21,7 @@ import (
 )
 
 func (suite *GlobalConfigSuite) TestMaxconn() {
-	suite.NoError(suite.test.Apply("config/configmap.yaml", "", nil))
+	suite.NoError(suite.test.Apply("config/configmap-maxconn.yaml", "", nil))
 	suite.maxconn = "1111"
 	suite.Eventually(suite.checkMaxconn, e2e.WaitDuration, e2e.TickDuration)
 
diff --git a/deploy/tests/e2e/global-config/proxy_protocol.go b/deploy/tests/e2e/global-config/proxy_protocol.go
@@ -0,0 +1,53 @@
+// Copyright 2019 HAProxy Technologies LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build e2e_sequential
+
+package globalconfig
+
+import (
+	"strings"
+
+	"github.com/haproxytech/kubernetes-ingress/deploy/tests/e2e"
+)
+
+func (suite *GlobalConfigSuite) Test_Proxy_Protocol() {
+	suite.Run("Source_IP_OK", func() {
+		suite.NoError(suite.test.Apply("config/configmap-pp-1.yaml", "", nil))
+		suite.Eventually(func() bool {
+			res, err := e2e.ProxyProtoConn()
+			if err != nil {
+				suite.T().Logf("Connection ERROR: %s", err.Error())
+				return false
+			}
+			return strings.Contains(string(res), "404 Not Found")
+		}, e2e.WaitDuration, e2e.TickDuration)
+	})
+
+	suite.Run("Source_IP_KO", func() {
+		suite.NoError(suite.test.Apply("config/configmap-pp-2.yaml", "", nil))
+		suite.Eventually(func() bool {
+			res, err := e2e.ProxyProtoConn()
+			if err != nil {
+				suite.T().Logf("Connection ERROR: %s", err.Error())
+				return false
+			}
+			suite.T().Logf("Result: %s", string(res))
+			return strings.Contains(string(res), "400 Bad request")
+		}, e2e.WaitDuration, e2e.TickDuration)
+	})
+
+	// revert to initial configmap
+	suite.NoError(suite.test.Apply("../../config/3.configmap.yaml", "", nil))
+}
diff --git a/deploy/tests/e2e/proxy-protocol/send_proxy_test.go b/deploy/tests/e2e/proxy-protocol/send_proxy_test.go
diff --git a/deploy/tests/e2e/send-proxy-protocol/config/deploy.yaml.tmpl b/deploy/tests/e2e/send-proxy-protocol/config/deploy.yaml.tmpl
diff --git a/deploy/tests/e2e/send-proxy-protocol/suite_test.go b/deploy/tests/e2e/send-proxy-protocol/suite_test.go
@@ -17,6 +17,7 @@
 package proxyprotocol
 
 import (
+	"io/ioutil"
 	"testing"
 
 	"github.com/stretchr/testify/suite"
@@ -45,6 +46,22 @@ func (suite *ProxyProtocolSuite) SetupSuite() {
 	suite.Require().NoError(suite.test.Apply("config/deploy.yaml.tmpl", suite.test.GetNS(), suite.tmplData))
 }
 
+func (suite *ProxyProtocolSuite) Test_Send_Proxy() {
+	suite.Eventually(func() bool {
+		res, cls, err := suite.client.Do()
+		if err != nil {
+			suite.T().Logf("Connection ERROR: %s", err.Error())
+			return false
+		}
+		defer cls()
+		body, err := ioutil.ReadAll(res.Body)
+		if err != nil {
+			return false
+		}
+		return string(body) == "hello!"
+	}, e2e.WaitDuration, e2e.TickDuration)
+}
+
 func (suite *ProxyProtocolSuite) TearDownSuite() {
 	suite.test.TearDown()
 }
diff --git a/go.mod b/go.mod
@@ -8,6 +8,7 @@ require (
 	github.com/haproxytech/client-native/v2 v2.5.2-0.20211021104411-038f5cf8ec14
 	github.com/haproxytech/config-parser/v4 v4.0.0-rc2.0.20211021093817-f9021b6ca61c
 	github.com/jessevdk/go-flags v1.4.0
+	github.com/pires/go-proxyproto v0.6.1
 	github.com/stretchr/testify v1.7.0
 	k8s.io/api v0.22.2
 	k8s.io/apimachinery v0.22.2
diff --git a/go.sum b/go.sum
@@ -305,6 +305,8 @@ github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtP
 github.com/pelletier/go-toml v1.4.0/go.mod h1:PN7xzY2wHTK0K9p34ErDQMlFxa51Fk0OUruD3k1mMwo=
 github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
+github.com/pires/go-proxyproto v0.6.1 h1:EBupykFmo22SDjv4fQVQd2J9NOoLPmyZA/15ldOGkPw=
+github.com/pires/go-proxyproto v0.6.1/go.mod h1:Odh9VFOZJCf9G8cLW5o435Xf1J95Jw9Gw5rnCjcwzAY=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ import (`
`21`	`21`	`)`
`22`	`22`
`23`	`23`	`func (suite *GlobalConfigSuite) TestMaxconn() {`
`24`		`- suite.NoError(suite.test.Apply("config/configmap.yaml", "", nil))`
	`24`	`+ suite.NoError(suite.test.Apply("config/configmap-maxconn.yaml", "", nil))`
`25`	`25`	`suite.maxconn = "1111"`
`26`	`26`	`suite.Eventually(suite.checkMaxconn, e2e.WaitDuration, e2e.TickDuration)`
`27`	`27`