forbole · RiccardoM · Apr 18, 2023 · Apr 17, 2023 · Apr 17, 2023 · Apr 17, 2023
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,7 @@
 ## Unreleased
 ### Changes
 - ([\#93](https://github.com/forbole/juno/pull/93)) Decode IBC transfer data to JSON for `/ibc.core.channel.v1.MsgRecvPacket` message
-
+- ([\#94](https://github.com/forbole/juno/pull/94)) Added TSL support when connecting to database
 
 ## v4.1.0
 ### Changes

diff --git a/database/config/config.go b/database/config/config.go
@@ -8,6 +8,10 @@ type Config struct {
 	MaxIdleConnections int    `yaml:"max_idle_connections"`
 	PartitionSize      int64  `yaml:"partition_size"`
 	PartitionBatchSize int64  `yaml:"partition_batch"`
+	SSLModeEnable      string `yaml:"ssl_mode_enable"`
+	SSLRootCert        string `yaml:"ssl_root_cert"`
+	SSLCert            string `yaml:"ssl_cert"`
+	SSLKey             string `yaml:"ssl_key"`
 }
 
 func (c *Config) getURL() *url.URL {
@@ -44,7 +48,7 @@ func (c *Config) GetSSLMode() string {
 }
 
 func NewDatabaseConfig(
-	url string,
+	url, sslModeEnable, sslRootCert, sslCert, sslKey string,
 	maxOpenConnections int, maxIdleConnections int,
 	partitionSize int64, batchSize int64,
 ) Config {
@@ -54,13 +58,21 @@ func NewDatabaseConfig(
 		MaxIdleConnections: maxIdleConnections,
 		PartitionSize:      partitionSize,
 		PartitionBatchSize: batchSize,
+		SSLModeEnable:      sslModeEnable,
+		SSLRootCert:        sslRootCert,
+		SSLCert:            sslCert,
+		SSLKey:             sslKey,
 	}
 }
 
 // DefaultDatabaseConfig returns the default instance of Config
 func DefaultDatabaseConfig() Config {
 	return NewDatabaseConfig(
 		"postgresql://user:password@localhost:5432/database-name?sslmode=disable&search_path=public",
+		"false",
+		"",
+		"",
+		"",
 		1,
 		1,
 		100000,

diff --git a/database/postgresql/postgresql.go b/database/postgresql/postgresql.go
@@ -24,7 +24,19 @@ import (
 // from config. It returns a database connection handle or an error if the
 // connection fails.
 func Builder(ctx *database.Context) (database.Database, error) {
-	postgresDb, err := sqlx.Open("postgres", utils.GetEnvOr(env.DatabaseURI, ctx.Cfg.URL))
+	dbURI := utils.GetEnvOr(env.DatabaseURI, ctx.Cfg.URL)
+	dbEnableSSL := utils.GetEnvOr(env.DatabaseSSLModeEnable, ctx.Cfg.SSLModeEnable)
+
+	// Configure SSL certificates (optional)
+	if dbEnableSSL == "true" {
+		dbRootCert := utils.GetEnvOr(env.DatabaseSSLRootCert, ctx.Cfg.SSLRootCert)
+		dbCert := utils.GetEnvOr(env.DatabaseSSLCert, ctx.Cfg.SSLCert)
+		dbKey := utils.GetEnvOr(env.DatabaseSSLKey, ctx.Cfg.SSLKey)
+		dbURI += fmt.Sprintf(" sslmode=require sslrootcert=%s sslcert=%s sslkey=%s",
+			dbRootCert, dbCert, dbKey)
+	}
+
+	postgresDb, err := sqlx.Open("postgres", dbURI)
 	if err != nil {
 		return nil, err
 	}

diff --git a/database/postgresql/postgresql_test.go b/database/postgresql/postgresql_test.go
@@ -34,6 +34,10 @@ func (suite *DbTestSuite) SetupTest() {
 	// Build the database
 	dbCfg := databaseconfig.NewDatabaseConfig(
 		"postgres://bdjuno:password@localhost:6433/bdjuno?sslmode=disable&search_path=public",
+		"false",
+		"",
+		"",
+		"",
 		-1,
 		-1,
 		100000,

diff --git a/types/env/const.go b/types/env/const.go
@@ -1,5 +1,9 @@
 package env
 
 const (
-	DatabaseURI = "JUNO_DATABASE_URL"
+	DatabaseURI           = "JUNO_DATABASE_URL"
+	DatabaseSSLModeEnable = "JUNO_DATABASE_SSL_MODE_ENABLED"
+	DatabaseSSLRootCert   = "JUNO_DATABASE_SSL_ROOT_CERT"
+	DatabaseSSLCert       = "JUNO_DATABASE_SSL_CERT"
+	DatabaseSSLKey        = "JUNO_DATABASE_SSL_KEY"
 )