From f57f11d85599c97455714afca133c30bad99a047 Mon Sep 17 00:00:00 2001 From: Nathan Coad Date: Thu, 4 Jan 2024 15:59:36 +1100 Subject: [PATCH] more logging --- .drone.yml | 4 ++-- models/ldap.go | 2 +- models/user.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index d15decd..036368b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,7 +25,7 @@ steps: #debug: true restore: true cache_key: '{{ .Repo.Name }}_{{ arch }}_{{ os }}' - archive_format: "gzip" + archive_format: "tar" filesystem_cache_root: "/go" local_root: / mount: @@ -56,7 +56,7 @@ steps: #debug: true rebuild: true cache_key: '{{ .Repo.Name }}_{{ arch }}_{{ os }}' - archive_format: "gzip" + archive_format: "tar" filesystem_cache_root: "/go" mount: - pkg.mod diff --git a/models/ldap.go b/models/ldap.go index 6260c79..6273142 100644 --- a/models/ldap.go +++ b/models/ldap.go @@ -124,9 +124,9 @@ func VerifyLdapCreds(username string, password string) bool { defer ldaps.Close() // try to bind to AD + log.Printf("Attempting LDAP bind with user '%s' and password '%s'\n", username, password) err = ldaps.Bind(username, password) if err != nil { - if ldapErr, ok := err.(*ldap.Error); ok && ldapErr.ResultCode == ldap.LDAPResultInvalidCredentials { log.Printf("VerifyLdapCreds user credentials are incorrect\n") return false diff --git a/models/user.go b/models/user.go index bbcef3d..224b5bf 100644 --- a/models/user.go +++ b/models/user.go @@ -111,7 +111,7 @@ func LoginCheck(username string, password string) (string, error) { } // TODO : attempt ldap bind - VerifyLdapCreds(username, password) + //VerifyLdapCreds(username, password) err = VerifyPassword(password, u.Password)