go/echo
go/echo
1
0
Fork 0
mirror of https://github.com/labstack/echo.git synced 2025-03-29 21:56:53 +02:00
Code Issues Releases Activity

Minor fix in jwt and csrf middleware

Browse Source 
Signed-off-by: Vishal Rana <vr@labstack.com>
This commit is contained in:
Vishal Rana 2016-05-26 19:23:46 -07:00
parent 7e52ad4dd5
commit dc244c173d
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
middleware/csrf.go
View File

@ -20,14 +20,14 @@ type (
// Key to create CSRF token. // Key to create CSRF token.
Secret []byte `json:"secret"` Secret []byte `json:"secret"`
// Lookup is a string in the form of "<source>:<key>" that is used to extract // TokenLookup is a string in the form of "<source>:<key>" that is used
// token from the request. // to extract token from the request.
// Optional. Default value "header:X-CSRF-Token". // Optional. Default value "header:X-CSRF-Token".
// Possible values: // Possible values:
// - "header:<name>" // - "header:<name>"
// - "form:<name>" // - "form:<name>"
// - "header:<name>" // - "header:<name>"
Lookup string `json:"lookup"` TokenLookup string `json:"token_lookup"`
// Context key to store generated CSRF token into context. // Context key to store generated CSRF token into context.
// Optional. Default value "csrf". // Optional. Default value "csrf".
@ -66,7 +66,7 @@ type (
var ( var (
// DefaultCSRFConfig is the default CSRF middleware config. // DefaultCSRFConfig is the default CSRF middleware config.
DefaultCSRFConfig = CSRFConfig{ DefaultCSRFConfig = CSRFConfig{
Lookup: "header:" + echo.HeaderXCSRFToken, TokenLookup: "header:" + echo.HeaderXCSRFToken,
ContextKey: "csrf", ContextKey: "csrf",
CookieName: "csrf", CookieName: "csrf",
CookieExpires: time.Now().Add(24 * time.Hour), CookieExpires: time.Now().Add(24 * time.Hour),
@ -88,8 +88,8 @@ func CSRFWithConfig(config CSRFConfig) echo.MiddlewareFunc {
if config.Secret == nil { if config.Secret == nil {
panic("csrf secret must be provided") panic("csrf secret must be provided")
} }
if config.Lookup == "" { if config.TokenLookup == "" {
config.Lookup = DefaultCSRFConfig.Lookup config.TokenLookup = DefaultCSRFConfig.TokenLookup
} }
if config.ContextKey == "" { if config.ContextKey == "" {
config.ContextKey = DefaultCSRFConfig.ContextKey config.ContextKey = DefaultCSRFConfig.ContextKey
@ -102,7 +102,7 @@ func CSRFWithConfig(config CSRFConfig) echo.MiddlewareFunc {
} }
// Initialize // Initialize
parts := strings.Split(config.Lookup, ":") parts := strings.Split(config.TokenLookup, ":")
extractor := csrfTokenFromHeader(parts[1]) extractor := csrfTokenFromHeader(parts[1])
switch parts[0] { switch parts[0] {
case "form": case "form":

18
middleware/jwt.go
View File

@ -25,13 +25,13 @@ type (
// Optional. Default value "user". // Optional. Default value "user".
ContextKey string `json:"context_key"` ContextKey string `json:"context_key"`
// Lookup is a string in the form of "<source>:<key>" that is used to extract // TokenLookup is a string in the form of "<source>:<name>" that is used
// token from the request. // to extract token from the request.
// Optional. Default value "header:Authorization". // Optional. Default value "header:Authorization".
// Possible values: // Possible values:
// - "header:<name>" // - "header:<name>"
// - "form:<name>" // - "query:<name>"
Lookup string `json:"lookup"` TokenLookup string `json:"token_lookup"`
} }
jwtExtractor func(echo.Context) (string, error) jwtExtractor func(echo.Context) (string, error)
@ -51,7 +51,7 @@ var (
DefaultJWTConfig = JWTConfig{ DefaultJWTConfig = JWTConfig{
SigningMethod: AlgorithmHS256, SigningMethod: AlgorithmHS256,
ContextKey: "user", ContextKey: "user",
Lookup: "header:" + echo.HeaderAuthorization, TokenLookup: "header:" + echo.HeaderAuthorization,
} }
) )
@ -81,15 +81,15 @@ func JWTWithConfig(config JWTConfig) echo.MiddlewareFunc {
if config.ContextKey == "" { if config.ContextKey == "" {
config.ContextKey = DefaultJWTConfig.ContextKey config.ContextKey = DefaultJWTConfig.ContextKey
} }
if config.Lookup == "" { if config.TokenLookup == "" {
config.Lookup = DefaultJWTConfig.Lookup config.TokenLookup = DefaultJWTConfig.TokenLookup
} }
// Initialize // Initialize
parts := strings.Split(config.Lookup, ":") parts := strings.Split(config.TokenLookup, ":")
extractor := jwtFromHeader(parts[1]) extractor := jwtFromHeader(parts[1])
switch parts[0] { switch parts[0] {
case "form": case "query":
extractor = jwtFromQuery(parts[1]) extractor = jwtFromQuery(parts[1])
} }