IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

properly escape components of connection string (#9850)

Browse Source
This commit is contained in:
Sven Klemm
2017-11-15 10:55:08 +01:00
committed by Daniel Lee
parent 1a3170373a
commit 9e6a7dcb90
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/tsdb/postgres/postgres.go
View File

@@ -4,6 +4,7 @@ import (
"container/list" "container/list"
"context" "context"
"fmt" "fmt"
"net/url"
"strconv" "strconv"
"time" "time"
@@ -52,7 +53,7 @@ func generateConnectionString(datasource *models.DataSource) string {
} }
sslmode := datasource.JsonData.Get("sslmode").MustString("verify-full") sslmode := datasource.JsonData.Get("sslmode").MustString("verify-full")
return fmt.Sprintf("postgres://%s:%s@%s/%s?sslmode=%s", datasource.User, password, datasource.Url, datasource.Database, sslmode) return fmt.Sprintf("postgres://%s:%s@%s/%s?sslmode=%s", url.PathEscape(datasource.User), url.PathEscape(password), url.PathEscape(datasource.Url), url.PathEscape(datasource.Database), url.QueryEscape(sslmode))
} }
func (e *PostgresQueryEndpoint) Query(ctx context.Context, dsInfo *models.DataSource, tsdbQuery *tsdb.TsdbQuery) (*tsdb.Response, error) { func (e *PostgresQueryEndpoint) Query(ctx context.Context, dsInfo *models.DataSource, tsdbQuery *tsdb.TsdbQuery) (*tsdb.Response, error) {