Merge pull request #24 from mysteriumnetwork/feature/e2e-test

Gracefully handle HTTP requests with close header

e2e/Dockerfile

@@ -1,7 +1,7 @@
 FROM golang:1.18-alpine
 
 # Install packages
-RUN apk add --update --no-cache bash git gcc musl-dev make iptables bind-tools
+RUN apk add --update --no-cache bash git gcc musl-dev make iptables bind-tools curl
 
 # Install application
 WORKDIR /go/src/github.com/mysteriumnetwork/openvpn-forwarder

e2e/proxy_test.go

@@ -80,10 +80,37 @@ func TestHTTP(t *testing.T) {
 	assert.NotEqualf(t, originalIP, currentIP, "Request proxying failed: %s -> %s", originalIP, currentIP)
 }
 
+func TestHTTPWithCloseHeader(t *testing.T) {
+	// given
+	originalIP, err := checkIP("http://api.ipify.org/?format=text")
+	t.Log("Original IP:", originalIP)
+	assert.NoError(t, err)
+
+	forwarderIP, err := getForwarderIP()
+	assert.NoError(t, err)
+
+	// when
+	redirectRule := []string{"OUTPUT", "-p", "tcp", "-m", "tcp", "--dport", "80", "-j", "DNAT", "--to-destination", forwarderIP + ":8443"}
+	err = ipTablesAppend(redirectRule...)
+	defer ipTablesDelete(redirectRule...)
+	assert.NoError(t, err)
+
+	currentIP, err := sh.Output(
+		"curl", "-s",
+		"--http1.1",
+		"-H", "Connection: close",
+		"http://api.ipify.org/?format=text",
+	)
+	t.Log("Current IP:", currentIP)
+	assert.NoError(t, err)
+
+	assert.NotEqualf(t, originalIP, currentIP, "Request proxying failed: %s -> %s", originalIP, currentIP)
+}
+
 func getForwarderIP() (string, error) {
 	return sh.Output("dig", "forwarder", "+short")
 }
 
 func checkIP(apiURL string) (string, error) {
-	return sh.Output("wget", "-q", "-O", "-", apiURL)
+	return sh.Output("curl", "-s", apiURL)
 }

proxy/server.go

@@ -18,12 +18,12 @@
 package proxy
 
 import (
+	"bufio"
 	"crypto/tls"
 	"io"
 	"log"
 	"net"
 	"net/http"
-	"net/http/httputil"
 	"net/url"
 	"strings"
 
@@ -94,8 +94,7 @@ func (s *proxyServer) handler(l net.Listener, f func(c net.Conn)) {
 }
 
 func (s *proxyServer) serveHTTP(c net.Conn) {
-	sc := httputil.NewServerConn(c, nil)
-	req, err := sc.Read()
+	req, err := http.ReadRequest(bufio.NewReader(c))
 	if err != nil {
 		log.Printf("Failed to read HTTP request: %v", err)
 		return