From 66aadf9d426daab8ff75a474075997008ceefb4e Mon Sep 17 00:00:00 2001 From: Ruoxi Wang Date: Fri, 20 Oct 2023 04:54:51 +0800 Subject: [PATCH] Respect some config values (#175) * Respect create_default_peer in config * Respect user_identifier in LDAP field map --- internal/app/wireguard/wireguard.go | 10 ++++++---- internal/ldap_utils.go | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/internal/app/wireguard/wireguard.go b/internal/app/wireguard/wireguard.go index c3d3387..6c406f9 100644 --- a/internal/app/wireguard/wireguard.go +++ b/internal/app/wireguard/wireguard.go @@ -46,10 +46,12 @@ func (m Manager) connectToMessageBus() { func (m Manager) handleUserCreationEvent(user *domain.User) { logrus.Errorf("handling new user event for %s", user.Identifier) - err := m.CreateDefaultPeer(context.Background(), user) - if err != nil { - logrus.Errorf("failed to create default peer for %s: %v", user.Identifier, err) - return + if m.cfg.Core.CreateDefaultPeer { + err := m.CreateDefaultPeer(context.Background(), user) + if err != nil { + logrus.Errorf("failed to create default peer for %s: %v", user.Identifier, err) + return + } } } diff --git a/internal/ldap_utils.go b/internal/ldap_utils.go index 242ec0b..ceff5a5 100644 --- a/internal/ldap_utils.go +++ b/internal/ldap_utils.go @@ -84,7 +84,7 @@ func LdapConvertEntries(sr *ldap.SearchResult, fields *config.LdapFields) []RawL for i, entry := range sr.Entries { userData := make(RawLdapUser) - userData[fields.UserIdentifier] = entry.DN + userData[fields.UserIdentifier] = entry.GetAttributeValue(fields.UserIdentifier) userData[fields.Email] = entry.GetAttributeValue(fields.Email) userData[fields.Firstname] = entry.GetAttributeValue(fields.Firstname) userData[fields.Lastname] = entry.GetAttributeValue(fields.Lastname)