fix basic auth with custom user claim #2755
Merged
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
C0rby
approved these changes
Nov 11, 2021
rhafer
suggested changes
Nov 12, 2021
proxy/pkg/middleware/basic_auth.go
Outdated
| @@ -85,6 +85,7 @@ func BasicAuth(optionSetters ...Option) func(next http.Handler) http.Handler { | |||
| // fake oidc claims | |||
| claims := map[string]interface{}{ | |||
| oidc.OwncloudUUID: user.Id.OpaqueId, | |||
| options.UserOIDCClaim: user.Id.OpaqueId, | |||
There was a problem hiding this comment.
Doesn't this give you a dupliacte key here? E.g. when options.UserOIDCClaim == oidc.Email (which AFAIU even is the default)
There was a problem hiding this comment.
It indeed duplicates the key in some cases... But Go is fine with duplicate key as long as one of the duplicate keys is a variable... (https://play.golang.org/p/juVyt9SRnUf).
While looking at this I noticed, that options.UserOIDCClaim should only be set if use the userid to search for users on the CS3apis.
There was a problem hiding this comment.
Ah, thanks for clarifying. Didn't know that.
wkloucek
force-pushed
the
fix-basic-auth-with-custom-user-claim
branch
from
e67a759 to
7dca7b4
Compare
rhafer
suggested changes
Nov 15, 2021
|
Kudos, SonarCloud Quality Gate passed! |
rhafer
approved these changes
Nov 15, 2021
delete-merged-branch
bot
deleted the
fix-basic-auth-with-custom-user-claim
branch
ownclouders
pushed a commit
that referenced
this pull request
Nov 15, 2021
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.
Description
We've fixed authentication with basic if oCIS is configured to use a non-standard claim
as user claim (
PROXY_USER_OIDC_CLAIM). Prior to this bugfix the authentication alwaysfailed and is now working.
Related Issue
Motivation and Context
Make basic auth login work.
How Has This Been Tested?
Screenshots (if appropriate):
Types of changes
Checklist: