Fix panic when parsing empty pgsql host (go-gitea#28708)

Regression of go-gitea#27723 Fix go-gitea#28705
GiteaBot · Jan 6, 2024 · 4ab323a · 4ab323a
1 parent e67c819
commit 4ab323a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/modules/setting/database.go b/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
  }

diff --git a/modules/setting/database_test.go b/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",