Skip to content

Fix setting of SameSite on cookies #15989

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
May 27, 2021
Merged

Fix setting of SameSite on cookies #15989

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
faff955
Fix setting of SameSite on cookies
zeripath May 26, 2021
7998966
Merge branch 'main' into fix-samesite-bug
techknowlogick May 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions modules/web/middleware/cookie.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ func SetCookie(resp http.ResponseWriter, name string, value string, others ...in
if len(others) > 2 {
if v, ok := others[2].(string); ok && len(v) > 0 {
cookie.Domain = v
} else if v, ok := others[1].(func(*http.Cookie)); ok {
} else if v, ok := others[2].(func(*http.Cookie)); ok {
v(&cookie)
}
}
Expand All @@ -170,7 +170,7 @@ func SetCookie(resp http.ResponseWriter, name string, value string, others ...in
if len(others) > 4 {
if v, ok := others[4].(bool); ok && v {
cookie.HttpOnly = true
} else if v, ok := others[1].(func(*http.Cookie)); ok {
} else if v, ok := others[4].(func(*http.Cookie)); ok {
v(&cookie)
}
}
Expand All @@ -179,7 +179,7 @@ func SetCookie(resp http.ResponseWriter, name string, value string, others ...in
if v, ok := others[5].(time.Time); ok {
cookie.Expires = v
cookie.RawExpires = v.Format(time.UnixDate)
} else if v, ok := others[1].(func(*http.Cookie)); ok {
} else if v, ok := others[5].(func(*http.Cookie)); ok {
v(&cookie)
}
}
Expand Down