[MM-33395] Invalidate email tokens (#17069)
* [MM-33395] Invalidate existing verify email tokens when creating a new one * Update store layers * Addressing review comments * Fix linter Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
b5266c37dc
Коммит
5b99df7bcd
@@ -9329,6 +9329,24 @@ func (s *OpenTracingLayerTokenStore) Delete(token string) error {
|
||||
return err
|
||||
}
|
||||
|
||||
func (s *OpenTracingLayerTokenStore) GetAllTokensByType(tokenType string) ([]*model.Token, error) {
|
||||
origCtx := s.Root.Store.Context()
|
||||
span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TokenStore.GetAllTokensByType")
|
||||
s.Root.Store.SetContext(newCtx)
|
||||
defer func() {
|
||||
s.Root.Store.SetContext(origCtx)
|
||||
}()
|
||||
|
||||
defer span.Finish()
|
||||
result, err := s.TokenStore.GetAllTokensByType(tokenType)
|
||||
if err != nil {
|
||||
span.LogFields(spanlog.Error(err))
|
||||
ext.Error.Set(span, true)
|
||||
}
|
||||
|
||||
return result, err
|
||||
}
|
||||
|
||||
func (s *OpenTracingLayerTokenStore) GetByToken(token string) (*model.Token, error) {
|
||||
origCtx := s.Root.Store.Context()
|
||||
span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TokenStore.GetByToken")
|
||||
|
||||
@@ -10154,6 +10154,26 @@ func (s *RetryLayerTokenStore) Delete(token string) error {
|
||||
|
||||
}
|
||||
|
||||
func (s *RetryLayerTokenStore) GetAllTokensByType(tokenType string) ([]*model.Token, error) {
|
||||
|
||||
tries := 0
|
||||
for {
|
||||
result, err := s.TokenStore.GetAllTokensByType(tokenType)
|
||||
if err == nil {
|
||||
return result, nil
|
||||
}
|
||||
if !isRepeatableError(err) {
|
||||
return result, err
|
||||
}
|
||||
tries++
|
||||
if tries >= 3 {
|
||||
err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures")
|
||||
return result, err
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func (s *RetryLayerTokenStore) GetByToken(token string) (*model.Token, error) {
|
||||
|
||||
tries := 0
|
||||
|
||||
@@ -7,6 +7,7 @@ import (
|
||||
"database/sql"
|
||||
"fmt"
|
||||
|
||||
sq "github.com/Masterminds/squirrel"
|
||||
"github.com/pkg/errors"
|
||||
|
||||
"github.com/mattermost/mattermost-server/v5/model"
|
||||
@@ -74,6 +75,19 @@ func (s SqlTokenStore) Cleanup() {
|
||||
}
|
||||
}
|
||||
|
||||
func (s SqlTokenStore) GetAllTokensByType(tokenType string) ([]*model.Token, error) {
|
||||
tokens := []*model.Token{}
|
||||
query, args, err := s.getQueryBuilder().Select("*").From("Tokens").Where(sq.Eq{"Type": tokenType}).ToSql()
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(err, "could not build sql query to get all tokens by type")
|
||||
}
|
||||
|
||||
if _, err := s.GetReplica().Select(&tokens, query, args...); err != nil {
|
||||
return nil, errors.Wrapf(err, "failed to get all tokens of Type=%s", tokenType)
|
||||
}
|
||||
return tokens, nil
|
||||
}
|
||||
|
||||
func (s SqlTokenStore) RemoveAllTokensByType(tokenType string) error {
|
||||
if _, err := s.GetMaster().Exec("DELETE FROM Tokens WHERE Type = :TokenType", map[string]interface{}{"TokenType": tokenType}); err != nil {
|
||||
return errors.Wrapf(err, "failed to remove all Tokens with Type=%s", tokenType)
|
||||
|
||||
@@ -595,6 +595,7 @@ type TokenStore interface {
|
||||
Delete(token string) error
|
||||
GetByToken(token string) (*model.Token, error)
|
||||
Cleanup()
|
||||
GetAllTokensByType(tokenType string) ([]*model.Token, error)
|
||||
RemoveAllTokensByType(tokenType string) error
|
||||
}
|
||||
|
||||
|
||||
@@ -33,6 +33,29 @@ func (_m *TokenStore) Delete(token string) error {
|
||||
return r0
|
||||
}
|
||||
|
||||
// GetAllTokensByType provides a mock function with given fields: tokenType
|
||||
func (_m *TokenStore) GetAllTokensByType(tokenType string) ([]*model.Token, error) {
|
||||
ret := _m.Called(tokenType)
|
||||
|
||||
var r0 []*model.Token
|
||||
if rf, ok := ret.Get(0).(func(string) []*model.Token); ok {
|
||||
r0 = rf(tokenType)
|
||||
} else {
|
||||
if ret.Get(0) != nil {
|
||||
r0 = ret.Get(0).([]*model.Token)
|
||||
}
|
||||
}
|
||||
|
||||
var r1 error
|
||||
if rf, ok := ret.Get(1).(func(string) error); ok {
|
||||
r1 = rf(tokenType)
|
||||
} else {
|
||||
r1 = ret.Error(1)
|
||||
}
|
||||
|
||||
return r0, r1
|
||||
}
|
||||
|
||||
// GetByToken provides a mock function with given fields: token
|
||||
func (_m *TokenStore) GetByToken(token string) (*model.Token, error) {
|
||||
ret := _m.Called(token)
|
||||
|
||||
@@ -8405,6 +8405,22 @@ func (s *TimerLayerTokenStore) Delete(token string) error {
|
||||
return err
|
||||
}
|
||||
|
||||
func (s *TimerLayerTokenStore) GetAllTokensByType(tokenType string) ([]*model.Token, error) {
|
||||
start := timemodule.Now()
|
||||
|
||||
result, err := s.TokenStore.GetAllTokensByType(tokenType)
|
||||
|
||||
elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second)
|
||||
if s.Root.Metrics != nil {
|
||||
success := "false"
|
||||
if err == nil {
|
||||
success = "true"
|
||||
}
|
||||
s.Root.Metrics.ObserveStoreMethodDuration("TokenStore.GetAllTokensByType", success, elapsed)
|
||||
}
|
||||
return result, err
|
||||
}
|
||||
|
||||
func (s *TimerLayerTokenStore) GetByToken(token string) (*model.Token, error) {
|
||||
start := timemodule.Now()
|
||||
|
||||
|
||||
Ссылка в новой задаче
Block a user