Skip to content

feat(5388): Allow multiple external URLs for SSO access#18927

Merged
ishitasequeira merged 29 commits intoargoproj:masterfrom
ClifHouck:clif/tjamet/multiple-url-external-sso
Jul 30, 2024
Merged

feat(5388): Allow multiple external URLs for SSO access#18927
ishitasequeira merged 29 commits intoargoproj:masterfrom
ClifHouck:clif/tjamet/multiple-url-external-sso

Conversation

@ClifHouck
Copy link
Contributor

@ClifHouck ClifHouck commented Jul 3, 2024

My organization has interest in getting this functionality merged, so I'm taking up the mantle. I've re-based the original PR on current (79b18e0) master. This currently builds, but tests do not pass. I'll be back online next week to fix tests, verify functionality of this change, and respond to any existing review comments from the original PR.

Preserving the original PR note here for reference:

With #4780, were introduced security measures to ensure the return_url is pointing to the current ArgoCD instance.

In several occasions, an ArgoCD isntance could be exposed through multiple network connections. Internal addresses and restricted public addresses.

Currently, a single base URL can be configured in the the argocd configmap, preventing from exposing ArgoCD on several access paths.

This change allows to define multiple hosts on which ArgoCD can be exposed, keeping backward compatibility by adding a field additionalUrls accepting a list of additional URLS on which argoCD can be exposed

Fixes #5388

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • The title of the PR conforms to the Toolchain Guide
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).
  • My new feature complies with the feature status guidelines.
  • I have added a brief description of why this PR is necessary and/or what this PR solves.
  • Optional. My organization is added to USERS.md.
  • Optional. For bug fixes, I've indicated what older releases this fix should be cherry-picked into (this may or may not happen depending on risk/complexity).

@ClifHouck ClifHouck requested review from a team as code owners July 3, 2024 22:09
@bunnyshell
Copy link

bunnyshell bot commented Jul 3, 2024

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

  • 🚀 /bns:deploy to deploy the environment

@bunnyshell
Copy link

bunnyshell bot commented Jul 3, 2024

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

  • 🚀 /bns:deploy to deploy the environment

@agaudreault
Copy link
Member

@ClifHouck make sure to adress the review in #14208 (review). You can switch the PR to draft until the test are passing and everything is implemented. Thanks for taking up the mantle! 💪

@ClifHouck ClifHouck marked this pull request as draft July 4, 2024 15:02
@ClifHouck ClifHouck force-pushed the clif/tjamet/multiple-url-external-sso branch from 9c0c3ee to 9f64a90 Compare July 8, 2024 21:04
@codecov
Copy link

codecov bot commented Jul 8, 2024

Codecov Report

Attention: Patch coverage is 73.07692% with 14 lines in your changes missing coverage. Please review.

Project coverage is 52.78%. Comparing base (6cc898f) to head (79555cd).
Report is 506 commits behind head on master.

Files with missing lines Patch % Lines
util/settings/settings.go 85.18% 2 Missing and 2 partials ⚠️
server/server.go 25.00% 3 Missing ⚠️
util/oidc/oidc.go 72.72% 2 Missing and 1 partial ⚠️
server/logout/logout.go 33.33% 1 Missing and 1 partial ⚠️
util/dex/config.go 71.42% 1 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master   #18927      +/-   ##
==========================================
+ Coverage   50.70%   52.78%   +2.08%     
==========================================
  Files         316      316              
  Lines       43496    43579      +83     
==========================================
+ Hits        22054    23005     +951     
+ Misses      18930    18025     -905     
- Partials     2512     2549      +37     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor Author

@ClifHouck ClifHouck left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Regarding this last comment: https://github.com/argoproj/argo-cd/pull/14208/files#r1638649274 it seems like Dex is not using the new URLs setting. So I removed that addition.

}

func (a *ClientApp) oauth2Config(scopes []string) (*oauth2.Config, error) {
func (a *ClientApp) oauth2Config(request *http.Request, scopes []string) (*oauth2.Config, error) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

}
if argoCDCM.Data[settingURLsKey] != "" {
if err := yaml.Unmarshal([]byte(argoCDCM.Data[settingURLsKey]), &settings.URLs); err != nil {
log.Warnf("Failed to decode all external URLs in configmap: %v", err)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ClifHouck
Copy link
Contributor Author

ClifHouck commented Jul 9, 2024

@agaudreault I think I've addressed the comments you had on the previous PR. Except this:

I think the feature should be documented in the ArgoCD https://argo-cd.readthedocs.io/en/stable/operator-manual/user-management/ documentation.

Agreed. I can add some documentation around this feature.

Is url deprecated? are urls valid on their own or only additional urls? Is this feature supported by all identity providers, or only by OIDC?

@tjamet What do you think about the questions posed above?

@ClifHouck
Copy link
Contributor Author

What do I need to about the license compliance failing? Is there a contributor agreement I need to sign?

@ClifHouck ClifHouck marked this pull request as ready for review July 12, 2024 18:04
@tjamet
Copy link
Contributor

tjamet commented Jul 14, 2024

@agaudreault I think I've addressed the comments you had on the previous PR. Except this:

I think the feature should be documented in the ArgoCD https://argo-cd.readthedocs.io/en/stable/operator-manual/user-management/ documentation.

Agreed. I can add some documentation around this feature.

Is url deprecated? are urls valid on their own or only additional urls? Is this feature supported by all identity providers, or only by OIDC?

@tjamet What do you think about the questions posed above?

Hi!

Yes, it should be documented, happy to help doing so.

About the deprecation, this was my idea at the beginning but I faced some issues as url seemed used for more things. I will take a second look

@ClifHouck
Copy link
Contributor Author

@tjamet Any updates?

Comment on lines +13 to +16
# Additional externally facing base URLs (optional)
urls: |
- https://argo-cd-demo2.argoproj.io

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the feature must be documented in the ArgoCD argo-cd.readthedocs.io/en/stable/operator-manual/user-management documentation.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added some short documentation in the user-management doc

}
redirectURL, err := a.settings.RedirectURLForRequest(request)
if err != nil {
redirectURL = a.redirectURI
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably missing a log.Warnf("unable to find ArgoCD URL from request: %v", err)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added warning.

url: https://argo-cd-demo.argoproj.io

# Additional externally facing base URLs (optional)
urls: |
Copy link
Member

@agaudreault agaudreault Jul 25, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To provide feature parity, Dex should be configured to use all the urls as valid redirectUrls in

"redirectURIs": []string{
redirectURL,
},
and reload the config when fields are modified. Not sure if that will fully work because you can have multiple urls only between argo<->dex, but it seems only one is supported by dex between dex<->idp. If it does not, perhaps moving that config tooidc.config will be better.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I've updated dex to at least load the additional URLs with the proper callback endpoint appended.

I've also handled config reload when settings.AdditionalURLs is modified.

url: https://argo-cd-demo.argoproj.io

# Additional externally facing base URLs (optional)
urls: |
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this field does not replace the url field, I think it will be clearer if it is renamed to additionalUrls

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Renamed.

@tjamet
Copy link
Contributor

tjamet commented Jul 29, 2024

@tjamet Any updates?

Taking a second look, indeed, URL is used to register in dex, and the update to replace by the new proposed list is not that trivial.

Eventually, a decision to deprecate the url config in favour of a list could be taken in the future

@ClifHouck ClifHouck changed the title feat: Allow multiple external URLs for SSO access feat(5388): Allow multiple external URLs for SSO access Jul 29, 2024
tjamet and others added 12 commits July 29, 2024 12:25
Signed-off-by: Thibault Jamet <tjamet@users.noreply.github.com>
Signed-off-by: Clif Houck <me@clifhouck.com>
codeql restricts logging fields from user input. Remove log to avoid complex escapes

Signed-off-by: Thibault Jamet <tjamet@users.noreply.github.com>
Signed-off-by: Clif Houck <me@clifhouck.com>
Currently, the documented configmap is invalid and raises error at the
time of applying it.

Ensure the configmap is valid with a unit test

Signed-off-by: Thibault Jamet <tjamet@users.noreply.github.com>
Signed-off-by: Clif Houck <me@clifhouck.com>
Signed-off-by: Thibault Jamet <tjamet@users.noreply.github.com>
Signed-off-by: Clif Houck <me@clifhouck.com>
Signed-off-by: Thibault Jamet <tjamet@users.noreply.github.com>
Signed-off-by: Clif Houck <me@clifhouck.com>
Signed-off-by: Thibault Jamet <tjamet@users.noreply.github.com>
Signed-off-by: Clif Houck <me@clifhouck.com>
Signed-off-by: Thibault Jamet <tjamet@users.noreply.github.com>
Signed-off-by: Clif Houck <me@clifhouck.com>
With HTTP servers, the `url` field of `http.Requests` does not contain
the host nor the protocol.

To work around this, consider `request.Host` and
`request.URL.RequestURI()`

Signed-off-by: Thibault Jamet <tjamet@users.noreply.github.com>
Signed-off-by: Clif Houck <me@clifhouck.com>
Currently, while login is correctly handled, when logging out from
an alternate URL, we are redirected to the main URL.

Fix this by applying the same principles as for the login part

Signed-off-by: Thibault Jamet <tjamet@users.noreply.github.com>
Signed-off-by: Clif Houck <me@clifhouck.com>
Signed-off-by: Clif Houck <me@clifhouck.com>
Signed-off-by: Clif Houck <me@clifhouck.com>
…other spots in the codebase

Signed-off-by: Clif Houck <me@clifhouck.com>
Signed-off-by: Clif Houck <me@clifhouck.com>
@ClifHouck
Copy link
Contributor Author

I believe I've addressed everything brought up so far, and re-based on latest master e2c5a55 for good measure. Not sure what to do about the linter failing on files I haven't changed.

@ClifHouck ClifHouck requested a review from agaudreault July 29, 2024 17:45
@ClifHouck
Copy link
Contributor Author

Also need guidance on what to do about the license compliance check.

@agaudreault
Copy link
Member

Also need guidance on what to do about the license compliance check.

@ClifHouck You can ignore that.

Copy link
Member

@agaudreault agaudreault left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Added in my sprint to give it a try internally, for both dex and native oidc. I should be able to test tomorrow.

@ClifHouck
Copy link
Contributor Author

LGTM. Added in my sprint to give it a try internally, for both dex and native oidc. I should be able to test tomorrow.

Thank you!

Correct misspelling of additionalUrls

Co-authored-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Signed-off-by: Clif Houck <me@clifhouck.com>
@agaudreault
Copy link
Member

@ClifHouck Have you tested this image on an actual deployment? I am getting constant Invalid redirect URL: the protocol and host (including port) must match and the path must be within allowed URLs if provided. Might be a configuration problem on my part, but everything looks as expected. I am testing with the native oidc auth.

@ClifHouck
Copy link
Contributor Author

@ClifHouck Have you tested this image on an actual deployment? I am getting constant Invalid redirect URL: the protocol and host (including port) must match and the path must be within allowed URLs if provided. Might be a configuration problem on my part, but everything looks as expected. I am testing with the native oidc auth.

No, but I thought the included additional tests of the original PR would've covered this case. I'll setup an environment to do more in-depth testing. I may not be able to complete this before leaving for vacation though. I'll be back online on August 12th.

Copy link
Member

@agaudreault agaudreault left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using the correct value from config, it is working for dex+oidc and native oidc. 🎉

ClifHouck and others added 3 commits July 30, 2024 15:21
Fix incorrect key for additionalUrls

Co-authored-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Signed-off-by: Clif Houck <me@clifhouck.com>
Fix key name

Co-authored-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Signed-off-by: Clif Houck <me@clifhouck.com>
Signed-off-by: Clif Houck <me@clifhouck.com>
Copy link
Member

@agaudreault agaudreault left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member

@ishitasequeira ishitasequeira left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @ClifHouck for the PR!! and Thanks @agaudreault for the review!!

@ishitasequeira ishitasequeira enabled auto-merge (squash) July 30, 2024 22:18
@ishitasequeira ishitasequeira merged commit 42de68d into argoproj:master Jul 30, 2024
Copy link
Collaborator

@alexmt alexmt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

thisishwan2 pushed a commit to thisishwan2/argo-cd that referenced this pull request Aug 1, 2024
* Add new field to the documentation

Signed-off-by: Thibault Jamet <tjamet@users.noreply.github.com>
Signed-off-by: Clif Houck <me@clifhouck.com>

* Fix codeql issue

codeql restricts logging fields from user input. Remove log to avoid complex escapes

Signed-off-by: Thibault Jamet <tjamet@users.noreply.github.com>
Signed-off-by: Clif Houck <me@clifhouck.com>

* Add a test to ensure validity of the documented cm

Currently, the documented configmap is invalid and raises error at the
time of applying it.

Ensure the configmap is valid with a unit test

Signed-off-by: Thibault Jamet <tjamet@users.noreply.github.com>
Signed-off-by: Clif Houck <me@clifhouck.com>

* rename additionalURLs for URLs

Signed-off-by: Thibault Jamet <tjamet@users.noreply.github.com>
Signed-off-by: Clif Houck <me@clifhouck.com>

* Allow responses redirected from SSO to alternate URLs

Signed-off-by: Thibault Jamet <tjamet@users.noreply.github.com>
Signed-off-by: Clif Houck <me@clifhouck.com>

* Consider dex enabled when there are additional URLs configured

Signed-off-by: Thibault Jamet <tjamet@users.noreply.github.com>
Signed-off-by: Clif Houck <me@clifhouck.com>

* Parse new URLs config from argocd-cm

Signed-off-by: Thibault Jamet <tjamet@users.noreply.github.com>
Signed-off-by: Clif Houck <me@clifhouck.com>

* Detect additional SSO URLs from requests

With HTTP servers, the `url` field of `http.Requests` does not contain
the host nor the protocol.

To work around this, consider `request.Host` and
`request.URL.RequestURI()`

Signed-off-by: Thibault Jamet <tjamet@users.noreply.github.com>
Signed-off-by: Clif Houck <me@clifhouck.com>

* Handle logout properly

Currently, while login is correctly handled, when logging out from
an alternate URL, we are redirected to the main URL.

Fix this by applying the same principles as for the login part

Signed-off-by: Thibault Jamet <tjamet@users.noreply.github.com>
Signed-off-by: Clif Houck <me@clifhouck.com>

* Fix ClientApp.oath2Config

Signed-off-by: Clif Houck <me@clifhouck.com>

* Fix test compile time error

Signed-off-by: Clif Houck <me@clifhouck.com>

* Fix TestDocumentedArgoCDConfigMapIsValid to parse in the same way as other spots in the codebase

Signed-off-by: Clif Houck <me@clifhouck.com>

* Fix warning messages for external URLs when attemping to load them from config map

Signed-off-by: Clif Houck <me@clifhouck.com>

* Revert change to IsDexConfigured since Dex does not use URLs setting

Signed-off-by: Clif Houck <me@clifhouck.com>

* Remove unnecessary receiver nil check in favor of fixing test

Signed-off-by: Clif Houck <me@clifhouck.com>

* Fix typo

Signed-off-by: Clif Houck <me@clifhouck.com>

* Add a unit test for RedirectURLForRequest

Signed-off-by: Clif Houck <me@clifhouck.com>

* Rename settings.URLs to AdditionalURLs

Signed-off-by: Clif Houck <me@clifhouck.com>

* Fix use of URLs in TestClientApp_HandleLogin

Signed-off-by: Clif Houck <me@clifhouck.com>

* Renamed urls to additionalUrls

Signed-off-by: Clif Houck <me@clifhouck.com>

* Integrate settings.AdditionalURLs with dex config and test settings.RedirectAdditionalURLs

Signed-off-by: Clif Houck <me@clifhouck.com>

* Reload ArgoCDServer when settings.AdditionalURLs changes

Signed-off-by: Clif Houck <me@clifhouck.com>

* Add note about additionalUrls to user-managament docs

Signed-off-by: Clif Houck <me@clifhouck.com>

* Add G-Research

Signed-off-by: Clif Houck <me@clifhouck.com>

* Change G-Research URL to point to open-source page

Signed-off-by: Clif Houck <me@clifhouck.com>

* Update docs/operator-manual/argocd-cm.yaml

Correct misspelling of additionalUrls

Co-authored-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Signed-off-by: Clif Houck <me@clifhouck.com>

* Update util/settings/settings.go

Fix incorrect key for additionalUrls

Co-authored-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Signed-off-by: Clif Houck <me@clifhouck.com>

* Update util/settings/settings.go

Fix key name

Co-authored-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Signed-off-by: Clif Houck <me@clifhouck.com>

* fix additional urls config key in test config

Signed-off-by: Clif Houck <me@clifhouck.com>

---------

Signed-off-by: Thibault Jamet <tjamet@users.noreply.github.com>
Signed-off-by: Clif Houck <me@clifhouck.com>
Co-authored-by: Thibault Jamet <tjamet@users.noreply.github.com>
Co-authored-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
rhyswilliamsza pushed a commit to rhyswilliamsza/argo-cd that referenced this pull request Aug 12, 2024
* Add new field to the documentation

Signed-off-by: Thibault Jamet <tjamet@users.noreply.github.com>
Signed-off-by: Clif Houck <me@clifhouck.com>

* Fix codeql issue

codeql restricts logging fields from user input. Remove log to avoid complex escapes

Signed-off-by: Thibault Jamet <tjamet@users.noreply.github.com>
Signed-off-by: Clif Houck <me@clifhouck.com>

* Add a test to ensure validity of the documented cm

Currently, the documented configmap is invalid and raises error at the
time of applying it.

Ensure the configmap is valid with a unit test

Signed-off-by: Thibault Jamet <tjamet@users.noreply.github.com>
Signed-off-by: Clif Houck <me@clifhouck.com>

* rename additionalURLs for URLs

Signed-off-by: Thibault Jamet <tjamet@users.noreply.github.com>
Signed-off-by: Clif Houck <me@clifhouck.com>

* Allow responses redirected from SSO to alternate URLs

Signed-off-by: Thibault Jamet <tjamet@users.noreply.github.com>
Signed-off-by: Clif Houck <me@clifhouck.com>

* Consider dex enabled when there are additional URLs configured

Signed-off-by: Thibault Jamet <tjamet@users.noreply.github.com>
Signed-off-by: Clif Houck <me@clifhouck.com>

* Parse new URLs config from argocd-cm

Signed-off-by: Thibault Jamet <tjamet@users.noreply.github.com>
Signed-off-by: Clif Houck <me@clifhouck.com>

* Detect additional SSO URLs from requests

With HTTP servers, the `url` field of `http.Requests` does not contain
the host nor the protocol.

To work around this, consider `request.Host` and
`request.URL.RequestURI()`

Signed-off-by: Thibault Jamet <tjamet@users.noreply.github.com>
Signed-off-by: Clif Houck <me@clifhouck.com>

* Handle logout properly

Currently, while login is correctly handled, when logging out from
an alternate URL, we are redirected to the main URL.

Fix this by applying the same principles as for the login part

Signed-off-by: Thibault Jamet <tjamet@users.noreply.github.com>
Signed-off-by: Clif Houck <me@clifhouck.com>

* Fix ClientApp.oath2Config

Signed-off-by: Clif Houck <me@clifhouck.com>

* Fix test compile time error

Signed-off-by: Clif Houck <me@clifhouck.com>

* Fix TestDocumentedArgoCDConfigMapIsValid to parse in the same way as other spots in the codebase

Signed-off-by: Clif Houck <me@clifhouck.com>

* Fix warning messages for external URLs when attemping to load them from config map

Signed-off-by: Clif Houck <me@clifhouck.com>

* Revert change to IsDexConfigured since Dex does not use URLs setting

Signed-off-by: Clif Houck <me@clifhouck.com>

* Remove unnecessary receiver nil check in favor of fixing test

Signed-off-by: Clif Houck <me@clifhouck.com>

* Fix typo

Signed-off-by: Clif Houck <me@clifhouck.com>

* Add a unit test for RedirectURLForRequest

Signed-off-by: Clif Houck <me@clifhouck.com>

* Rename settings.URLs to AdditionalURLs

Signed-off-by: Clif Houck <me@clifhouck.com>

* Fix use of URLs in TestClientApp_HandleLogin

Signed-off-by: Clif Houck <me@clifhouck.com>

* Renamed urls to additionalUrls

Signed-off-by: Clif Houck <me@clifhouck.com>

* Integrate settings.AdditionalURLs with dex config and test settings.RedirectAdditionalURLs

Signed-off-by: Clif Houck <me@clifhouck.com>

* Reload ArgoCDServer when settings.AdditionalURLs changes

Signed-off-by: Clif Houck <me@clifhouck.com>

* Add note about additionalUrls to user-managament docs

Signed-off-by: Clif Houck <me@clifhouck.com>

* Add G-Research

Signed-off-by: Clif Houck <me@clifhouck.com>

* Change G-Research URL to point to open-source page

Signed-off-by: Clif Houck <me@clifhouck.com>

* Update docs/operator-manual/argocd-cm.yaml

Correct misspelling of additionalUrls

Co-authored-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Signed-off-by: Clif Houck <me@clifhouck.com>

* Update util/settings/settings.go

Fix incorrect key for additionalUrls

Co-authored-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Signed-off-by: Clif Houck <me@clifhouck.com>

* Update util/settings/settings.go

Fix key name

Co-authored-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Signed-off-by: Clif Houck <me@clifhouck.com>

* fix additional urls config key in test config

Signed-off-by: Clif Houck <me@clifhouck.com>

---------

Signed-off-by: Thibault Jamet <tjamet@users.noreply.github.com>
Signed-off-by: Clif Houck <me@clifhouck.com>
Co-authored-by: Thibault Jamet <tjamet@users.noreply.github.com>
Co-authored-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Signed-off-by: Rhys Williams <rhys.williams@electrum.co.za>
@akloss-cibo
Copy link

Any thoughts about when this will be in a tagged release?

@dave-gantenbein
Copy link

@ishitasequeira - we could really use a tagged release that contains this change, any idea when that might happen?

@blakepettersson
Copy link
Member

This will be in 2.13.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Multiple external URLs for SSO access

8 participants