Various OAuth fixes #1187
Merged
Various OAuth fixes #1187
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
kian99
reviewed
Apr 4, 2024
internal/rpc/proxy.go
Outdated
| if err != nil { | ||
| return errorFnc(err) | ||
| } | ||
|
|
||
| // TODO(CSS-7081): Ensure for tests that the secret key can be configured. |
There was a problem hiding this comment.
I think you can remove this TODO now.
pkg/names/service_account.go
Outdated
| @@ -62,5 +56,5 @@ func ParseServiceAccountTag(tag string) (ServiceAccountTag, error) { | |||
|
|
|||
| // IsValidServiceAccountId verifies the client id for a service account is valid according to a regex internally. | |||
| func IsValidServiceAccountId(id string) bool { | |||
| return validClientId.MatchString(id) | |||
| return names.IsValidUser(id) | |||
There was a problem hiding this comment.
Shouldn't we also enforce that the id has a domain?
babakks
approved these changes
Apr 4, 2024
internal/rpc/proxy.go
Outdated
Comment on lines
617
to
618
| // TODO(CSS-7081): Ensure for tests that the secret key can be configured. | ||
| // Or configure cmd tests to use the configured secret. |
There was a problem hiding this comment.
I think this has already been fixed.
go.mod
Outdated
| @@ -329,6 +328,7 @@ require ( | |||
|
|
|||
| replace ( | |||
| github.com/altoros/gosigma => github.com/juju/gosigma v0.0.0-20170523021020-a27b59fe2be9 | |||
| github.com/juju/juju => ../juju | |||
ale8k
reviewed
Apr 4, 2024
| @@ -693,7 +693,7 @@ | |||
| ] | |||
| }, | |||
| { | |||
| "clientId": "test-client-id", | |||
| "clientId": "test-client-id@canonical.com", | |||
There was a problem hiding this comment.
Why are we putting the @ here? I thought we'd append it to it internally?
ale8k
approved these changes
Apr 4, 2024
alesstimec
force-pushed
the
oauth-various-fixes-01
branch
2 times, most recently
from
a662c48 to
349d2c9
Compare
- fixes the proxy session token verification - changes the format of the client credentials client id bringing it in line with juju user tags - various local testing fixes
alesstimec
force-pushed
the
oauth-various-fixes-01
branch
from
d2f585b to
0028df2
Compare
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
Engineering checklist
Check only items that apply
Test instructions
Notes for code reviewers