From 41b0f5cc8367d807a4ad3abef173107658a240d0 Mon Sep 17 00:00:00 2001 From: LightJack05 <66321084+LightJack05@users.noreply.github.com> Date: Sun, 28 Dec 2025 20:05:21 +0100 Subject: [PATCH 1/4] feat(config): Added option to disable SSL if it is not needed --- databaseConfig.go | 1 + getDatabaseConnectionString.go | 6 +++++- loadConfig.go | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/databaseConfig.go b/databaseConfig.go index 49753eb..21cc6b3 100644 --- a/databaseConfig.go +++ b/databaseConfig.go @@ -6,4 +6,5 @@ type DatabaseConfig struct { DatabaseUser string DatabasePass string DatabaseName string + DisableSSL bool } diff --git a/getDatabaseConnectionString.go b/getDatabaseConnectionString.go index 3bee46c..b12e35d 100644 --- a/getDatabaseConnectionString.go +++ b/getDatabaseConnectionString.go @@ -5,5 +5,9 @@ import "fmt" // GetDatabaseConnectionString constructs and returns a PostgreSQL connection string // based on the current active database configuration. func GetDatabaseConnectionString() string { - return fmt.Sprintf("postgres://%s:%s@%s:%d/%s", activeConfig.DatabaseUser, activeConfig.DatabasePass, activeConfig.DatabaseHost, activeConfig.DatabasePort, activeConfig.DatabaseName) + dbString := fmt.Sprintf("postgres://%s:%s@%s:%d/%s", activeConfig.DatabaseUser, activeConfig.DatabasePass, activeConfig.DatabaseHost, activeConfig.DatabasePort, activeConfig.DatabaseName) + if activeConfig.DisableSSL { + dbString += "?sslmode=disable" + } + return dbString } diff --git a/loadConfig.go b/loadConfig.go index a82c584..6225014 100644 --- a/loadConfig.go +++ b/loadConfig.go @@ -23,6 +23,11 @@ func LoadConfig() error { loadedConfig.DatabaseUser = os.Getenv("DATABASE_CONFIG_DB_USER") loadedConfig.DatabasePass = os.Getenv("DATABASE_CONFIG_DB_PASS") loadedConfig.DatabaseName = os.Getenv("DATABASE_CONFIG_DB_NAME") + loadedConfig.DisableSSL, err = strconv.ParseBool(os.Getenv("DATABASE_CONFIG_DISABLE_SSL")) + if err != nil { + return fmt.Errorf("Invalid DisableSSL value: %v", err) + } + if loadedConfig.DatabasePort == 0 { loadedConfig.DatabasePort = 5432 // default port From f76265fbdbc84b2a9c691661c6cfad7ea10124ef Mon Sep 17 00:00:00 2001 From: LightJack05 <66321084+LightJack05@users.noreply.github.com> Date: Sun, 28 Dec 2025 20:07:41 +0100 Subject: [PATCH 2/4] run go fmt --- loadConfig.go | 1 - 1 file changed, 1 deletion(-) diff --git a/loadConfig.go b/loadConfig.go index 6225014..c093a72 100644 --- a/loadConfig.go +++ b/loadConfig.go @@ -28,7 +28,6 @@ func LoadConfig() error { return fmt.Errorf("Invalid DisableSSL value: %v", err) } - if loadedConfig.DatabasePort == 0 { loadedConfig.DatabasePort = 5432 // default port } From 4d1527874e76fde69d3999541298eb656bf9ead1 Mon Sep 17 00:00:00 2001 From: LightJack05 <66321084+LightJack05@users.noreply.github.com> Date: Sun, 28 Dec 2025 20:11:07 +0100 Subject: [PATCH 3/4] Make DISABLE_SSL option optional --- loadConfig.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/loadConfig.go b/loadConfig.go index c093a72..db7644b 100644 --- a/loadConfig.go +++ b/loadConfig.go @@ -23,10 +23,8 @@ func LoadConfig() error { loadedConfig.DatabaseUser = os.Getenv("DATABASE_CONFIG_DB_USER") loadedConfig.DatabasePass = os.Getenv("DATABASE_CONFIG_DB_PASS") loadedConfig.DatabaseName = os.Getenv("DATABASE_CONFIG_DB_NAME") - loadedConfig.DisableSSL, err = strconv.ParseBool(os.Getenv("DATABASE_CONFIG_DISABLE_SSL")) - if err != nil { - return fmt.Errorf("Invalid DisableSSL value: %v", err) - } + loadedConfig.DisableSSL = os.Getenv("DATABASE_CONFIG_DISABLE_SSL") == "true" + if loadedConfig.DatabasePort == 0 { loadedConfig.DatabasePort = 5432 // default port From d94e49e10da6c2ff5d9fb0faa5b6f2ede5a82db7 Mon Sep 17 00:00:00 2001 From: LightJack05 <66321084+LightJack05@users.noreply.github.com> Date: Sun, 28 Dec 2025 20:11:47 +0100 Subject: [PATCH 4/4] Run go fmt --- loadConfig.go | 1 - 1 file changed, 1 deletion(-) diff --git a/loadConfig.go b/loadConfig.go index db7644b..8ddac32 100644 --- a/loadConfig.go +++ b/loadConfig.go @@ -25,7 +25,6 @@ func LoadConfig() error { loadedConfig.DatabaseName = os.Getenv("DATABASE_CONFIG_DB_NAME") loadedConfig.DisableSSL = os.Getenv("DATABASE_CONFIG_DISABLE_SSL") == "true" - if loadedConfig.DatabasePort == 0 { loadedConfig.DatabasePort = 5432 // default port }