Browse Source

csrf: able to set custom cookie name

Add new config option '[session] CSRF_COOKIE_NAME'.
pull/3854/merge
Unknwon 8 years ago
parent
commit
054e97d614
No known key found for this signature in database
GPG Key ID: 25B575AE3213B2B3
  1. 2
      conf/app.ini
  2. 2
      gogs.go
  3. 6
      modules/bindata/bindata.go
  4. 3
      modules/setting/setting.go
  5. 2
      templates/.VERSION

2
conf/app.ini

@ -250,6 +250,8 @@ ENABLE_SET_COOKIE = true
GC_INTERVAL_TIME = 86400 GC_INTERVAL_TIME = 86400
; Session life time, default is 86400 ; Session life time, default is 86400
SESSION_LIFE_TIME = 86400 SESSION_LIFE_TIME = 86400
; Cookie name for CSRF
CSRF_COOKIE_NAME = _csrf
[picture] [picture]
; Path to store user uploaded avatars ; Path to store user uploaded avatars

2
gogs.go

@ -16,7 +16,7 @@ import (
"github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/setting"
) )
const APP_VER = "0.9.165.0222 / 0.10 RC" const APP_VER = "0.9.166.0222 / 0.10 RC"
func init() { func init() {
setting.AppVer = APP_VER setting.AppVer = APP_VER

6
modules/bindata/bindata.go

File diff suppressed because one or more lines are too long

3
modules/setting/setting.go

@ -187,7 +187,7 @@ var (
// Session settings // Session settings
SessionConfig session.Options SessionConfig session.Options
CSRFCookieName = "_csrf" CSRFCookieName string
// Cron tasks // Cron tasks
Cron struct { Cron struct {
@ -744,6 +744,7 @@ func newSessionService() {
SessionConfig.Secure = Cfg.Section("session").Key("COOKIE_SECURE").MustBool() SessionConfig.Secure = Cfg.Section("session").Key("COOKIE_SECURE").MustBool()
SessionConfig.Gclifetime = Cfg.Section("session").Key("GC_INTERVAL_TIME").MustInt64(86400) SessionConfig.Gclifetime = Cfg.Section("session").Key("GC_INTERVAL_TIME").MustInt64(86400)
SessionConfig.Maxlifetime = Cfg.Section("session").Key("SESSION_LIFE_TIME").MustInt64(86400) SessionConfig.Maxlifetime = Cfg.Section("session").Key("SESSION_LIFE_TIME").MustInt64(86400)
CSRFCookieName = Cfg.Section("session").Key("CSRF_COOKIE_NAME").MustString("_csrf")
log.Info("Session Service Enabled") log.Info("Session Service Enabled")
} }

2
templates/.VERSION

@ -1 +1 @@
0.9.165.0222 / 0.10 RC 0.9.166.0222 / 0.10 RC
Loading…
Cancel
Save