Feat: Match allowed cookies with optional character #71047
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
itsmylife
requested review from
zserge,
suntala and
yangkb09
and removed request for
a team
3 tasks
andresmgot
approved these changes
Jul 4, 2023
Let me know about that and I will update it quickly ;) |
that's weird, the message got lost, let me re-send it 🤔 |
andresmgot
reviewed
Jul 5, 2023
pkg/util/proxyutil/proxyutil.go
Outdated
Comment on lines
49
to
65
| // match all | ||
| if v == "[]" { | ||
| keepCookies[c.Name] = c | ||
| continue | ||
| } | ||
|
|
||
| l := len(v) - 2 | ||
| if v[l:] == "[]" { | ||
| if len(c.Name) >= l && c.Name[:l] == v[:l] { | ||
| keepCookies[c.Name] = c | ||
| } | ||
| } else { | ||
| // look for exact match | ||
| if c.Name == v { | ||
| keepCookies[c.Name] = c | ||
| } | ||
| } |
There was a problem hiding this comment.
I suggested to use the strings package to be a bit more readable:
if strings.HasSuffix(v, "[]") {
// match prefix
pattern := strings.TrimSuffix(v, "[]")
if strings.HasPrefix(c.Name, pattern) {
keepCookies[c.Name] = c
}
} else {
// exact match
if c.Name == v {
keepCookies[c.Name] = c
}
polibb
pushed a commit
that referenced
this pull request
Jul 14, 2023
* Match allowed cookies with optional character * Use strings package
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.
What is this feature?
This adds a new option for "Allowed Cookies". Allowed cookies can be determined via their name or an optional part.
This optional part will be matched with
[]. If the allowed cookie name ends with[]we match all cookies that start with the given string.Example:
Allowed Cookie:
cookie[]Matched Cookies:
cookie1, cookie2, cookie__special, cookieeeeeeNOT Matched Cookies:
supercookie1, super_cookie2, special_cookie__specialMore details are here: https://github.com/grafana/observability-metrics-squad/issues/124
This PR is an up-to-date version of this PR. The old one had some weird change list so I created a new PR to prevent confusion.
Why do we need this feature?
To have an easier matcher for allowed cookies.
Which issue(s) does this PR fix?:
Fixes https://github.com/grafana/observability-metrics-squad/issues/124
Fixes https://github.com/grafana/observability-metrics-squad/issues/102
Special notes for your reviewer:
Please check that: