nathan/smt
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases 2 Wiki Activity

use log rather than fmt
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Nathan Coad
2024-01-04 12:02:05 +11:00
parent f0e9751563
commit 2398288e08
2 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
models/ldap.go
View File

@@ -5,6 +5,7 @@ import (
"crypto/x509"
"encoding/pem"
"fmt"
"log"
"os"
"path/filepath"
"strings"
@@ -31,7 +32,7 @@ func GetFilePath(path string) string {
// check if filename exists
if _, err := os.Stat(path); os.IsNotExist((err)) {
fmt.Printf("File '%s' not found, searching in same directory as binary\n", path)
log.Printf("File '%s' not found, searching in same directory as binary\n", path)
// if not, check that it exists in the same directory as the currently executing binary
ex, err2 := os.Executable()
if err2 != nil {
@@ -49,20 +50,20 @@ func LoadLdapCert() {
// Get a copy of the system defined CA's
systemCA, err = x509.SystemCertPool()
if err != nil {
fmt.Printf("LoadLdapCert error getting system certificate pool : '%s'\n", err)
log.Printf("LoadLdapCert error getting system certificate pool : '%s'\n", err)
return
}
// only try to load certificate from file if the command line argument was specified
ldapCertFile := os.Getenv("LDAP_TRUST_CERT_FILE")
if ldapCertFile == "" {
fmt.Printf("LoadLdapCert no certificate specified\n")
log.Printf("LoadLdapCert no certificate specified\n")
return
} else {
// Try to read the file
cf, err := os.ReadFile(GetFilePath(ldapCertFile))
if err != nil {
fmt.Printf("LoadLdapCert error opening LDAP certificate file '%s' : '%s'\n", ldapCertFile, err)
log.Printf("LoadLdapCert error opening LDAP certificate file '%s' : '%s'\n", ldapCertFile, err)
return
}
@@ -72,7 +73,7 @@ func LoadLdapCert() {
//fmt.Printf("Loaded certificate with subject %s\n", crt.Subject)
if err != nil {
fmt.Printf("LoadLdapCert error processing LDAP certificate file '%s' : '%s'\n", ldapCertFile, err)
log.Printf("LoadLdapCert error processing LDAP certificate file '%s' : '%s'\n", ldapCertFile, err)
return
}
@@ -88,13 +89,13 @@ func VerifyLdapCreds(username string, password string) bool {
var err error
ldapServer := os.Getenv("LDAP_BIND_ADDRESS")
if ldapServer == "" {
fmt.Printf("VerifyLdapCreds no LDAP bind address supplied\n")
log.Printf("VerifyLdapCreds no LDAP bind address supplied\n")
return false
}
ldapBaseDn := os.Getenv("LDAP_BASE_DN")
if ldapBaseDn == "" {
fmt.Printf("VerifyLdapCreds no LDAP base DN supplied\n")
log.Printf("VerifyLdapCreds no LDAP base DN supplied\n")
return false
}
@@ -113,7 +114,7 @@ func VerifyLdapCreds(username string, password string) bool {
}
if err != nil {
fmt.Printf("VerifyLdapCreds error connecting to LDAP bind address '%s' : '%s'\n", ldapServer, err)
log.Printf("VerifyLdapCreds error connecting to LDAP bind address '%s' : '%s'\n", ldapServer, err)
return false
}
@@ -122,10 +123,10 @@ func VerifyLdapCreds(username string, password string) bool {
// try to bind to AD
err = ldaps.Bind(username, password)
if err != nil {
fmt.Printf("VerifyLdapCreds error binding to LDAP with supplied credentials : '%s'\n", err)
log.Printf("VerifyLdapCreds error binding to LDAP with supplied credentials : '%s'\n", err)
return false
} else {
fmt.Printf("VerifyLdapCreds successfully bound to LDAP\n")
log.Printf("VerifyLdapCreds successfully bound to LDAP\n")
}
searchReq := ldap.NewSearchRequest(
@@ -141,11 +142,11 @@ func VerifyLdapCreds(username string, password string) bool {
)
result, err := ldaps.Search(searchReq)
if err != nil {
fmt.Printf("VerifyLdapCreds search error : '%s'\n", err)
log.Printf("VerifyLdapCreds search error : '%s'\n", err)
return false
}
fmt.Printf("result: %v\n", result)
log.Printf("result: %v\n", result)
return true
}