fix path escape (#779)

grafana · Jul 18, 2019 · c3e74b3 · c3e74b3
1 parent 03dc4e6
commit c3e74b3
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/cmd/logcli/client.go b/cmd/logcli/client.go
@@ -54,8 +54,11 @@ func listLabelValues(name string) (*logproto.LabelResponse, error) {
 }
 
 func doRequest(path string, out interface{}) error {
-	addrURL.Path = path
-	url := addrURL.String()
+	fullURL, err := url.Parse(addrURL.String() + path)
+	if err != nil {
+		return err
+	}
+	url := fullURL.String()
 	if !*quiet {
 		log.Print(url)
 	}
@@ -72,7 +75,7 @@ func doRequest(path string, out interface{}) error {
 			CAFile:             *tlsCACertPath,
 			CertFile:           *tlsClientCertPath,
 			KeyFile:            *tlsClientCertKeyPath,
-			ServerName:         addrURL.Host,
+			ServerName:         fullURL.Host,
 			InsecureSkipVerify: *tlsSkipVerify,
 		},
 	}