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

* 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>
zitadel · May 23, 2023 · 8c92636 · 8c92636 · vercel · May 23, 2023
1 parent e2ee622
commit 8c92636
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/internal/database/postgres/config.go b/internal/database/postgres/config.go
@@ -113,14 +113,6 @@ type SSL struct {
 func (s *Config) checkSSL(user User) {
 	if user.SSL.Mode == sslDisabledMode || user.SSL.Mode == "" {
 		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")
 	}
 	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 != "" {
 			fields = append(fields, "sslcert="+user.SSL.Cert)
 		}