Merge pull request #12678 from yogyrahmawan/escape_postgres_parameters

postgres; escape ssl mode parameter

Merge pull request #12678 from yogyrahmawan/escape_postgres_parameters
postgres; escape ssl mode parameter
05da21c6 · Marcus Efraimsson · GitHub · 4d722b21 · 93e73919 · 05da21c6
Commit 05da21c6 authored Jul 24, 2018 by Marcus Efraimsson Committed by GitHub Jul 24, 2018
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletions

pkg/tsdb/postgres/postgres.go
+7 -1

No files found.
--- a/pkg/tsdb/postgres/postgres.go
+++ b/pkg/tsdb/postgres/postgres.go
@@ -53,7 +53,13 @@ func generateConnectionString(datasource *models.DataSource) string {
 	}

 	sslmode := datasource.JsonData.Get("sslmode").MustString("verify-full")
-	u := &url.URL{Scheme: "postgres", User: url.UserPassword(datasource.User, password), Host: datasource.Url, Path: datasource.Database, RawQuery: "sslmode=" + sslmode}
+	u := &url.URL{
+		Scheme: "postgres",
+		User:   url.UserPassword(datasource.User, password),
+		Host:   datasource.Url, Path: datasource.Database,
+		RawQuery: "sslmode=" + url.QueryEscape(sslmode),
+	}
+
 	return u.String()
 }