Skip admin and change oidc user not found message more readable #21061
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #21061 +/- ##
===========================================
+ Coverage 45.36% 66.08% +20.71%
===========================================
Files 244 1049 +805
Lines 13333 114661 +101328
Branches 2719 2867 +148
===========================================
+ Hits 6049 75768 +69719
- Misses 6983 34749 +27766
- Partials 301 4144 +3843
Flags with carried forward coverage won't be shown. Click here to find out more.
|
stonezdj
force-pushed
the
24oct18_oidc_admin_error
branch
from
4ba168e to
06d5924
Compare
5 tasks
|
+1, this would be very helpful |
|
+1 |
stonezdj
force-pushed
the
24oct18_oidc_admin_error
branch
2 times, most recently
from
93cfdc4 to
c6ce7bc
Compare
stonezdj
added
target/2.13.0
fixes goharbor#21041 Signed-off-by: stonezdj <stone.zhang@broadcom.com>
stonezdj
force-pushed
the
24oct18_oidc_admin_error
branch
from
c6ce7bc to
58b9680
Compare
|
+1 |
Vad1mo
requested changes
Dec 18, 2024
| user, err2 := uctl.GetByName(ctx, username) | ||
| // skip to log the error if the user is the admin user | ||
| if err2 == nil && user != nil && user.UserID == 1 { | ||
| return nil |
There was a problem hiding this comment.
Log at debug level for admin users as this might be expected
logger.Debugf("OIDC verification failed for admin user %s: %v", username, err)
| @@ -86,6 +87,9 @@ var m SecretManager = &defaultManager{ | |||
| func (dm *defaultManager) VerifySecret(ctx context.Context, username string, secret string) (*UserInfo, error) { | |||
| log.Debugf("Verifying the secret for user: %s", username) | |||
| oidcUser, err := dm.metaDao.GetByUsername(ctx, username) | |||
| if strings.Contains(err.Error(), "no row found") { | |||
There was a problem hiding this comment.
Checking error strings is fragile. Would not be better to:
- Use proper error types or sentinel errors
- Check if the error implements a specific interface
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes #21041
verified in local env
Thank you for contributing to Harbor!
Comprehensive Summary of your change
Issue being fixed
Fixes #(issue)
Please indicate you've done the following: