Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

tooling: update to Go 1.11.1 and enable SameSite=Lax (#552)

Guilherme Oenning845fdc36f92d
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 10437cc87..7d8f6de0c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,7 +1,7 @@
version: 2
references:
builder: &builder
- getfider/circleci:0.0.13
+ getfider/circleci:0.0.14
workdir: &workdir
/go/src/github.com/getfider/fider
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2b4c414ee..8423f8129 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -17,7 +17,7 @@ If you know these technologies or would like to learn them, lucky you! This is t
Install the following tools:
-- Go 1.10+ (https://golang.org/)
+- Go 1.11+ (https://golang.org/)
- Node.js 10+ (https://nodejs.org/ or run `nvm use` if you have nvm installed)
- Docker (https://www.docker.com/)
diff --git a/app/handlers/signin_test.go b/app/handlers/signin_test.go
index 14fb83b91..434e9b8dc 100644
--- a/app/handlers/signin_test.go
+++ b/app/handlers/signin_test.go
@@ -331,6 +331,7 @@ func ExpectFiderAuthCookie(response *httptest.ResponseRecorder, expected *models
Expect(cookie.Name).Equals(web.CookieAuthName)
ExpectFiderToken(cookie.Value, expected)
Expect(cookie.HttpOnly).IsTrue()
+ Expect(cookie.SameSite).Equals(http.SameSiteLaxMode)
Expect(cookie.Path).Equals("/")
Expect(cookie.Expires).TemporarilySimilar(time.Now().Add(365*24*time.Hour), 5*time.Second)
return
diff --git a/app/handlers/signup_test.go b/app/handlers/signup_test.go
index 7b8eba018..b1832ff16 100644
--- a/app/handlers/signup_test.go
+++ b/app/handlers/signup_test.go
@@ -139,6 +139,7 @@ func TestCreateTenantHandler_WithSocialAccount(t *testing.T) {
ExpectFiderToken(cookie.Value, user)
Expect(cookie.Domain).Equals("test.fider.io")
Expect(cookie.HttpOnly).IsTrue()
+ Expect(cookie.SameSite).Equals(http.SameSiteLaxMode)
Expect(cookie.Path).Equals("/")
Expect(cookie.Expires).TemporarilySimilar(time.Now().Add(5*time.Minute), 5*time.Second)
}
diff --git a/app/middlewares/user_test.go b/app/middlewares/user_test.go
index 16142d370..e890020c6 100644
--- a/app/middlewares/user_test.go
+++ b/app/middlewares/user_test.go
@@ -128,6 +128,7 @@ func TestUser_WithSignUpCookie(t *testing.T) {
Expect(cookie.Value).Equals("")
Expect(cookie.Domain).Equals("test.fider.io")
Expect(cookie.HttpOnly).IsTrue()
+ Expect(cookie.SameSite).Equals(http.SameSiteLaxMode)
Expect(cookie.Path).Equals("/")
Expect(cookie.Expires).TemporarilySimilar(time.Now().Add(-100*time.Hour), 5*time.Second)
@@ -136,6 +137,7 @@ func TestUser_WithSignUpCookie(t *testing.T) {
Expect(cookie.Value).Equals(token)
Expect(cookie.Domain).Equals("")
Expect(cookie.HttpOnly).IsTrue()
+ Expect(cookie.SameSite).Equals(http.SameSiteLaxMode)
Expect(cookie.Path).Equals("/")
Expect(cookie.Expires).TemporarilySimilar(time.Now().Add(365*24*time.Hour), 5*time.Second)
}
diff --git a/app/pkg/web/context.go b/app/pkg/web/context.go
index 175482033..95ddba3d4 100644
--- a/app/pkg/web/context.go
+++ b/app/pkg/web/context.go
@@ -337,6 +337,7 @@ func (ctx *Context) AddCookie(name, value string, expires time.Time) {
Path: "/",
Expires: expires,
Secure: ctx.Request.IsSecure,
+ SameSite: http.SameSiteLaxMode,
})
}
@@ -349,6 +350,7 @@ func (ctx *Context) RemoveCookie(name string) {
MaxAge: -1,
Expires: time.Now().Add(-100 * time.Hour),
Secure: ctx.Request.IsSecure,
+ SameSite: http.SameSiteLaxMode,
})
}
diff --git a/app/pkg/web/util/webutil.go b/app/pkg/web/util/webutil.go
index 83b3b0a52..df4c6eb77 100644
--- a/app/pkg/web/util/webutil.go
+++ b/app/pkg/web/util/webutil.go
@@ -50,6 +50,7 @@ func SetSignUpAuthCookie(ctx web.Context, user *models.User) {
Path: "/",
Expires: time.Now().Add(5 * time.Minute),
Secure: ctx.Request.IsSecure,
+ SameSite: http.SameSiteLaxMode,
})
}
@@ -65,6 +66,7 @@ func GetSignUpAuthCookie(ctx web.Context) string {
MaxAge: -1,
Expires: time.Now().Add(-100 * time.Hour),
Secure: ctx.Request.IsSecure,
+ SameSite: http.SameSiteLaxMode,
})
return cookie.Value
}
diff --git a/magefile.go b/magefile.go
index a6b4b31f8..a4a481dc7 100644
--- a/magefile.go
+++ b/magefile.go
@@ -97,7 +97,7 @@ func (Test) All() {
func (Test) Coverage() error {
mg.Deps(Build.Server)
sh.Run("godotenv", "-f", ".test.env", "./"+exeName, "migrate")
- return sh.Run("godotenv", "-f", ".test.env", "go", "test", "./...", "-coverprofile=cover.out", "-coverpkg=all", "-race")
+ return sh.Run("godotenv", "-f", ".test.env", "go", "test", "./...", "-coverprofile=cover.out", "-coverpkg=all", "-p=8", "-race")
}
func (Test) Server() error {