alexvanin/certificates
1
0
Fork 0
forked from TrueCloudLab/certificates
Code Pull requests Activity

Merge pull request #944 from smallstep/herman/tls-wasm-client

Browse source 
Set nil dial context for js/wasm runtime
This commit is contained in:
Herman Slatman 2022-05-25 22:35:18 +02:00 committed by GitHub
commit a564b4f32e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ca/tls.go
View file

@ -12,6 +12,7 @@ import (
"net" "net"
"net/http" "net/http"
"os" "os"
"runtime"
"time" "time"
"github.com/pkg/errors" "github.com/pkg/errors"
@ -288,10 +289,20 @@ func getDefaultDialer() *net.Dialer {
// transport for HTTP/2. // transport for HTTP/2.
func getDefaultTransport(tlsConfig *tls.Config) *http.Transport { func getDefaultTransport(tlsConfig *tls.Config) *http.Transport {
var dialContext func(ctx context.Context, network string, addr string) (net.Conn, error) var dialContext func(ctx context.Context, network string, addr string) (net.Conn, error)
if mTLSDialContext == nil { switch {
case runtime.GOOS == "js" && runtime.GOARCH == "wasm":
// when running in js/wasm and using the default dialer context all requests
// performed by the CA client resulted in a "protocol not supported" error.
// By setting the dial context to nil requests will be handled by the browser
// fetch API instead. Currently this will always set the dial context to nil,
// but we could implement some additional logic similar to what's found in
// https://github.com/golang/go/pull/46923/files to support a different dial
// context if it is available, required and expected to work.
dialContext = nil
case mTLSDialContext == nil:
d := getDefaultDialer() d := getDefaultDialer()
dialContext = d.DialContext dialContext = d.DialContext
} else { default:
dialContext = mTLSDialContext() dialContext = mTLSDialContext()
} }
return &http.Transport{ return &http.Transport{