add TlsInsecureSkipVerify config option, update builtin commands

Author: andinux

.gitignore

@@ -2,3 +2,4 @@
 cli/.DS_Store
 .DS_Store
 cli/.vscode
+.vscode/launch.json

cli/sqlc.go

@@ -256,6 +256,8 @@ func parseParameters() (Parameter, error) {
 				p["--tls"] = getFirstNoneEmptyString([]string{dropError(p.String("--tls")), conf.Pem})
 				if conf.Secure == false {
 					p["--tls"] = "NO"
+				} else if conf.TlsInsecureSkipVerify == true {
+					p["--tls"] = "SKIP"
 				}
 				p["--apikey"] = getFirstNoneEmptyString([]string{dropError(p.String("--apikey")), conf.ApiKey})
 				if conf.NoBlob {
@@ -387,7 +389,7 @@ func main() {
 			MaxRowset:    parameter.MaxRowset,
 		}
 
-		config.Secure, config.Pem = sqlitecloud.ParseTlsString(parameter.Tls)
+		config.Secure, config.TlsInsecureSkipVerify, config.Pem = sqlitecloud.ParseTlsString(parameter.Tls)
 		var db *sqlitecloud.SQCloud = sqlitecloud.New(config)
 
 		if err := db.Connect(); err != nil {
@@ -453,12 +455,20 @@ func main() {
 			}
 
 			prompt := "sqlc > "
-			prompt = "\\H:\\p/\\d\\u > "
+			prompt = "\\u@\\H:\\p/\\d > "
+
+			refreshDB := false
+			if parameter.Database != "" {
+				refreshDB = true
+			}
 
 		Loop:
 			for {
 				out.Flush()
-				db.Database, _ = db.GetDatabase()
+				if refreshDB {
+					db.Database, _ = db.GetDatabase()
+					go func() { dynamic_tokens = db.GetAutocompleteTokens() }() // Update the dynamic tokens in the background...
+				}
 
 				renderdPrompt := prompt
 				renderdPrompt = strings.ReplaceAll(renderdPrompt, "\\H", parameter.Host)
@@ -470,7 +480,6 @@ func main() {
 				renderdPrompt = strings.ReplaceAll(renderdPrompt, "\\t", time.Now().Format("15:04:05"))
 				renderdPrompt = strings.ReplaceAll(renderdPrompt, "\\w", fmt.Sprintf("/%s", dropError(os.Getwd())))
 
-				go func() { dynamic_tokens = db.GetAutocompleteTokens() }() // Update the dynamic tokens in the background...
 				command, err := editor.Prompt(renderdPrompt)
 
 				switch err {
@@ -524,6 +533,9 @@ func main() {
 						default:
 							editor.AppendHistory(command)
 						}
+
+						commandLower := strings.ToLower(command)
+						refreshDB = strings.Contains(commandLower, "use database") || strings.Contains(commandLower, "unuse database") || strings.Contains(commandLower, "create table")
 					}
 				default:
 					bail(out, err.Error(), &parameter)

connection.go

@@ -22,7 +22,6 @@ import (
 	"crypto/x509"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"net"
 	"os"
 	"strconv"
@@ -33,20 +32,21 @@ import (
 )
 
 type SQCloudConfig struct {
-	Host         string
-	Port         int
-	Username     string
-	Password     string
-	Database     string
-	Timeout      time.Duration
-	CompressMode string
-	Secure       bool
-	Pem          string
-	ApiKey       string
-	NoBlob       bool // flag to tell the server to not send BLOB columns
-	MaxData      int  // value to tell the server to not send columns with more than max_data bytes
-	MaxRows      int  // value to control rowset chunks based on the number of rows
-	MaxRowset    int  // value to control the maximum allowed size for a rowset
+	Host                  string
+	Port                  int
+	Username              string
+	Password              string
+	Database              string
+	Timeout               time.Duration
+	CompressMode          string
+	Secure                bool
+	TlsInsecureSkipVerify bool
+	Pem                   string
+	ApiKey                string
+	NoBlob                bool // flag to tell the server to not send BLOB columns
+	MaxData               int  // value to tell the server to not send columns with more than max_data bytes
+	MaxRows               int  // value to control rowset chunks based on the number of rows
+	MaxRowset             int  // value to control the maximum allowed size for a rowset
 }
 
 type SQCloud struct {
@@ -106,6 +106,7 @@ func ParseConnectionString(ConnectionString string) (config *SQCloudConfig, err
 		config.Timeout = 0
 		config.CompressMode = "NO"
 		config.Secure = true
+		config.TlsInsecureSkipVerify = false
 		config.Pem = ""
 		config.ApiKey = ""
 		config.NoBlob = false
@@ -133,7 +134,7 @@ func ParseConnectionString(ConnectionString string) (config *SQCloudConfig, err
 			case "compress":
 				config.CompressMode = strings.ToUpper(lastLiteral)
 			case "tls":
-				config.Secure, config.Pem = ParseTlsString(lastLiteral)
+				config.Secure, config.TlsInsecureSkipVerify, config.Pem = ParseTlsString(lastLiteral)
 			case "apikey":
 				config.ApiKey = lastLiteral
 			case "noblob":
@@ -161,16 +162,18 @@ func ParseConnectionString(ConnectionString string) (config *SQCloudConfig, err
 	return nil, err
 }
 
-func ParseTlsString(tlsconf string) (secure bool, pem string) {
+func ParseTlsString(tlsconf string) (secure bool, tlsInsecureSkipVerify bool, pem string) {
 	switch strings.ToUpper(strings.TrimSpace(tlsconf)) {
 	case "", "0", "N", "NO", "FALSE", "OFF", "DISABLE", "DISABLED":
-		return false, ""
+		return false, false, ""
 	case "1", "Y", "YES", "TRUE", "ON", "ENABLE", "ENABLED":
-		return true, ""
+		return true, false, ""
+	case "skip", "SKIP":
+		return true, true, ""
 	case strings.ToUpper(SQLiteCloudCA), "INTERN", "<USE INTERNAL PEM>":
-		return true, SQLiteCloudCA
+		return true, false, SQLiteCloudCA
 	default:
-		return true, strings.TrimSpace(tlsconf)
+		return true, false, strings.TrimSpace(tlsconf)
 	}
 }
 
@@ -217,7 +220,7 @@ func (this *SQCloud) CheckConnectionParameter() error {
 		var pool *x509.CertPool = nil
 		pem := []byte{}
 
-		switch _, trimmed := ParseTlsString(this.Pem); trimmed {
+		switch _, _, trimmed := ParseTlsString(this.Pem); trimmed {
 		case "":
 			break
 		case SQLiteCloudCA:
@@ -230,7 +233,7 @@ func (this *SQCloud) CheckConnectionParameter() error {
 				pem = []byte(trimmed)
 			} else {
 				// its a file, read its content into the pem string
-				switch bytes, err := ioutil.ReadFile(trimmed); {
+				switch bytes, err := os.ReadFile(trimmed); {
 				case err != nil:
 					return errors.New(fmt.Sprintf("Could not open PEM file in '%s'", trimmed))
 				default:
@@ -249,7 +252,7 @@ func (this *SQCloud) CheckConnectionParameter() error {
 
 		this.cert = &tls.Config{
 			RootCAs:            pool,
-			InsecureSkipVerify: false,
+			InsecureSkipVerify: this.TlsInsecureSkipVerify,
 			MinVersion:         tls.VersionTLS12,
 		}
 	}

pubsub.go

@@ -46,6 +46,8 @@
 
 package sqlitecloud
 
+import "strings"
+
 // GetUUID returns the UUID as string
 func (this *SQCloud) GetUUID() string {
 	return this.uuid // this.CGetCloudUUID()
@@ -82,8 +84,14 @@ func (this *SQCloud) Listen(Channel string) error { // add a call back function.
 }
 
 // Listen subscribes this connection to the specified Table.
-func (this *SQCloud) ListenTable(TableName string) error { // add a call back function...
-	return this.ExecuteArray("LISTEN TABLE ?", []interface{}{TableName})
+func (this *SQCloud) ListenTable(TableName string, DatabaseName string) error { // add a call back function...
+	sql := "LISTEN TABLE ?"
+	args := []interface{}{TableName}
+	if strings.TrimSpace(DatabaseName) != "" {
+		sql += " DATABASE ?"
+		args = append(args, DatabaseName)
+	}
+	return this.ExecuteArray(sql, args)
 }
 
 // Notify sends a wakeup call to the channel Channel
@@ -102,8 +110,14 @@ func (this *SQCloud) Unlisten(Channel string) error {
 }
 
 // Unlisten unsubsribs this connection from the specified Table.
-func (this *SQCloud) UnlistenTable(TableName string) error {
-	return this.ExecuteArray("UNLISTEN TABLE ?", []interface{}{TableName})
+func (this *SQCloud) UnlistenTable(TableName string, DatabaseName string) error {
+	sql := "UNLISTEN TABLE ?"
+	args := []interface{}{TableName}
+	if strings.TrimSpace(DatabaseName) != "" {
+		sql += " DATABASE ?"
+		args = append(args, DatabaseName)
+	}
+	return this.ExecuteArray(sql, args)
 }
 
 // Deletes the specified Channel.

server.go

@@ -240,7 +240,7 @@ func resultToConnectionList(result *Result, err error) ([]SQCloudConnection, err
 
 // ListDatabaseConnections - INTERNAL SERVER COMMAND: Lists all connections that use the specified Database on this SQLite Cloud Database Cluster.
 func (this *SQCloud) ListDatabaseConnections(Database string) ([]SQCloudConnection, error) {
-	result, err := this.SelectArray("LIST DATABASE CONNECTIONS ?", []interface{}{Database})
+	result, err := this.SelectArray("LIST DATABASE ? CONNECTIONS", []interface{}{Database})
 	return resultToConnectionList(result, err)
 }
 

test/server_test.go

@@ -56,6 +56,10 @@ func TestServer(t *testing.T) {
 		t.Fatal("Checking AUTH: ", err.Error())
 	}
 
+	if err := db.RemoveDatabase(testDbnameServer, true); err != nil { // Database, NoError
+		t.Fatal("REMOVE DATABASE: ", err.Error())
+	}
+
 	// Checking CREATE DATABASE
 	if err := db.CreateDatabase(testDbnameServer, "", "", false); err != nil { // Database, Key, Encoding, NoError
 		t.Fatal("CREATE DATABASE: ", err.Error())