Merge pull request #2 from fortio/h2c_working

h2c now workin Thx to fix for golang/go#52882

Author: ldemailly

Makefile

@@ -5,12 +5,12 @@ test:
 	go run -race . -config sampleConfig/ -redirect-port :8080 -https-port :8443
 
 dev-grpc:
-	go run -race . -http-port 8001 -https-port disabled -redirect-port disabled\
-		 -routes.json '[{"host":"*", "destination":"h2c://localhost:8079/"}]'
+	go run -race . -h2 -http-port 8001 -https-port disabled -redirect-port disabled\
+		 -routes.json '[{"host":"*", "destination":"http://localhost:8079/"}]'
 
 dev-h2c:
-	go run -race . -http-port 8001 -https-port disabled -redirect-port disabled\
-		 -routes.json '[{"host":"*", "destination":"h2c://localhost:8080/"}]'
+	go run -race . -h2 -http-port 8001 -https-port disabled -redirect-port disabled\
+		 -routes.json '[{"host":"*", "destination":"http://localhost:8080/"}]'
 
 dev:
 	go run -race . -http-port 8001 -https-port disabled -redirect-port disabled\

go.mod

@@ -5,13 +5,15 @@ go 1.18
 require (
 	fortio.org/fortio v1.31.0
 	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
+	golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2
 )
 
 require (
 	github.com/fsnotify/fsnotify v1.5.4 // indirect
 	github.com/google/uuid v1.3.0 // indirect
-	golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 // indirect
 	golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
 	golang.org/x/text v0.3.7 // indirect
 
 )
+
+replace golang.org/x/net => github.com/fortio/golang-net v0.0.0-20220519234753-9259fd44fa73 // Has https://go.dev/cl/407454

go.sum

@@ -1,23 +1,23 @@
 fortio.org/fortio v1.31.0 h1:5pwFhai6GNFTKiacKlWF3oRjoveFdMCCoqGoSDyFmIA=
 fortio.org/fortio v1.31.0/go.mod h1:bubI7klquaD4ypIby16LHMvoH+7lp20NvzALgN4/xlM=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/fortio/golang-net v0.0.0-20220519234753-9259fd44fa73 h1:Be4/PrR/2GBcLx+lMwu0vo+hH6vq8KcUW1kNCgtcyz0=
+github.com/fortio/golang-net v0.0.0-20220519234753-9259fd44fa73/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
 github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 h1:HVyaeDAYux4pnY+D/SiwmLOR36ewZ4iGQIIrtnuCjFA=
-golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0=
 golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=

proxy_main.go

@@ -10,13 +10,15 @@ import (
 	"crypto/tls"
 	"flag"
 	"fmt"
+	"net"
 	"net/http"
 	"net/http/httputil"
 	"net/url"
 	"os"
 	"time"
 
 	"golang.org/x/crypto/acme/autocert"
+	"golang.org/x/net/http2"
 
 	"fortio.org/fortio/dflag"
 	"fortio.org/fortio/dflag/configmap"
@@ -62,6 +64,7 @@ func main() {
 	configDir := flag.String("config", "",
 		"Config directory `path` to watch for changes of dynamic flags (empty for no watch)")
 	httpPort := flag.String("http-port", "disabled", "`port` to listen on for non tls traffic (or 'disabled')")
+	h2Target := flag.Bool("h2", false, "Whether destinations support h2c prior knowledge")
 	flag.Parse()
 	_, longV, fullV := version.FromBuildInfo()
 	log.Infof("Fortio Proxy %s starting", longV)
@@ -91,7 +94,16 @@ func main() {
 	}
 	rp := httputil.ReverseProxy{
 		Director: Director,
-		// doesn't work: Transport: &http2.Transport{}, // otherwise grpc doesn't work
+	}
+	// TODO: make h2c vs regular client more dynamic based on route config instead of all or nothing
+	// (or maybe some day it will just ge the default behavior of the base http client)
+	if *h2Target {
+		rp.Transport = &http2.Transport{
+			AllowHTTP: true,
+			DialTLS: func(network, addr string, cfg *tls.Config) (net.Conn, error) {
+				return net.Dial(network, addr)
+			},
+		}
 	}
 	s := &http.Server{
 		// TODO: make these timeouts configurable