mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-05 19:59:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

pass only request instead of context

Browse Source 
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
This commit is contained in:
Jörn Friedrich Dreyer
2021-07-23 09:03:14 +00:00
parent a0dce56480
commit bea986fe26
4 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
proxy/pkg/middleware/selector_cookie.go
View File

@@ -37,9 +37,6 @@ func (m selectorCookie) ServeHTTP(w http.ResponseWriter, req *http.Request) {
return
}
ctx := req.Context()
claims := oidc.FromContext(ctx)
selectorCookieName := ""
if m.policySelector.Regex != nil {
selectorCookieName = m.policySelector.Regex.SelectorCookieName
@@ -50,14 +47,14 @@ func (m selectorCookie) ServeHTTP(w http.ResponseWriter, req *http.Request) {
_, err := req.Cookie(selectorCookieName)
if err != nil {
// no cookie there - try to add one
if claims != nil {
if oidc.FromContext(req.Context()) != nil {
selectorFunc, err := policy.LoadSelector(&m.policySelector)
if err != nil {
m.logger.Err(err)
}
selector, err := selectorFunc(ctx, req)
selector, err := selectorFunc(req)
if err != nil {
m.logger.Err(err)
}