-
Notifications
You must be signed in to change notification settings - Fork 49
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
chore: fix master and v3 branches #54
Merged
Merged
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
… + tests (cherry picked from commit 13427e8)
…types added Original wildcard prefix match now allows multiple * characters. For increased safety, a single '*' character now matches within one path segment only. To match any number of path segments, two consecutive charaters must be specified '**'. In addition to original "prefix match", full URL match is possible: 1. Wildcard Prefix Match `/admin/*` matches /admin/overview, /admin/users, *not* /admin/users/1 `/admin/**` matches what '/admin/*' matched + also '/admin/users/1' 2. Full URL Wildcard Match `*://a.com/admin` matches http://a.com/admin and https://a.com/admin `*://a.com/**` matches everything under http://a.com/ and https://a.com/ `https://b.com/admin` matches https://b.com/admin only 3. Full URL Regular Expression Match (prefixed by ~ character!) `~^https?://[cd].com/.*` matches everything under http://c.com/, http://d.com/ and their https versions Tests were extended for new functionality and updated for the fact that single '*' now matches within the one path component only. cherry-pick 36c3eee
cherry-pick b0dd328
cherry-pick 78e279f
`makeSessionCookie` turns its err value into a nil, losing its info. Also make fatal problems use Error and non-fatal problems use Warn. cherry-pick 3e4e6f9
(cherry picked from commit 8334159)
Shoutout to @jkoelker for the work here 👏 ! |
mhrabovcin
approved these changes
Feb 4, 2022
LGTM, I'll refrain from approving, since I helped with the code side, but I went through the remaining commits and it looks good to me. |
Using https://github.com/mesosphere/kubernetes-base-addons/tree/dkoshkin-tfa-clusterstorage Tested manually by setting custom values on the addon:
Verified the login still worked and saw this:
|
joejulian
approved these changes
Feb 8, 2022
This was referenced Feb 8, 2022
Closed
5 tasks
6 tasks
6 tasks
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.
Fixes https://jira.d2iq.com/browse/COPS-7145
https://github.com/mesosphere/traefik-forward-auth/releases/tag/v3.0.0 was released with #41 feature. But the
v3
branch was cut before that work went in. Then there was a big refactor that was done in 7e8ab37 and merged tov3
branch but the PR to master was never merged in. Then there were some more work that went intov3
and most of it did not make tomaster
.This PR is to get
master
back to expected state that includes both Jared's clusterstorage feature and the changes from thev3
branch. After this is merged we can create a newrelease/v3
branch from this tip that can then be used forv3
development.Jason and I cherry-picked each commit from
v3
. The first 4 had the most merge conflicts.When reviewing pay special attention to 39539aa as that one made some additional changes from the cherry-pick commit. The original commit added a
sessionCookie
which is no longer needed withuserinfo
introduced in the clusterstorage PR.