feat: allow http2 in coder server (#6871)

coadler · web-flow · commit 872037bf85ed · 2023-03-29T14:45:57.000-05:00
diff --git a/cli/server.go b/cli/server.go
@@ -1390,6 +1390,7 @@ func generateSelfSignedCertificate() (*tls.Certificate, error) {
 func configureTLS(tlsMinVersion, tlsClientAuth string, tlsCertFiles, tlsKeyFiles []string, tlsClientCAFile string) (*tls.Config, error) {
 	tlsConfig := &tls.Config{
 		MinVersion: tls.VersionTLS12,
+		NextProtos: []string{"h2", "http/1.1"},
 	}
 	switch tlsMinVersion {
 	case "tls10":
@@ -1679,6 +1680,7 @@ func configureHTTPClient(ctx context.Context, clientCertFile, clientKeyFile stri
 
 		tlsClientConfig := &tls.Config{ //nolint:gosec
 			Certificates: certificates,
+			NextProtos:   []string{"h2", "http/1.1"},
 		}
 		err = configureCAPool(tlsClientCAFile, tlsClientConfig)
 		if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -1390,6 +1390,7 @@ func generateSelfSignedCertificate() (*tls.Certificate, error) {`
`1390`	`1390`	`func configureTLS(tlsMinVersion, tlsClientAuth string, tlsCertFiles, tlsKeyFiles []string, tlsClientCAFile string) (*tls.Config, error) {`
`1391`	`1391`	`tlsConfig := &tls.Config{`
`1392`	`1392`	`MinVersion: tls.VersionTLS12,`
	`1393`	`+ NextProtos: []string{"h2", "http/1.1"},`
`1393`	`1394`	`}`
`1394`	`1395`	`switch tlsMinVersion {`
`1395`	`1396`	`case "tls10":`
`@@ -1679,6 +1680,7 @@ func configureHTTPClient(ctx context.Context, clientCertFile, clientKeyFile stri`
`1679`	`1680`
`1680`	`1681`	`tlsClientConfig := &tls.Config{ //nolint:gosec`
`1681`	`1682`	`Certificates: certificates,`
	`1683`	`+ NextProtos: []string{"h2", "http/1.1"},`
`1682`	`1684`	`}`
`1683`	`1685`	`err = configureCAPool(tlsClientCAFile, tlsClientConfig)`
`1684`	`1686`	`if err != nil {`