feat(security): #328 delete old sessions [tbs]
Some checks failed
Build Docker Image / Build-Docker-Image (push) Failing after 42s
Some checks failed
Build Docker Image / Build-Docker-Image (push) Failing after 42s
This commit is contained in:
@@ -14,13 +14,13 @@ func SecurityHeaders(serverSettings *types.Settings) func(http.Handler) http.Han
|
|||||||
w.Header().Set("Access-Control-Allow-Origin", serverSettings.BaseUrl)
|
w.Header().Set("Access-Control-Allow-Origin", serverSettings.BaseUrl)
|
||||||
w.Header().Set("Access-Control-Allow-Methods", "GET, POST, DELETE")
|
w.Header().Set("Access-Control-Allow-Methods", "GET, POST, DELETE")
|
||||||
w.Header().Set("Content-Security-Policy",
|
w.Header().Set("Content-Security-Policy",
|
||||||
"default-src 'none';"+
|
"default-src 'none'; "+
|
||||||
"script-src 'self' https://umami.me-fit.eu"+
|
"script-src 'self' https://umami.me-fit.eu; "+
|
||||||
"connect-src 'self' https://umami.me-fit.eu"+
|
"connect-src 'self' https://umami.me-fit.eu; "+
|
||||||
"img-src 'self'"+
|
"img-src 'self'; "+
|
||||||
"style-src 'self'"+
|
"style-src 'self'; "+
|
||||||
"form-action 'self'"+
|
"form-action 'self'; "+
|
||||||
"frame-ancestors 'none'",
|
"frame-ancestors 'none'; ",
|
||||||
)
|
)
|
||||||
w.Header().Set("Cross-Origin-Resource-Policy", "same-origin")
|
w.Header().Set("Cross-Origin-Resource-Policy", "same-origin")
|
||||||
w.Header().Set("Cross-Origin-Opener-Policy", "same-origin")
|
w.Header().Set("Cross-Origin-Opener-Policy", "same-origin")
|
||||||
|
|||||||
28
less
28
less
@@ -1,28 +0,0 @@
|
|||||||
|
|
||||||
__ _ ___
|
|
||||||
/ /\ | | | |_)
|
|
||||||
/_/--\ |_| |_| \_ v1.52.3, built with Go go1.22.5
|
|
||||||
|
|
||||||
mkdir /home/tiwun/source/me-fit/tmp
|
|
||||||
watching .
|
|
||||||
watching db
|
|
||||||
watching handler
|
|
||||||
watching handler/middleware
|
|
||||||
watching log
|
|
||||||
watching migration
|
|
||||||
watching mocks
|
|
||||||
!exclude node_modules
|
|
||||||
watching service
|
|
||||||
!exclude static
|
|
||||||
watching template
|
|
||||||
watching template/auth
|
|
||||||
watching template/mail
|
|
||||||
watching template/workout
|
|
||||||
!exclude tmp
|
|
||||||
watching types
|
|
||||||
watching utils
|
|
||||||
building...
|
|
||||||
[32m(✓)[0m Complete [[2m updates=12[22m[2m duration=10.258748ms[22m ]
|
|
||||||
cleaning...
|
|
||||||
deleting /home/tiwun/source/me-fit/tmp
|
|
||||||
see you again~
|
|
||||||
85
main_test.go
85
main_test.go
@@ -81,13 +81,13 @@ func TestIntegrationSecurityHeader(t *testing.T) {
|
|||||||
assert.Equal(t, "GET, POST, DELETE", value)
|
assert.Equal(t, "GET, POST, DELETE", value)
|
||||||
|
|
||||||
value = resp.Header.Get("Content-Security-Policy")
|
value = resp.Header.Get("Content-Security-Policy")
|
||||||
assert.Equal(t, "default-src 'none';"+
|
assert.Equal(t, "default-src 'none'; "+
|
||||||
"script-src 'self' https://umami.me-fit.eu"+
|
"script-src 'self' https://umami.me-fit.eu; "+
|
||||||
"connect-src 'self' https://umami.me-fit.eu"+
|
"connect-src 'self' https://umami.me-fit.eu; "+
|
||||||
"img-src 'self'"+
|
"img-src 'self'; "+
|
||||||
"style-src 'self'"+
|
"style-src 'self'; "+
|
||||||
"form-action 'self'"+
|
"form-action 'self'; "+
|
||||||
"frame-ancestors 'none'", value)
|
"frame-ancestors 'none';", value)
|
||||||
|
|
||||||
value = resp.Header.Get("Cross-Origin-Resource-Policy")
|
value = resp.Header.Get("Cross-Origin-Resource-Policy")
|
||||||
assert.Equal(t, "same-origin", value)
|
assert.Equal(t, "same-origin", value)
|
||||||
@@ -159,6 +159,77 @@ func TestIntegrationAuth(t *testing.T) {
|
|||||||
assert.True(t, cookie.HttpOnly, "Cookie is not secure")
|
assert.True(t, cookie.HttpOnly, "Cookie is not secure")
|
||||||
assert.True(t, cookie.Secure, "Cookie is not secure")
|
assert.True(t, cookie.Secure, "Cookie is not secure")
|
||||||
})
|
})
|
||||||
|
t.Run("should change password and invalidate other sessions from user", func(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
db, basePath, ctx := setupIntegrationTest(t)
|
||||||
|
// TODO: take decision, if tests should be fully end to end (e.g. always send a signup request) or halway end to end (e.g. insert user into db)
|
||||||
|
userId := uuid.New()
|
||||||
|
userIdOther := uuid.New()
|
||||||
|
|
||||||
|
pass := service.GetHashPassword("password", []byte("salt"))
|
||||||
|
_, err := db.Exec(`
|
||||||
|
INSERT INTO user (user_id, email, email_verified, is_admin, password, salt, created_at)
|
||||||
|
VALUES (?, "mail@mail.de", FALSE, FALSE, ?, ?, datetime())`, userId, pass, []byte("salt"))
|
||||||
|
|
||||||
|
sessionId := "session-id"
|
||||||
|
assert.Nil(t, err)
|
||||||
|
_, err = db.Exec(`
|
||||||
|
INSERT INTO session (session_id, user_id, created_at, expires_at)
|
||||||
|
VALUES (?, ?, datetime(), datetime("now", "+1 day"))`, sessionId, userId)
|
||||||
|
assert.Nil(t, err)
|
||||||
|
_, err = db.Exec(`
|
||||||
|
INSERT INTO session (session_id, user_id, created_at, expires_at)
|
||||||
|
VALUES ("second", ?, datetime(), datetime("now", "+1 day"))`, userId)
|
||||||
|
assert.Nil(t, err)
|
||||||
|
_, err = db.Exec(`
|
||||||
|
INSERT INTO session (session_id, user_id, created_at, expires_at)
|
||||||
|
VALUES ("other", ?, datetime(), datetime("now", "+1 day"))`, userIdOther)
|
||||||
|
assert.Nil(t, err)
|
||||||
|
|
||||||
|
req, err := http.NewRequestWithContext(ctx, "GET", basePath+"/auth/change-password", nil)
|
||||||
|
assert.Nil(t, err)
|
||||||
|
req.Header.Set("Cookie", "id="+sessionId)
|
||||||
|
resp, err := httpClient.Do(req)
|
||||||
|
assert.Nil(t, err)
|
||||||
|
|
||||||
|
html, err := html.Parse(resp.Body)
|
||||||
|
assert.Nil(t, err)
|
||||||
|
|
||||||
|
csrfToken := findCsrfToken(html)
|
||||||
|
assert.NotEqual(t, "", csrfToken)
|
||||||
|
|
||||||
|
formData := url.Values{
|
||||||
|
"current-password": {"password"},
|
||||||
|
"new-password": {"MyNewSecurePassword1!"},
|
||||||
|
"csrf-token": {csrfToken},
|
||||||
|
}
|
||||||
|
|
||||||
|
req, err = http.NewRequestWithContext(ctx, "POST", basePath+"/api/auth/change-password", strings.NewReader(formData.Encode()))
|
||||||
|
assert.Nil(t, err)
|
||||||
|
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||||
|
req.Header.Set("Cookie", "id="+sessionId)
|
||||||
|
req.Header.Set("HX-Request", "true")
|
||||||
|
resp, err = httpClient.Do(req)
|
||||||
|
assert.Nil(t, err)
|
||||||
|
|
||||||
|
assert.Equal(t, http.StatusOK, resp.StatusCode)
|
||||||
|
|
||||||
|
var sessionIds []string
|
||||||
|
sessions, err := db.Query("SELECT session_id FROM session ORDER BY session_id")
|
||||||
|
assert.Nil(t, err)
|
||||||
|
for sessions.Next() {
|
||||||
|
var sessionId string
|
||||||
|
err = sessions.Scan(&sessionId)
|
||||||
|
assert.Nil(t, err)
|
||||||
|
sessionIds = append(sessionIds, sessionId)
|
||||||
|
}
|
||||||
|
|
||||||
|
t.Fatalf("sessionIds: %v", sessionIds)
|
||||||
|
assert.Equal(t, 2, len(sessionIds))
|
||||||
|
assert.Equal(t, "session-id", sessionIds[0])
|
||||||
|
assert.Equal(t, "other", sessionIds[0])
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func findCookie(resp *http.Response, name string) *http.Cookie {
|
func findCookie(resp *http.Response, name string) *http.Cookie {
|
||||||
|
|||||||
@@ -95,6 +95,7 @@ func NewAuthImpl(db db.Auth, random Random, clock Clock, mail Mail, serverSettin
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (service AuthImpl) SignIn(email string, password string) (*Session, error) {
|
func (service AuthImpl) SignIn(email string, password string) (*Session, error) {
|
||||||
|
log.Info("Sign in %s", email)
|
||||||
user, err := service.db.GetUserByEmail(email)
|
user, err := service.db.GetUserByEmail(email)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if errors.Is(err, db.ErrNotFound) {
|
if errors.Is(err, db.ErrNotFound) {
|
||||||
@@ -148,6 +149,7 @@ func (service AuthImpl) SignInSession(sessionId string) (*Session, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (service AuthImpl) SignInAnonymous() (*Session, error) {
|
func (service AuthImpl) SignInAnonymous() (*Session, error) {
|
||||||
|
log.Info("Sign in anonymous")
|
||||||
sessionDb, err := service.createSession(uuid.Nil)
|
sessionDb, err := service.createSession(uuid.Nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, types.ErrInternal
|
return nil, types.ErrInternal
|
||||||
|
|||||||
Reference in New Issue
Block a user