Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[24.1] fix CILogon redirect #18974

Merged
merged 1 commit into from
Oct 16, 2024
Merged

Conversation

laperlej
Copy link
Collaborator

When galaxy redirects to CILogon, it passes a query parameter called idphint which is usually a url starting with https://.

Starting at 24.1 the axios calls in the ExternalLogin.vue were changed to use withPrefix from utils/redirect.ts. The problem is that this strips all double slashes, invalidating any protocol passed as parameters (https:// becomes http:/)

I added a test to ensure that CILogon redirects are done correctly and changed the regex to only match duplicate slashes that are not preceded by a colon.

How to test the changes?

(Select all options that apply)

  • I've included appropriate automated tests.
  • This is a refactoring of components with existing test coverage.
  • Instructions for manual testing are as follows:
    1. [add testing steps and prerequisites here if you didn't write automated tests covering all your changes]

License

  • I agree to license these and all my past contributions to the core galaxy codebase under the MIT license.

@laperlej laperlej changed the title do not remove double slashes if part of a protocol fix CILogon redirect Oct 10, 2024
@github-actions github-actions bot added this to the 24.1 milestone Oct 10, 2024
@davelopez davelopez changed the title fix CILogon redirect [24.1] fix CILogon redirect Oct 11, 2024
@davelopez davelopez requested a review from dannon October 11, 2024 09:08
Copy link
Member

@dannon dannon left a comment

Choose a reason for hiding this comment

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

@laperlej Thank you, this works great!

@dannon dannon merged commit 5f11830 into galaxyproject:release_24.1 Oct 16, 2024
30 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants