Browse Source
Fix setting of SameSite on cookies (#15989) (#15991)
Fix #15972
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
mj-v1.14.3
techknowlogick
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
3 additions and
3 deletions
-
modules/web/middleware/cookie.go
|
|
@ -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) |
|
|
|
} |
|
|
|
} |
|
|
@ -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) |
|
|
|
} |
|
|
|
} |
|
|
@ -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) |
|
|
|
} |
|
|
|
} |
|
|
|