Merge pull request #1985 from gravitational/rjones/revendor-roundtrip

Revendor roundtrip

Gopkg.toml

@@ -79,8 +79,8 @@ ignored = ["github.com/Sirupsen/logrus"]
   branch = "master"
 
 [[constraint]]
-  branch = "master"
   name = "github.com/gravitational/roundtrip"
+  revision = "6a87d116a90b9c4e73bedc19ebc9c17f1b43d826"
 
 [[constraint]]
   version = "0.0.1"

lib/auth/clt.go

@@ -147,7 +147,10 @@ func NewTLSClientWithDialer(dialContext DialContext, cfg *tls.Config, params ...
 	}
 
 	clientParams := append(
-		[]roundtrip.ClientParam{roundtrip.HTTPClient(&http.Client{Transport: transport})},
+		[]roundtrip.ClientParam{
+			roundtrip.HTTPClient(&http.Client{Transport: transport}),
+			roundtrip.SanitizerEnabled(true),
+		},
 		params...,
 	)
 	roundtripClient, err := roundtrip.NewClient("https://"+teleport.APIDomain, CurrentVersion, clientParams...)
@@ -181,6 +184,7 @@ func NewClient(addr string, dialer Dialer, params ...roundtrip.ClientParam) (*Cl
 		roundtrip.HTTPClient(&http.Client{
 			Transport: transport,
 		}),
+		roundtrip.SanitizerEnabled(true),
 		// TODO (ekontsevoy) this tracer pollutes the logs making it harder to work
 		// on issues that have nothing to do with the auth API, consider activating it
 		// via special environment variable?

lib/auth/trustedcluster.go

@@ -450,7 +450,9 @@ func (s *AuthServer) sendValidateRequestToProxy(host string, validateRequest *Va
 		Host:   host,
 	}
 
-	var opts []roundtrip.ClientParam
+	opts := []roundtrip.ClientParam{
+		roundtrip.SanitizerEnabled(true),
+	}
 
 	if lib.IsInsecureDevMode() {
 		log.Warn("The setting insecureSkipVerify is used to communicate with proxy. Make sure you intend to run Teleport in insecure mode!")

lib/client/https_client.go

@@ -53,6 +53,7 @@ func newClientWithPool(pool *x509.CertPool) *http.Client {
 }
 
 func NewWebClient(url string, opts ...roundtrip.ClientParam) (*WebClient, error) {
+	opts = append(opts, roundtrip.SanitizerEnabled(true))
 	clt, err := roundtrip.NewClient(url, teleport.WebAPIVersion, opts...)
 	if err != nil {
 		return nil, trace.Wrap(err)