Skip to content

Add ability to set cookie SameSite attribute #38

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 1 commit into from
Sep 26, 2020
Merged

Add ability to set cookie SameSite attribute #38

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 11 additions & 0 deletions session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ type Options struct {
Secure bool
// Cookie life time. Default is 0.
CookieLifeTime int
// Cookie SameSite default is false (Lax), can be set to true (Strict)
CookieSameSite bool
// Cookie domain name. Default is empty.
Domain string
// Session ID length. Default is 16.
Expand Down Expand Up @@ -130,6 +132,9 @@ func prepareOptions(options []Options) Options {
if !opt.Secure {
opt.Secure = sec.Key("SECURE").MustBool()
}
if !opt.CookieSameSite {
opt.CookieSameSite = sec.Key("COOKIE_SAME_SITE").MustBool()
}
if opt.CookieLifeTime == 0 {
opt.CookieLifeTime = sec.Key("COOKIE_LIFE_TIME").MustInt()
}
Expand Down Expand Up @@ -292,13 +297,19 @@ func (m *Manager) Start(ctx *macaron.Context) (RawStore, error) {
return nil, err
}

sameSite := http.SameSiteLaxMode
if m.opt.CookieSameSite {
sameSite = http.SameSiteStrictMode
}

cookie := &http.Cookie{
Name: m.opt.CookieName,
Value: sid,
Path: m.opt.CookiePath,
HttpOnly: true,
Secure: m.opt.Secure,
Domain: m.opt.Domain,
SameSite: sameSite,
}
if m.opt.CookieLifeTime >= 0 {
cookie.MaxAge = m.opt.CookieLifeTime
Expand Down