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

Force galaxy session auth as the first auth class. #2279

Merged
merged 4 commits into from
Sep 27, 2024

Conversation

jctanner
Copy link
Collaborator

@jctanner jctanner commented Sep 27, 2024

@github-actions github-actions bot added backport-4.9 This PR should be backported to stable-4.9 (2.4) backport-4.10 labels Sep 27, 2024
@jctanner jctanner removed backport-4.9 This PR should be backported to stable-4.9 (2.4) backport-4.10 labels Sep 27, 2024
No-Issue

Signed-off-by: James Tanner <[email protected]>
No-Issue

Signed-off-by: James Tanner <[email protected]>
No-Issue

Signed-off-by: James Tanner <[email protected]>
@jctanner jctanner merged commit 64968a9 into ansible:master Sep 27, 2024
16 of 19 checks passed
Copy link

patchback bot commented Oct 17, 2024

Backport to stable-4.10: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 64968a9 on top of patchback/backports/stable-4.10/64968a924ab03a85c7072dbee60e9d450acd2d09/pr-2279

Backporting merged PR #2279 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/ansible/galaxy_ng.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/stable-4.10/64968a924ab03a85c7072dbee60e9d450acd2d09/pr-2279 upstream/stable-4.10
  4. Now, cherry-pick PR Force galaxy session auth as the first auth class. #2279 contents into that branch:
    $ git cherry-pick -x 64968a924ab03a85c7072dbee60e9d450acd2d09
    If it'll yell at you with something like fatal: Commit 64968a924ab03a85c7072dbee60e9d450acd2d09 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 64968a924ab03a85c7072dbee60e9d450acd2d09
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Force galaxy session auth as the first auth class. #2279 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-4.10/64968a924ab03a85c7072dbee60e9d450acd2d09/pr-2279
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

Copy link

patchback bot commented Oct 17, 2024

Backport to stable-4.10: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-4.10/64968a924ab03a85c7072dbee60e9d450acd2d09/pr-2279

Backported as #2319

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback bot pushed a commit that referenced this pull request Oct 17, 2024
The galaxy sessionauth class must always come first to control the 401 vs 403 error messages AND to prevent the keycloak auth classes from sending back a www-authenticate header that causes an authentication popup in the platform UX.

No-Issue

Signed-off-by: James Tanner <[email protected]>
(cherry picked from commit 64968a9)
jctanner added a commit that referenced this pull request Oct 17, 2024
…s the first auth class. (#2319)

Force galaxy session auth as the first auth class. (#2279)

The galaxy sessionauth class must always come first to control the 401 vs 403 error messages AND to prevent the keycloak auth classes from sending back a www-authenticate header that causes an authentication popup in the platform UX.

No-Issue

Signed-off-by: James Tanner <[email protected]>
(cherry picked from commit 64968a9)

Co-authored-by: jctanner <[email protected]>
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.

2 participants