main: add option to disable ssl when connection now that connection w…

…ith ssl is default
frederikhs · May 8, 2023 · 25f83e2 · 25f83e2
1 parent 267a776
commit 25f83e2
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 9 deletions.
diff --git a/cmd/list.go b/cmd/list.go
@@ -21,7 +21,9 @@ var listCmd = &cobra.Command{
 
 		host := args[0]
 
-		conn := database.GetDatabaseEntryConnection(host)
+		withSSL := getUseSSL(cmd)
+
+		conn := database.GetDatabaseEntryConnection(host, withSSL)
 		if conn == nil {
 			cmd.Println("no hosts found by that name")
 			os.Exit(1)

diff --git a/cmd/roles.go b/cmd/roles.go
@@ -21,7 +21,9 @@ var rolesCmd = &cobra.Command{
 
 		host := args[0]
 
-		conn := database.GetDatabaseEntryConnection(host)
+		withSSL := getUseSSL(cmd)
+
+		conn := database.GetDatabaseEntryConnection(host, withSSL)
 		if conn == nil {
 			cmd.Println("no hosts found by that name")
 			os.Exit(1)

diff --git a/cmd/root.go b/cmd/root.go
@@ -28,6 +28,7 @@ func Execute(buildVersion string) {
 
 func init() {
 	rootCmd.PersistentFlags().StringP("output", "o", "", "--output json|table (optional default table)")
+	rootCmd.PersistentFlags().Bool("no-ssl", false, "do not use ssl when connecting")
 }
 
 func addRequiredHostFlag(cmd *cobra.Command) {
@@ -54,7 +55,9 @@ func givenUserModification(cmd *cobra.Command, args []string, userMustExist bool
 
 	username := args[0]
 
-	conn := database.GetDatabaseEntryConnection(host)
+	withSSL := getUseSSL(cmd)
+
+	conn := database.GetDatabaseEntryConnection(host, withSSL)
 	if conn == nil {
 		cmd.Println("no hosts found by that name")
 		os.Exit(1)
@@ -110,3 +113,13 @@ func getOutputType(cmd *cobra.Command) OutputType {
 		return OutputTypeTable
 	}
 }
+
+func getUseSSL(cmd *cobra.Command) bool {
+	ssl, err := cmd.Flags().GetBool("no-ssl")
+	if err != nil {
+		cmd.Println(err)
+		os.Exit(1)
+	}
+
+	return !ssl
+}
diff --git a/database/connection.go b/database/connection.go
@@ -22,18 +22,23 @@ type DBConn struct {
 	db     *sqlx.DB
 }
 
-func (config *DBConfig) Connect() *DBConn {
-	db, err := sqlx.Connect("postgres", fmt.Sprintf("host=%s port=%s user=%s dbname=%s password=%s sslmode=disable", config.Host, config.Port, config.User, config.Database, config.Pass))
+func (config *DBConfig) Connect(withSSL bool) *DBConn {
+	ssl := "require"
+	if !withSSL {
+		ssl = "disable"
+	}
+
+	db, err := sqlx.Connect("postgres", fmt.Sprintf("host=%s port=%s user=%s dbname=%s password=%s sslmode=%s", config.Host, config.Port, config.User, config.Database, config.Pass, ssl))
 	if err != nil {
 		log.Println("unable to connect to database:", err)
 		time.Sleep(time.Second * 5)
-		return config.Connect()
+		return config.Connect(withSSL)
 	}
 
 	if db.Ping() != nil {
 		log.Println("unable to connect to database:", err)
 		time.Sleep(time.Second * 5)
-		return config.Connect()
+		return config.Connect(withSSL)
 	}
 
 	return &DBConn{db: db, Config: config}

diff --git a/database/hosts.go b/database/hosts.go
@@ -19,7 +19,7 @@ func HostEquals(a, b string) bool {
 	return false
 }
 
-func GetDatabaseEntryConnection(hostQuery string) *DBConn {
+func GetDatabaseEntryConnection(hostQuery string, withSSL bool) *DBConn {
 	hosts, err := ListHosts()
 	if err != nil {
 		panic(err)
@@ -32,7 +32,7 @@ func GetDatabaseEntryConnection(hostQuery string) *DBConn {
 		}
 
 		config := MakeDbConfig(d.Hostname, d.Port, d.Username, d.Database)
-		return config.Connect()
+		return config.Connect(withSSL)
 	}
 
 	return nil