From a00a83df380d96f01d9f39a99a4a9c3c5b8ddc96 Mon Sep 17 00:00:00 2001 From: stonezdj Date: Mon, 27 Sep 2021 19:06:28 +0800 Subject: [PATCH] Fix all issues related to the noise in the logs Change log level to debug when required Signed-off-by: stonezdj --- src/core/auth/authenticator.go | 5 +++-- src/core/auth/ldap/ldap.go | 4 ++-- src/core/controllers/base.go | 2 +- src/core/controllers/oidc.go | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/core/auth/authenticator.go b/src/core/auth/authenticator.go index d0bd6795f..a2aaa96fb 100644 --- a/src/core/auth/authenticator.go +++ b/src/core/auth/authenticator.go @@ -180,7 +180,7 @@ func getHelper(ctx context.Context) (AuthenticateHelper, error) { // OnBoardUser will check if a user exists in user table, if not insert the user and // put the id in the pointer of user model, if it does exist, return the user's profile. func OnBoardUser(ctx context.Context, user *models.User) error { - log.Debugf("OnBoardUser, user %+v", user) + log.Debugf("OnBoardUser, user: %v", user.Username) helper, err := getHelper(ctx) if err != nil { return err @@ -259,7 +259,8 @@ func PostAuthenticate(ctx context.Context, u *models.User) error { func IsSuperUser(ctx context.Context, username string) bool { u, err := user.Mgr.GetByName(ctx, username) if err != nil { - log.Errorf("Failed to get user from DB, username: %s, error: %v", username, err) + // LDAP user can't be found before onboard to Harbor + log.Debugf("Failed to get user from DB, username: %s, error: %v", username, err) return false } return u.UserID == 1 diff --git a/src/core/auth/ldap/ldap.go b/src/core/auth/ldap/ldap.go index 3672f3c24..b352e16d2 100644 --- a/src/core/auth/ldap/ldap.go +++ b/src/core/auth/ldap/ldap.go @@ -75,7 +75,7 @@ func (l *Auth) Authenticate(ctx context.Context, m models.AuthModel) (*models.Us log.Warningf("Found more than one entry.") return nil, auth.NewErrAuth("Multiple entries found") } - log.Debugf("Found ldap user %+v", ldapUsers[0]) + log.Debugf("Found ldap user: %v", ldapUsers[0].Username) dn := ldapUsers[0].DN if err = ldapSession.Bind(dn, m.Password); err != nil { @@ -259,7 +259,7 @@ func (l *Auth) PostAuthenticate(ctx context.Context, u *models.User) error { if n > 0 { dbUser, err := l.userMgr.GetByName(ctx, u.Username) if errors.IsNotFoundErr(err) { - fmt.Printf("User not found in DB %+v", u) + log.Debugf("User not found in DB:%v", u.Username) return nil } else if err != nil { return err diff --git a/src/core/controllers/base.go b/src/core/controllers/base.go index b3811fa80..bff6be6b3 100644 --- a/src/core/controllers/base.go +++ b/src/core/controllers/base.go @@ -67,7 +67,7 @@ func redirectForOIDC(ctx context.Context, username string) bool { } us, err := user.Ctl.Get(ctx, u.UserID, &user.Option{WithOIDCInfo: true}) if err != nil { - log.Warningf("Failed to get OIDC user info for user, id: %d, error: %v", u.UserID, err) + log.Debugf("Failed to get OIDC user info for user, id: %d, error: %v", u.UserID, err) } if us != nil && us.OIDCUserMeta != nil { return true diff --git a/src/core/controllers/oidc.go b/src/core/controllers/oidc.go index 6038c2794..9a8e9bf34 100644 --- a/src/core/controllers/oidc.go +++ b/src/core/controllers/oidc.go @@ -190,7 +190,7 @@ func userOnboard(ctx context.Context, oc *OIDCController, info *oidc.UserInfo, u } oidc.InjectGroupsToUser(info, user) - log.Debugf("User created: %+v\n", *user) + log.Debugf("User created: %v\n", user.Username) err = ctluser.Ctl.OnboardOIDCUser(ctx, user) if err != nil {