Skip to content

Commit 4310e90

Browse files
committed
Support Go 1.12 for http.SameSiteNoneMode
1 parent 0807357 commit 4310e90

File tree

3 files changed

+25
-1
lines changed

3 files changed

+25
-1
lines changed

middleware/csrf_samesite.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
// +build !go1.12
2+
3+
package middleware
4+
5+
import (
6+
"net/http"
7+
)
8+
9+
const (
10+
// SameSiteNoneMode required to be redefined for Go 1.12 support (see #1524)
11+
SameSiteNoneMode http.SameSite = http.SameSiteNoneMode
12+
)

middleware/csrf_samesite_1.12.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
// +build go1.12
2+
3+
package middleware
4+
5+
import (
6+
"net/http"
7+
)
8+
9+
const (
10+
// SameSiteNoneMode required to be redefined for Go 1.12 support (see #1524)
11+
SameSiteNoneMode http.SameSite = 4
12+
)

middleware/csrf_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ func TestCSRFWithSameSiteModeNone(t *testing.T) {
146146
c := e.NewContext(req, rec)
147147

148148
csrf := CSRFWithConfig(CSRFConfig{
149-
CookieSameSite: http.SameSiteNoneMode,
149+
CookieSameSite: SameSiteNoneMode,
150150
})
151151

152152
h := csrf(func(c echo.Context) error {

0 commit comments

Comments
 (0)