mirrors/ldap-upstream
1
0
Fork 0
mirror of https://github.com/netauth/ldap.git synced 2024-11-24 04:21:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

main: Allow serving TLS connections

Browse source
This commit is contained in:
Michael Aldridge 2020-08-23 19:35:21 -07:00
parent 6d4b4de38a
commit 1c55b7d328
3 changed files with 35 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
internal/ldap/ldap.go
View file

@ -41,6 +41,16 @@ func (s *server) Serve(bind string) error {
return nil
}
// ServeTLS serves a TLS encrypted DSA on the provided bindstring
// using a key/cert pair located at the paths provided. Key and
// certificate should be PEM encoded.
func (s *server) ServeTLS(bind, keypath, certpath string) error {
chErr := make(chan error)
go s.ListenAndServeTLS(bind, certpath, keypath, chErr)
if err := <-chErr; err != nil {
s.l.Error("Error from main server thread", "error", err)
return err
}
return nil
}

2
internal/ldap/search.go
View file

@ -1,9 +1,9 @@
package ldap
import (
"fmt"
"context"
"errors"
"fmt"
"strconv"
"strings"

25
main.go
View file

@ -4,6 +4,7 @@ import (
"log"
"os"
"os/signal"
"strings"
"syscall"
"github.com/hashicorp/go-hclog"
@ -56,7 +57,29 @@ func main() {
ls.SetDomain(viper.GetString("ldap.domain"))
if err := ls.Serve(viper.GetString("ldap.bind")); err != nil {
if !viper.GetBool("ldap.tls") {
if !strings.HasPrefix(viper.GetString("ldap.bind"), "localhost") {
appLogger.Warn("===================================================================")
appLogger.Warn(" WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING ")
appLogger.Warn("===================================================================")
appLogger.Warn("")
appLogger.Warn("You are launching this server in plaintext mode! This is allowable")
appLogger.Warn("advisable when bound to localhost, and the bind configuration has")
appLogger.Warn("been detected as not being bound to localhost.")
appLogger.Warn("")
appLogger.Warn("===================================================================")
appLogger.Warn(" WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING ")
appLogger.Warn("===================================================================")
}
err = ls.Serve(viper.GetString("ldap.bind"))
} else {
err = ls.ServeTLS(
viper.GetString("ldap.bind"),
viper.GetString("ldap.key"),
viper.GetString("ldap.cert"),
)
}
if err != nil {
appLogger.Error("Error serving", "error", err)
return
}