scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-02 03:27:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Conditionally overwrite TLS parameters for MySQL secrets engine (#9729)

Browse Source 
* Conditionally overwrite TLS parameters in MySQL DSN

Overwrite MySQL TLS configuration in MySQL DSN only if have `tls_ca` or `tls_certificate_key` set
Current logic always overwrites it

* Add test for MySQL DSN with a valid TLS parameter in query string
This commit is contained in:
arnis
2020-08-18 01:30:15 +03:00
committed by GitHub
parent 59d4571aa6
commit 48db6d3c3c
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/database/mysql/connection_producer.go
View File

@@ -218,7 +218,9 @@ func (c *mySQLConnectionProducer) addTLStoDSN() (connURL string, err error) {
return "", fmt.Errorf("unable to parse connectionURL: %s", err) return "", fmt.Errorf("unable to parse connectionURL: %s", err)
} }
config.TLSConfig = c.tlsConfigName if len(c.tlsConfigName) > 0 {
config.TLSConfig = c.tlsConfigName
}
connURL = config.FormatDSN() connURL = config.FormatDSN()

5
plugins/database/mysql/connection_producer_test.go
View File

@@ -45,6 +45,11 @@ func Test_addTLStoDSN(t *testing.T) {
tlsConfigName: "tlsTest101", tlsConfigName: "tlsTest101",
expectedResult: "user:pa?ssword?@tcp(localhost:3306)/test?tls=tlsTest101&foo=bar", expectedResult: "user:pa?ssword?@tcp(localhost:3306)/test?tls=tlsTest101&foo=bar",
}, },
"tls, valid tls parameter in query string": {
rootUrl: "user:password@tcp(localhost:3306)/test?tls=true",
tlsConfigName: "",
expectedResult: "user:password@tcp(localhost:3306)/test?tls=true",
},
} }
for name, test := range tests { for name, test := range tests {