diff options
| author | James Elliott <james-d-elliott@users.noreply.github.com> | 2023-05-07 16:39:17 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-07 16:39:17 +1000 |
| commit | fb5c285c2549c344f5b24a1cae1fe724a89f11a0 (patch) | |
| tree | 8f7dde699a6d1bfffec8413a0f66d566851af9a2 /internal/storage/sql_provider_backend_mysql.go | |
| parent | 90d190121d538318ca2b1358f77b890a1cbe1b9d (diff) | |
feat(authentication): suport ldap over unix socket (#5397)
This adds support for LDAP unix sockets using the ldapi scheme. In addition it improves all of the address related parsing significantly deprecating old options.
Signed-off-by: James Elliott <james-d-elliott@users.noreply.github.com>
Diffstat (limited to 'internal/storage/sql_provider_backend_mysql.go')
| -rw-r--r-- | internal/storage/sql_provider_backend_mysql.go | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/internal/storage/sql_provider_backend_mysql.go b/internal/storage/sql_provider_backend_mysql.go index 32cc7de16..5ff2e531a 100644 --- a/internal/storage/sql_provider_backend_mysql.go +++ b/internal/storage/sql_provider_backend_mysql.go @@ -2,8 +2,6 @@ package storage import ( "crypto/x509" - "fmt" - "path" "time" "github.com/go-sql-driver/mysql" @@ -35,17 +33,8 @@ func NewMySQLProvider(config *schema.Configuration, caCertPool *x509.CertPool) ( func dsnMySQL(config *schema.MySQLStorageConfiguration, caCertPool *x509.CertPool) (dataSourceName string) { dsnConfig := mysql.NewConfig() - switch { - case path.IsAbs(config.Host): - dsnConfig.Net = sqlNetworkTypeUnixSocket - dsnConfig.Addr = config.Host - case config.Port == 0: - dsnConfig.Net = sqlNetworkTypeTCP - dsnConfig.Addr = fmt.Sprintf("%s:%d", config.Host, 3306) - default: - dsnConfig.Net = sqlNetworkTypeTCP - dsnConfig.Addr = fmt.Sprintf("%s:%d", config.Host, config.Port) - } + dsnConfig.Net = config.Address.Network() + dsnConfig.Addr = config.Address.NetworkAddress() if config.TLS != nil { _ = mysql.RegisterTLSConfig("storage", utils.NewTLSConfig(config.TLS, caCertPool)) @@ -53,13 +42,6 @@ func dsnMySQL(config *schema.MySQLStorageConfiguration, caCertPool *x509.CertPoo dsnConfig.TLSConfig = "storage" } - switch config.Port { - case 0: - dsnConfig.Addr = config.Host - default: - dsnConfig.Addr = fmt.Sprintf("%s:%d", config.Host, config.Port) - } - dsnConfig.DBName = config.Database dsnConfig.User = config.Username dsnConfig.Passwd = config.Password |