mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
MSSQL: Change connectionstring to URL format to fix using passwords with semicolon (#18384)
Fixes #17665
This commit is contained in:
parent
4e1e220962
commit
2514209083
@ -4,6 +4,7 @@ import (
|
|||||||
"database/sql"
|
"database/sql"
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/grafana/grafana/pkg/setting"
|
"github.com/grafana/grafana/pkg/setting"
|
||||||
|
"net/url"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
_ "github.com/denisenkom/go-mssqldb"
|
_ "github.com/denisenkom/go-mssqldb"
|
||||||
@ -21,10 +22,7 @@ func init() {
|
|||||||
func newMssqlQueryEndpoint(datasource *models.DataSource) (tsdb.TsdbQueryEndpoint, error) {
|
func newMssqlQueryEndpoint(datasource *models.DataSource) (tsdb.TsdbQueryEndpoint, error) {
|
||||||
logger := log.New("tsdb.mssql")
|
logger := log.New("tsdb.mssql")
|
||||||
|
|
||||||
cnnstr, err := generateConnectionString(datasource)
|
cnnstr := generateConnectionString(datasource)
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if setting.Env == setting.DEV {
|
if setting.Env == setting.DEV {
|
||||||
logger.Debug("getEngine", "connection", cnnstr)
|
logger.Debug("getEngine", "connection", cnnstr)
|
||||||
}
|
}
|
||||||
@ -43,21 +41,21 @@ func newMssqlQueryEndpoint(datasource *models.DataSource) (tsdb.TsdbQueryEndpoin
|
|||||||
return tsdb.NewSqlQueryEndpoint(&config, &rowTransformer, newMssqlMacroEngine(), logger)
|
return tsdb.NewSqlQueryEndpoint(&config, &rowTransformer, newMssqlMacroEngine(), logger)
|
||||||
}
|
}
|
||||||
|
|
||||||
func generateConnectionString(datasource *models.DataSource) (string, error) {
|
func generateConnectionString(datasource *models.DataSource) string {
|
||||||
server, port := util.SplitHostPortDefault(datasource.Url, "localhost", "1433")
|
server, port := util.SplitHostPortDefault(datasource.Url, "localhost", "1433")
|
||||||
|
|
||||||
encrypt := datasource.JsonData.Get("encrypt").MustString("false")
|
encrypt := datasource.JsonData.Get("encrypt").MustString("false")
|
||||||
connStr := fmt.Sprintf("server=%s;port=%s;database=%s;user id=%s;password=%s;",
|
|
||||||
server,
|
query := url.Values{}
|
||||||
port,
|
query.Add("database", datasource.Database)
|
||||||
datasource.Database,
|
query.Add("encrypt", encrypt)
|
||||||
datasource.User,
|
|
||||||
datasource.DecryptedPassword(),
|
u := &url.URL{
|
||||||
)
|
Scheme: "sqlserver",
|
||||||
if encrypt != "false" {
|
User: url.UserPassword(datasource.User, datasource.DecryptedPassword()),
|
||||||
connStr += fmt.Sprintf("encrypt=%s;", encrypt)
|
Host: fmt.Sprintf("%s:%s", server, port),
|
||||||
|
RawQuery: query.Encode(),
|
||||||
}
|
}
|
||||||
return connStr, nil
|
return u.String()
|
||||||
}
|
}
|
||||||
|
|
||||||
type mssqlRowTransformer struct {
|
type mssqlRowTransformer struct {
|
||||||
|
@ -27,6 +27,33 @@ import (
|
|||||||
// If needed, change the variable below to the IP address of the database.
|
// If needed, change the variable below to the IP address of the database.
|
||||||
var serverIP = "localhost"
|
var serverIP = "localhost"
|
||||||
|
|
||||||
|
func TestGenerateConnectionString(t *testing.T) {
|
||||||
|
encrypted, _ := simplejson.NewJson([]byte(`{"encrypt":"false"}`))
|
||||||
|
testSet := []struct {
|
||||||
|
ds *models.DataSource
|
||||||
|
expected string
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
&models.DataSource{
|
||||||
|
User: "user",
|
||||||
|
Database: "db",
|
||||||
|
Url: "localhost:1433",
|
||||||
|
SecureJsonData: securejsondata.GetEncryptedJsonData(map[string]string{
|
||||||
|
"password": "pass;word",
|
||||||
|
}),
|
||||||
|
JsonData: encrypted,
|
||||||
|
},
|
||||||
|
"sqlserver://user:pass;word@localhost:1433?database=db&encrypt=false",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
for i := range testSet {
|
||||||
|
got := generateConnectionString(testSet[i].ds)
|
||||||
|
if got != testSet[i].expected {
|
||||||
|
t.Errorf("mssql connString error for testCase %d got: %s expected: %s", i, got, testSet[i].expected)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestMSSQL(t *testing.T) {
|
func TestMSSQL(t *testing.T) {
|
||||||
SkipConvey("MSSQL", t, func() {
|
SkipConvey("MSSQL", t, func() {
|
||||||
x := InitMSSQLTestDB(t)
|
x := InitMSSQLTestDB(t)
|
||||||
|
Loading…
Reference in New Issue
Block a user