IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

always delete session cookie even if db delete fails

Browse Source
This commit is contained in:
bergquist
2019-02-01 09:59:53 +01:00
parent 91bd908e03
commit a1b3986532
3 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
devenv/docker/blocks/loki/docker-compose.yaml
View File

@@ -20,3 +20,5 @@ services:
-config.file=/etc/promtail/docker-config.yaml -config.file=/etc/promtail/docker-config.yaml
networks: networks:
- loki - loki
depends_on:
- loki

14
pkg/services/auth/auth_token.go
View File

@@ -121,18 +121,10 @@ func (s *UserAuthTokenServiceImpl) SignOutUser(c *models.ReqContext) error {
hashedToken := hashToken(unhashedToken) hashedToken := hashToken(unhashedToken)
sql := `DELETE FROM user_auth_token WHERE auth_token = ?` sql := `DELETE FROM user_auth_token WHERE auth_token = ?`
res, err := s.SQLStore.NewSession().Exec(sql, hashedToken) _, err := s.SQLStore.NewSession().Exec(sql, hashedToken)
if err != nil {
return err
}
affected, _ := res.RowsAffected() s.writeSessionCookie(c, "", -1)
if affected > 0 { return err
s.writeSessionCookie(c, "", -1)
return nil
}
return errors.New("failed to delete session")
} }
func (s *UserAuthTokenServiceImpl) CreateToken(userId int64, clientIP, userAgent string) (*userAuthToken, error) { func (s *UserAuthTokenServiceImpl) CreateToken(userId int64, clientIP, userAgent string) (*userAuthToken, error) {

2
pkg/services/auth/auth_token_test.go
View File

@@ -73,7 +73,7 @@ func TestUserAuthToken(t *testing.T) {
Convey("signing out an none existing session should return an error", func() { Convey("signing out an none existing session should return an error", func() {
httpreq := &http.Request{Header: make(http.Header)} httpreq := &http.Request{Header: make(http.Header)}
httpreq.AddCookie(&http.Cookie{Name: userAuthTokenService.Cfg.LoginCookieName, Value: "missing-session-cookie"}) httpreq.AddCookie(&http.Cookie{Name: userAuthTokenService.Cfg.LoginCookieName, Value: ""})
ctx := &models.ReqContext{Context: &macaron.Context{ ctx := &models.ReqContext{Context: &macaron.Context{
Req: macaron.Request{Request: httpreq}, Req: macaron.Request{Request: httpreq},