fix: support dsn contains special character (#151)

Author: hantmac

dsn.go

@@ -207,24 +207,73 @@ func (cfg *Config) makeDefaultConfigValue() {
 	}
 }
 
+func needEscape(s string) bool {
+	unescaped, err := url.QueryUnescape(s)
+	if err != nil {
+		return true
+	}
+	return url.QueryEscape(unescaped) != s
+}
+
+func autoEncodeUserPassInDSN(dsn string) (string, error) {
+	i := strings.Index(dsn, "://")
+	if i == -1 {
+		return dsn, nil
+	}
+	rest := dsn[i+3:]
+	atIdx := strings.Index(rest, "@")
+	if atIdx == -1 {
+		return dsn, nil
+	}
+	userinfo := rest[:atIdx]
+	user := userinfo
+	pass := ""
+	if idx := strings.Index(userinfo, ":"); idx != -1 {
+		user = userinfo[:idx]
+		pass = userinfo[idx+1:]
+	}
+	var encUser, encPass string
+	if needEscape(user) {
+		encUser = url.QueryEscape(user)
+	} else {
+		encUser = user
+	}
+	if needEscape(pass) {
+		encPass = url.QueryEscape(pass)
+	} else {
+		encPass = pass
+	}
+	var encUserinfo string
+	if pass != "" {
+		encUserinfo = encUser + ":" + encPass
+	} else {
+		encUserinfo = encUser
+	}
+	encodedDSN := dsn[:i+3] + encUserinfo + rest[atIdx:]
+	return encodedDSN, nil
+}
+
 // ParseDSN parses the DSN string to a Config
 func ParseDSN(dsn string) (*Config, error) {
-	u, err := url.Parse(dsn)
+	encodedDSN, err := autoEncodeUserPassInDSN(dsn)
 	if err != nil {
 		return nil, err
 	}
+	u, err := url.Parse(encodedDSN)
+	if err != nil {
+		logger.Error("ParseDSN", "err", err)
+		return nil, err
+	}
 	cfg := NewConfig()
 
 	if strings.HasSuffix(u.Scheme, "http") {
 		cfg.SSLMode = SSL_MODE_DISABLE
 	}
 
 	if len(u.Path) > 1 {
-		// skip '/'
 		cfg.Database = u.Path[1:]
 	}
 	if u.User != nil {
-		// it is expected that empty password will be dropped out on Parse and Format
 		cfg.User = u.User.Username()
 		if passwd, ok := u.User.Password(); ok {
 			cfg.Password = passwd
@@ -253,10 +302,8 @@ func ParseDSN(dsn string) (*Config, error) {
 			cfg.Host = net.JoinHostPort(u.Host, "443")
 		}
 	}
-
 	return cfg, nil
 }
-
 func (cfg *Config) Connect(ctx context.Context) (driver.Conn, error) {
 	return DatabendDriver{}.OpenWithConfig(ctx, cfg)
 }

dsn_test.go

@@ -1,13 +1,40 @@
 package godatabend
 
 import (
+	"fmt"
+	"net/url"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
+func TestParseDSNWithEncodedChars(t *testing.T) {
+	username := "test_user"
+	password := "pa$$?word:abc@123"
+	dsn := fmt.Sprintf("databend+https://%s:%s@host:443/db?param1=value1&param2=value2", url.QueryEscape(username), url.QueryEscape(password))
+	cfg, err := ParseDSN(dsn)
+	require.Nil(t, err)
+
+	assert.Equal(t, username, cfg.User)
+	assert.Equal(t, password, cfg.Password)
+	assert.Equal(t, "host:443", cfg.Host)
+	assert.Equal(t, "db", cfg.Database)
+}
+func TestParseDSNWithSpecialChars(t *testing.T) {
+	dsn := "databend+https://use%#$^&r:pa$$?word@host:443/db?param1=value1&param2=value2"
+	cfg, err := ParseDSN(dsn)
+	require.Nil(t, err)
+
+	assert.Equal(t, "use%#$^&r", cfg.User)
+	assert.Equal(t, "pa$$?word", cfg.Password)
+	assert.Equal(t, "host:443", cfg.Host)
+	assert.Equal(t, "db", cfg.Database)
+	assert.Equal(t, "value1", cfg.Params["param1"])
+	assert.Equal(t, "value2", cfg.Params["param2"])
+}
+
 func TestFormatDSN(t *testing.T) {
 	dsn := "databend+https://username:[email protected]/test?role=test_role&empty_field_as=null&timeout=1s&wait_time_secs=10&max_rows_in_buffer=5000000&max_rows_per_page=10000&tls_config=tls-settings&warehouse=wh&sessionParam1=sessionValue1"
 	cfg, err := ParseDSN(dsn)