From fc9d270992421ba6125628022b926a7bec9a0c9e Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@beryju.org>
Date: Mon, 20 Dec 2021 21:46:01 +0100
Subject: [PATCH] outposts/ldap: fix log formatter and level not being set
 correctly

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
---
 cmd/ldap/server.go                | 6 ++++++
 internal/outpost/ak/global.go     | 3 ++-
 internal/outpost/ldap/ldap.go     | 2 +-
 internal/outpost/ldap/ldap_tls.go | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/cmd/ldap/server.go b/cmd/ldap/server.go
index 4d22ce6d2..6668a1c59 100644
--- a/cmd/ldap/server.go
+++ b/cmd/ldap/server.go
@@ -21,6 +21,12 @@ Required environment variables:
 
 func main() {
 	log.SetLevel(log.DebugLevel)
+	log.SetFormatter(&log.JSONFormatter{
+		FieldMap: log.FieldMap{
+			log.FieldKeyMsg:  "event",
+			log.FieldKeyTime: "timestamp",
+		},
+	})
 	akURL, found := os.LookupEnv("AUTHENTIK_HOST")
 	if !found {
 		fmt.Println("env AUTHENTIK_HOST not set!")
diff --git a/internal/outpost/ak/global.go b/internal/outpost/ak/global.go
index d30f10f1d..957ca0e88 100644
--- a/internal/outpost/ak/global.go
+++ b/internal/outpost/ak/global.go
@@ -14,7 +14,8 @@ import (
 
 func doGlobalSetup(outpost api.Outpost, globalConfig api.Config) {
 	l := log.WithField("logger", "authentik.outpost")
-	if !outpost.Managed.IsSet() {
+	m := outpost.Managed.Get()
+	if m == nil || *m == "" {
 		switch outpost.Config[ConfigLogLevel].(string) {
 		case "trace":
 			log.SetLevel(log.TraceLevel)
diff --git a/internal/outpost/ldap/ldap.go b/internal/outpost/ldap/ldap.go
index 1ebe86d32..4886abbec 100644
--- a/internal/outpost/ldap/ldap.go
+++ b/internal/outpost/ldap/ldap.go
@@ -57,7 +57,7 @@ func (ls *LDAPServer) StartLDAPServer() error {
 	proxyListener := &proxyproto.Listener{Listener: ln}
 	defer proxyListener.Close()
 
-	ls.log.WithField("listen", listen).Info("Starting ldap server")
+	ls.log.WithField("listen", listen).Info("Starting LDAP server")
 	err = ls.s.Serve(proxyListener)
 	if err != nil {
 		return err
diff --git a/internal/outpost/ldap/ldap_tls.go b/internal/outpost/ldap/ldap_tls.go
index 6a747451b..8ab93cc01 100644
--- a/internal/outpost/ldap/ldap_tls.go
+++ b/internal/outpost/ldap/ldap_tls.go
@@ -45,7 +45,7 @@ func (ls *LDAPServer) StartLDAPTLSServer() error {
 
 	tln := tls.NewListener(proxyListener, tlsConfig)
 
-	ls.log.WithField("listen", listen).Info("Starting ldap tls server")
+	ls.log.WithField("listen", listen).Info("Starting LDAP SSL server")
 	err = ls.s.Serve(tln)
 	if err != nil {
 		return err