Skip to content

Commit cc7cf11

Browse files
committed
Fix tests failing on Go 1.20 on Windows. Clean works differently on 1.20. Use path.Clean instead.
1 parent 4156b3c commit cc7cf11

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

middleware/csrf.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@ func CSRFWithConfig(config CSRFConfig) echo.MiddlewareFunc {
119119
config.CookieSecure = true
120120
}
121121

122-
extractors, err := CreateExtractors(config.TokenLookup)
123-
if err != nil {
124-
panic(err)
122+
extractors, cErr := CreateExtractors(config.TokenLookup)
123+
if cErr != nil {
124+
panic(cErr)
125125
}
126126

127127
return func(next echo.HandlerFunc) echo.HandlerFunc {

middleware/jwt.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -196,9 +196,9 @@ func JWTWithConfig(config JWTConfig) echo.MiddlewareFunc {
196196
config.ParseTokenFunc = config.defaultParseToken
197197
}
198198

199-
extractors, err := createExtractors(config.TokenLookup, config.AuthScheme)
200-
if err != nil {
201-
panic(err)
199+
extractors, cErr := createExtractors(config.TokenLookup, config.AuthScheme)
200+
if cErr != nil {
201+
panic(cErr)
202202
}
203203
if len(config.TokenLookupFuncs) > 0 {
204204
extractors = append(config.TokenLookupFuncs, extractors...)

middleware/key_auth.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,9 @@ func KeyAuthWithConfig(config KeyAuthConfig) echo.MiddlewareFunc {
108108
panic("echo: key-auth middleware requires a validator function")
109109
}
110110

111-
extractors, err := createExtractors(config.KeyLookup, config.AuthScheme)
112-
if err != nil {
113-
panic(err)
111+
extractors, cErr := createExtractors(config.KeyLookup, config.AuthScheme)
112+
if cErr != nil {
113+
panic(cErr)
114114
}
115115

116116
return func(next echo.HandlerFunc) echo.HandlerFunc {

middleware/static.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,9 @@ func StaticWithConfig(config StaticConfig) echo.MiddlewareFunc {
157157
}
158158

159159
// Index template
160-
t, err := template.New("index").Parse(html)
161-
if err != nil {
162-
panic(fmt.Sprintf("echo: %v", err))
160+
t, tErr := template.New("index").Parse(html)
161+
if tErr != nil {
162+
panic(fmt.Errorf("echo: %w", tErr))
163163
}
164164

165165
return func(next echo.HandlerFunc) echo.HandlerFunc {
@@ -176,7 +176,7 @@ func StaticWithConfig(config StaticConfig) echo.MiddlewareFunc {
176176
if err != nil {
177177
return
178178
}
179-
name := filepath.Join(config.Root, filepath.Clean("/"+p)) // "/"+ for security
179+
name := filepath.Join(config.Root, path.Clean("/"+p)) // "/"+ for security
180180

181181
if config.IgnoreBase {
182182
routePath := path.Base(strings.TrimRight(c.Path(), "/*"))

0 commit comments

Comments
 (0)