Преглед на файлове

Fix panic when parsing empty pgsql host (#28708) (#28709)

Backport #28708 by wxiaoguang

Regression of #27723
Fix #28705

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
tags/v1.21.4
Giteabot преди 4 месеца
родител
ревизия
7f833d8f71
No account linked to committer's email address
променени са 2 файла, в които са добавени 5 реда и са изтрити 1 реда
  1. 1
    1
      modules/setting/database.go
  2. 4
    0
      modules/setting/database_test.go

+ 1
- 1
modules/setting/database.go Целия файл

@@ -168,7 +168,7 @@ func getPostgreSQLConnectionString(dbHost, dbUser, dbPasswd, dbName, dbsslMode s
RawQuery: dbParam,
}
query := connURL.Query()
if dbHost[0] == '/' { // looks like a unix socket
if strings.HasPrefix(dbHost, "/") { // looks like a unix socket
query.Add("host", dbHost)
connURL.Host = ":" + port
}

+ 4
- 0
modules/setting/database_test.go Целия файл

@@ -65,6 +65,10 @@ func Test_getPostgreSQLConnectionString(t *testing.T) {
SSLMode string
Output string
}{
{
Host: "", // empty means default
Output: "postgres://:@127.0.0.1:5432?sslmode=",
},
{
Host: "/tmp/pg.sock",
User: "testuser",

Loading…
Отказ
Запис