TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-01-07 23:07:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(database): allow postgres sslmode=require without root cert (#4972)

Browse Source 
* fix(database): allow postgres sslmode=require without root cert

* fix(database): allow postgres sslmode=require without root cert (fix)

Co-authored-by: Silvan <silvan.reusser@gmail.com>

---------

Co-authored-by: Silvan <silvan.reusser@gmail.com>
This commit is contained in:
András Tóth 2023-05-23 16:29:13 +02:00 committed by GitHub
parent e2ee622d27
commit 8c926366a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/database/postgres/config.go
View File

@ -113,14 +113,6 @@ type SSL struct {
func (s *Config) checkSSL(user User) { func (s *Config) checkSSL(user User) {
if user.SSL.Mode == sslDisabledMode || user.SSL.Mode == "" { if user.SSL.Mode == sslDisabledMode || user.SSL.Mode == "" {
user.SSL = SSL{Mode: sslDisabledMode} user.SSL = SSL{Mode: sslDisabledMode}
return
}
if user.SSL.RootCert == "" {
logging.WithFields(
"cert set", user.SSL.Cert != "",
"key set", user.SSL.Key != "",
"rootCert set", user.SSL.RootCert != "",
).Fatal("at least ssl root cert has to be set")
} }
} }
@ -149,7 +141,9 @@ func (c Config) String(useAdmin bool) string {
fields = append(fields, "dbname=postgres") fields = append(fields, "dbname=postgres")
} }
if user.SSL.Mode != sslDisabledMode { if user.SSL.Mode != sslDisabledMode {
fields = append(fields, "sslrootcert="+user.SSL.RootCert) if user.SSL.RootCert != "" {
fields = append(fields, "sslrootcert="+user.SSL.RootCert)
}
if user.SSL.Cert != "" { if user.SSL.Cert != "" {
fields = append(fields, "sslcert="+user.SSL.Cert) fields = append(fields, "sslcert="+user.SSL.Cert)
} }