upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor synced 2024-09-20 19:07:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

update logger for ldap.go

Browse Source
This commit is contained in:
wy65701436 2016-03-25 03:17:42 -07:00
parent e530413700
commit d2eaf6a148
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
auth/ldap/ldap.go
View File

@ -18,15 +18,15 @@ package ldap
import ( import (
"errors" "errors"
"fmt" "fmt"
"log"
"os" "os"
"strings" "strings"
log "github.com/vmware/harbor/utils/log"
"github.com/vmware/harbor/auth" "github.com/vmware/harbor/auth"
"github.com/vmware/harbor/dao" "github.com/vmware/harbor/dao"
"github.com/vmware/harbor/models" "github.com/vmware/harbor/models"
"github.com/astaxie/beego"
"github.com/mqu/openldap" "github.com/mqu/openldap"
) )
@ -44,7 +44,7 @@ func (l *Auth) Authenticate(m models.AuthModel) (*models.User, error) {
if ldapURL == "" { if ldapURL == "" {
return nil, errors.New("Can not get any available LDAP_URL.") return nil, errors.New("Can not get any available LDAP_URL.")
} }
beego.Debug("ldapURL:", ldapURL) log.Debug("ldapURL:", ldapURL)
p := m.Principal p := m.Principal
for _, c := range metaChars { for _, c := range metaChars {
@ -66,7 +66,7 @@ func (l *Auth) Authenticate(m models.AuthModel) (*models.User, error) {
} }
baseDn := fmt.Sprintf(ldapBaseDn, m.Principal) baseDn := fmt.Sprintf(ldapBaseDn, m.Principal)
beego.Debug("baseDn:", baseDn) log.Debug("baseDn:", baseDn)
err = ldap.Bind(baseDn, m.Password) err = ldap.Bind(baseDn, m.Password)
if err != nil { if err != nil {
@ -83,7 +83,7 @@ func (l *Auth) Authenticate(m models.AuthModel) (*models.User, error) {
return nil, err return nil, err
} }
if len(result.Entries()) != 1 { if len(result.Entries()) != 1 {
log.Printf("Found more than one entry.") log.Infof("Found more than one entry.")
return nil, nil return nil, nil
} }
en := result.Entries()[0] en := result.Entries()[0]
@ -100,7 +100,7 @@ func (l *Auth) Authenticate(m models.AuthModel) (*models.User, error) {
} }
} }
beego.Debug("username:", u.Username, ",email:", u.Email, ",realname:", u.Realname) log.Debug("username:", u.Username, ",email:", u.Email, ",realname:", u.Realname)
exist, err := dao.UserExists(u, "username") exist, err := dao.UserExists(u, "username")
if err != nil { if err != nil {