upstream/mattermost
1
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-05-28 04:35:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

[MM-62762] Make config location in Support Packet human-readable (#30027)

Browse source 
Co-authored-by: Mattermost Build <build@mattermost.com>
This commit is contained in:
Ben Schumacher 2025-02-11 10:06:27 +01:00 committed by GitHub
parent b2b956c043
commit d3dcc74e5a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
server/public/utils/sql/sql_utils.go
View file

@ -108,11 +108,19 @@ func SanitizeDataSource(driverName, dataSource string) (string, error) {
return "", err
}
u.User = url.UserPassword("****", "****")
// Remove username and password from query string
params := u.Query()
params.Del("user")
params.Del("password")
u.RawQuery = params.Encode()
return u.String(), nil
// Unescape the URL to make it human-readable
out, err := url.QueryUnescape(u.String())
if err != nil {
return "", err
}
return out, nil
case model.DatabaseDriverMysql:
cfg, err := mysql.ParseDSN(dataSource)
if err != nil {

12
server/public/utils/sql/sql_utils_test.go
View file

@ -72,13 +72,21 @@ func TestSanitizeDataSource(t *testing.T) {
Original string
Sanitized string
}{
{
"",
"//****:****@",
},
{
"postgres://mmuser:mostest@localhost",
"postgres://****:****@localhost",
},
{
"postgres://mmuser:mostest@localhost/dummy?sslmode=disable",
"postgres://%2A%2A%2A%2A:%2A%2A%2A%2A@localhost/dummy?sslmode=disable",
"postgres://****:****@localhost/dummy?sslmode=disable",
},
{
"postgres://localhost/dummy?sslmode=disable&user=mmuser&password=mostest",
"postgres://%2A%2A%2A%2A:%2A%2A%2A%2A@localhost/dummy?sslmode=disable",
"postgres://****:****@localhost/dummy?sslmode=disable",
},
}
driver := model.DatabaseDriverPostgres