Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-07-02 01:35:08 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #42 from wy65701436/master

Browse Source 
update logger for autoenticator.go, passed on docker-compose build
This commit is contained in:
Daniel Jiang 2016-03-25 18:58:35 +08:00
commit e2bc1d5cbd
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
auth/authenticator.go
View File

@ -17,12 +17,11 @@ package auth
import ( import (
"fmt" "fmt"
"log"
"os" "os"
"github.com/vmware/harbor/models" "github.com/vmware/harbor/utils/log"
"github.com/astaxie/beego" "github.com/vmware/harbor/models"
) )
// Authenticator provides interface to authenticate user credentials. // Authenticator provides interface to authenticate user credentials.
@ -37,7 +36,7 @@ var registry = make(map[string]Authenticator)
// Register add different authenticators to registry map. // Register add different authenticators to registry map.
func Register(name string, authenticator Authenticator) { func Register(name string, authenticator Authenticator) {
if _, dup := registry[name]; dup { if _, dup := registry[name]; dup {
log.Printf("authenticator: %s has been registered", name) log.Infof("authenticator: %s has been registered", name)
return return
} }
registry[name] = authenticator registry[name] = authenticator
@ -50,7 +49,7 @@ func Login(m models.AuthModel) (*models.User, error) {
if authMode == "" || m.Principal == "admin" { if authMode == "" || m.Principal == "admin" {
authMode = "db_auth" authMode = "db_auth"
} }
beego.Debug("Current AUTH_MODE is ", authMode) log.Debug("Current AUTH_MODE is ", authMode)
authenticator, ok := registry[authMode] authenticator, ok := registry[authMode]
if !ok { if !ok {

12
auth/ldap/ldap.go
View File

@ -18,15 +18,15 @@ package ldap
import ( import (
"errors" "errors"
"fmt" "fmt"
"log"
"os" "os"
"strings" "strings"
"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.Warningf("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 {