go/echo
go/echo
1
0
Fork 0
mirror of https://github.com/labstack/echo.git synced 2025-06-02 23:27:34 +02:00
Code Issues Releases Activity

Fixed #584

Browse Source 
Signed-off-by: Vishal Rana <vr@labstack.com>
This commit is contained in:
Vishal Rana 2016-06-28 17:38:12 -07:00
parent 08e08a00ea
commit d119b3bbfa
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
middleware/csrf.go
View File

@ -45,9 +45,9 @@ type (
// Optional. Default value none. // Optional. Default value none.
CookiePath string `json:"cookie_path"` CookiePath string `json:"cookie_path"`
// Expiration time of the CSRF cookie. // Max age (in seconds) of the CSRF cookie.
// Optional. Default value 24H. // Optional. Default value 86400 (24hr).
CookieExpires time.Time `json:"cookie_expires"` CookieMaxAge int `json:"cookie_max_age"`
// Indicates if CSRF cookie is secure. // Indicates if CSRF cookie is secure.
CookieSecure bool `json:"cookie_secure"` CookieSecure bool `json:"cookie_secure"`
@ -66,10 +66,10 @@ type (
var ( var (
// DefaultCSRFConfig is the default CSRF middleware config. // DefaultCSRFConfig is the default CSRF middleware config.
DefaultCSRFConfig = CSRFConfig{ DefaultCSRFConfig = CSRFConfig{
TokenLookup: "header:" + echo.HeaderXCSRFToken, TokenLookup: "header:" + echo.HeaderXCSRFToken,
ContextKey: "csrf", ContextKey: "csrf",
CookieName: "csrf", CookieName: "csrf",
CookieExpires: time.Now().Add(24 * time.Hour), CookieMaxAge: 86400,
} }
) )
@ -97,8 +97,8 @@ func CSRFWithConfig(config CSRFConfig) echo.MiddlewareFunc {
if config.CookieName == "" { if config.CookieName == "" {
config.CookieName = DefaultCSRFConfig.CookieName config.CookieName = DefaultCSRFConfig.CookieName
} }
if config.CookieExpires.IsZero() { if config.CookieMaxAge == 0 {
config.CookieExpires = DefaultCSRFConfig.CookieExpires config.CookieMaxAge = DefaultCSRFConfig.CookieMaxAge
} }
// Initialize // Initialize
@ -131,7 +131,7 @@ func CSRFWithConfig(config CSRFConfig) echo.MiddlewareFunc {
if config.CookieDomain != "" { if config.CookieDomain != "" {
cookie.SetDomain(config.CookieDomain) cookie.SetDomain(config.CookieDomain)
} }
cookie.SetExpires(config.CookieExpires) cookie.SetExpires(time.Now().Add(time.Duration(config.CookieMaxAge) * time.Second))
cookie.SetSecure(config.CookieSecure) cookie.SetSecure(config.CookieSecure)
cookie.SetHTTPOnly(config.CookieHTTPOnly) cookie.SetHTTPOnly(config.CookieHTTPOnly)
c.SetCookie(cookie) c.SetCookie(cookie)