public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Platform: Add support for Postgresql pgpass file (#61517)

Browse Source 
lib/pq has built-in support to use pgpass file for authentication when
no password has been provided. However this requires that the connection
does not contain the password parameter at all.

Removing password parameter when postgresql password is empty in
SQL store.
This commit is contained in:
Guillaume Jacquet
2023-07-07 11:17:35 +02:00
committed by GitHub
parent e82d437e0e
commit b947222bf5
2 changed files with 39 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/sqlstore/sqlstore_test.go
+34 -10
View File
@@ -15,12 +15,15 @@ import (
)
type sqlStoreTest struct {
name string
dbType string
dbHost string
dbURL string
connStrValues []string
err error
name string
dbType string
dbHost string
dbURL string
dbUser string
dbPwd string
connStrValues []string
connStrExcludedValues []string
err error
}
var sqlStoreTestCases = []sqlStoreTest{
@@ -42,6 +45,23 @@ var sqlStoreTestCases = []sqlStoreTest{
dbHost: "1.2.3.4",
connStrValues: []string{"host=1.2.3.4", "port=5432"},
},
{
name: "Postgres username and password",
dbType: "postgres",
dbHost: "1.2.3.4",
dbUser: "grafana",
dbPwd: "password",
connStrValues: []string{"host=1.2.3.4", "port=5432", "user=grafana", "password=password"},
},
{
name: "Postgres username no password",
dbType: "postgres",
dbHost: "1.2.3.4",
dbUser: "grafana",
dbPwd: "",
connStrValues: []string{"host=1.2.3.4", "port=5432", "user=grafana"},
connStrExcludedValues: []string{"password"},
},
{
name: "MySQL IPv4 (Default Port)",
dbType: "mysql",
@@ -92,13 +112,17 @@ func TestIntegrationSQLConnectionString(t *testing.T) {
for _, testCase := range sqlStoreTestCases {
t.Run(testCase.name, func(t *testing.T) {
sqlstore := &SQLStore{}
sqlstore.Cfg = makeSQLStoreTestConfig(t, testCase.dbType, testCase.dbHost, testCase.dbURL)
sqlstore.Cfg = makeSQLStoreTestConfig(t, testCase.dbType, testCase.dbHost, testCase.dbUser, testCase.dbPwd, testCase.dbURL)
connStr, err := sqlstore.buildConnectionString()
require.Equal(t, testCase.err, err)
for _, connSubStr := range testCase.connStrValues {
require.Contains(t, connStr, connSubStr)
}
for _, connExcludedSubStr := range testCase.connStrExcludedValues {
require.NotContains(t, connStr, connExcludedSubStr)
}
})
}
}
@@ -151,7 +175,7 @@ func TestIntegrationIsUniqueConstraintViolation(t *testing.T) {
}
}
func makeSQLStoreTestConfig(t *testing.T, dbType, host, dbURL string) *setting.Cfg {
func makeSQLStoreTestConfig(t *testing.T, dbType, host, user, password, dbURL string) *setting.Cfg {
t.Helper()
cfg := setting.NewCfg()
@@ -164,11 +188,11 @@ func makeSQLStoreTestConfig(t *testing.T, dbType, host, dbURL string) *setting.C
require.NoError(t, err)
_, err = sec.NewKey("url", dbURL)
require.NoError(t, err)
_, err = sec.NewKey("user", "user")
_, err = sec.NewKey("user", user)
require.NoError(t, err)
_, err = sec.NewKey("name", "test_db")
require.NoError(t, err)
_, err = sec.NewKey("password", "pass")
_, err = sec.NewKey("password", password)
require.NoError(t, err)
cfg.IsFeatureToggleEnabled = func(key string) bool { return true }