Merged
Conversation
handsomejack-42
force-pushed
the
467-feature-request-add-dsts-support
branch
3 times, most recently
from
5517451 to
83ca36e
Compare
bgavrilMS
reviewed
May 7, 2024
bgavrilMS
reviewed
May 7, 2024
| return resp, err | ||
| } | ||
|
|
||
| func (c Client) DSTSInstanceDiscovery(ctx context.Context, authorityInfo Info) (InstanceDiscoveryResponse, error) { |
Member
There was a problem hiding this comment.
Very surprised to see this, was under the impression that dSTS doesn't support instance discovery.
There was a problem hiding this comment.
Correct, instance discovery is not supported.
bgavrilMS
reviewed
May 7, 2024
bgavrilMS
approved these changes
May 7, 2024
handsomejack-42
force-pushed
the
467-feature-request-add-dsts-support
branch
from
83ca36e to
35a4182
Compare
| authorizationEndpoint = "https://%v/%v/oauth2/v2.0/authorize" | ||
| instanceDiscoveryEndpoint = "https://%v/common/discovery/instance" | ||
| aadInstanceDiscoveryEndpoint = "https://%v/common/discovery/instance" | ||
| dstsInstanceDiscoveryEndpoint = "https://%v/dstsv2/common/discovery/instance" |
| authorityType = ADFS | ||
| case "dstsv2": | ||
| if len(pathParts) != 3 { | ||
| return Info{}, errors.New(`dSTS authority must be an https URL such as "https://<authority>/dstsv2/<your tenant>"`) |
Contributor
Author
There was a problem hiding this comment.
hard-coded tenant + added validation
apps/internal/oauth/resolvers.go
Outdated
| if authorityInfo.AuthorityType == authority.ADFS { | ||
| return fmt.Sprintf("https://%s/adfs/.well-known/openid-configuration", authorityInfo.Host), nil | ||
| } else if authorityInfo.AuthorityType == authority.DSTS { | ||
| resp, err := m.rest.Authority().DSTSInstanceDiscovery(ctx, authorityInfo) |
There was a problem hiding this comment.
Similar to ADFS, you can use a hard coded URL for dSTS. An example of this endpoint on dSTS
IMPORTANT! To connect to this endpoint you need to be on our VPN.
Contributor
Author
There was a problem hiding this comment.
hard-coded the url
handsomejack-42
force-pushed
the
467-feature-request-add-dsts-support
branch
2 times, most recently
from
5ee15d8 to
99f29ff
Compare
|
The field isn't used anywhere. Removing it simplifies the work on introducing authority abstraction. We might re-add it once we need it for anything.
…ONCall Parsing the url, then setting qv.Encode() manually to u.RawQuery feel like an overcomplicated approach of creating url for http request. Use the native constructor, which enforces ctx to be passed into the request, and do simple sprintf for url + query.
This enables adding the same const for dSTS later in the process.
This allows reusing the function for dSTS flow.
handsomejack-42
force-pushed
the
467-feature-request-add-dsts-support
branch
from
99f29ff to
a19302c
Compare
handsomejack-42
force-pushed
the
467-feature-request-add-dsts-support
branch
from
a19302c to
0d1c5c6
Compare
|
Contributor
Author
|
ready to be merged, ran against real dSTS instance as instructed, works |
3 tasks
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
No description provided.