additional LDAP support

irc/config.go

@@ -25,6 +25,7 @@ import (
 	"github.com/oragono/oragono/irc/custime"
 	"github.com/oragono/oragono/irc/isupport"
 	"github.com/oragono/oragono/irc/languages"
+	"github.com/oragono/oragono/irc/ldap"
 	"github.com/oragono/oragono/irc/logger"
 	"github.com/oragono/oragono/irc/modes"
 	"github.com/oragono/oragono/irc/passwd"
@@ -68,7 +69,7 @@ type AccountConfig struct {
 		Exempted     []string
 		exemptedNets []net.IPNet
 	} `yaml:"require-sasl"`
-	LDAP            LDAPConfig
+	LDAP            ldap.LDAPConfig
 	LoginThrottling struct {
 		Enabled     bool
 		Duration    time.Duration
@@ -83,28 +84,6 @@ type AccountConfig struct {
 	VHosts VHostConfig
 }
 
-type LDAPConfig struct {
-	Timeout       int
-	Enabled       bool
-	AllowSignup   bool     `yaml:"allow-signup"`
-	BindDN        string   `yaml:"bind-dn"`
-	BindPwd       string   `yaml:"bind-password"`
-	SearchFilter  string   `yaml:"search-filter"`
-	SearchBaseDNs []string `yaml:"search-base-dns"`
-	Attributes    map[string]string
-	Servers       LDAPServerConfig
-}
-
-type LDAPServerConfig struct {
-	Host          string
-	Port          int
-	UseSSL        bool   `yaml:"use-ssl"`
-	StartTLS      bool   `yaml:"start-tls"`
-	SkipTLSVerify bool   `yaml:"skip-tls-verify"`
-	ClientCert    string `yaml:"client-cert"`
-	ClientKey     string `yaml:"client-key"`
-}
-
 // AccountRegistrationConfig controls account registration.
 type AccountRegistrationConfig struct {
 	Enabled                bool