mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

TokenStore migration to return plain errors (#14875)

Просмотр исходного кода 
* TokenStore migration to return plain errors

* Fix translations

* Fix: returned error is ignored and http.StatusBadRequest is always returned

* Fix

* Fix translations

* Suggestions

* Changed from BadRequest to NotFound

* Setting the correct http status

* Changed test to expect 404 status

* Fix error
Этот коммит содержится в:
Rodrigo Villablanca
2020-07-09 03:16:27 -04:00
коммит произвёл GitHub
родитель 4df6019f61
Коммит 8b6a5fc5d7
14 изменённых файлов: 101 добавлений и 86 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
store/opentracing_layer.go
Просмотреть файл

@@ -7486,7 +7486,7 @@ func (s *OpenTracingLayerTokenStore) Cleanup() {
}
func (s *OpenTracingLayerTokenStore) Delete(token string) *model.AppError {
func (s *OpenTracingLayerTokenStore) Delete(token string) error {
origCtx := s.Root.Store.Context()
span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TokenStore.Delete")
s.Root.Store.SetContext(newCtx)
@@ -7504,7 +7504,7 @@ func (s *OpenTracingLayerTokenStore) Delete(token string) *model.AppError {
return resultVar0
}
func (s *OpenTracingLayerTokenStore) GetByToken(token string) (*model.Token, *model.AppError) {
func (s *OpenTracingLayerTokenStore) GetByToken(token string) (*model.Token, error) {
origCtx := s.Root.Store.Context()
span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TokenStore.GetByToken")
s.Root.Store.SetContext(newCtx)
@@ -7522,7 +7522,7 @@ func (s *OpenTracingLayerTokenStore) GetByToken(token string) (*model.Token, *mo
return resultVar0, resultVar1
}
func (s *OpenTracingLayerTokenStore) RemoveAllTokensByType(tokenType string) *model.AppError {
func (s *OpenTracingLayerTokenStore) RemoveAllTokensByType(tokenType string) error {
origCtx := s.Root.Store.Context()
span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TokenStore.RemoveAllTokensByType")
s.Root.Store.SetContext(newCtx)
@@ -7540,7 +7540,7 @@ func (s *OpenTracingLayerTokenStore) RemoveAllTokensByType(tokenType string) *mo
return resultVar0
}
func (s *OpenTracingLayerTokenStore) Save(recovery *model.Token) *model.AppError {
func (s *OpenTracingLayerTokenStore) Save(recovery *model.Token) error {
origCtx := s.Root.Store.Context()
span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TokenStore.Save")
s.Root.Store.SetContext(newCtx)

22
store/sqlstore/tokens_store.go
Просмотреть файл

@@ -5,11 +5,13 @@ package sqlstore
import (
"database/sql"
"net/http"
"fmt"
"github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/store"
"github.com/pkg/errors"
)
type SqlTokenStore struct {
@@ -32,33 +34,33 @@ func newSqlTokenStore(sqlStore SqlStore) store.TokenStore {
func (s SqlTokenStore) createIndexesIfNotExists() {
}
func (s SqlTokenStore) Save(token *model.Token) *model.AppError {
func (s SqlTokenStore) Save(token *model.Token) error {
if err := token.IsValid(); err != nil {
return err
}
if err := s.GetMaster().Insert(token); err != nil {
return model.NewAppError("SqlTokenStore.Save", "store.sql_recover.save.app_error", nil, "", http.StatusInternalServerError)
return errors.Wrap(err, "failed to save Token")
}
return nil
}
func (s SqlTokenStore) Delete(token string) *model.AppError {
func (s SqlTokenStore) Delete(token string) error {
if _, err := s.GetMaster().Exec("DELETE FROM Tokens WHERE Token = :Token", map[string]interface{}{"Token": token}); err != nil {
return model.NewAppError("SqlTokenStore.Delete", "store.sql_recover.delete.app_error", nil, "", http.StatusInternalServerError)
return errors.Wrapf(err, "failed to delete Token with value %s", token)
}
return nil
}
func (s SqlTokenStore) GetByToken(tokenString string) (*model.Token, *model.AppError) {
func (s SqlTokenStore) GetByToken(tokenString string) (*model.Token, error) {
token := &model.Token{}
if err := s.GetReplica().SelectOne(token, "SELECT * FROM Tokens WHERE Token = :Token", map[string]interface{}{"Token": tokenString}); err != nil {
if err == sql.ErrNoRows {
return nil, model.NewAppError("SqlTokenStore.GetByToken", "store.sql_recover.get_by_code.app_error", nil, err.Error(), http.StatusBadRequest)
return nil, store.NewErrNotFound("Token", fmt.Sprintf("Token=%s", tokenString))
}
return nil, model.NewAppError("SqlTokenStore.GetByToken", "store.sql_recover.get_by_code.app_error", nil, err.Error(), http.StatusInternalServerError)
return nil, errors.Wrapf(err, "failed to get Token with value %s", tokenString)
}
return token, nil
@@ -72,9 +74,9 @@ func (s SqlTokenStore) Cleanup() {
}
}
func (s SqlTokenStore) RemoveAllTokensByType(tokenType string) *model.AppError {
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 model.NewAppError("SqlTokenStore.RemoveAllTokensByType", "store.sql_recover.remove_all_tokens_by_type.app_error", nil, err.Error(), http.StatusInternalServerError)
return errors.Wrapf(err, "failed to remove all Tokens with Type=%s", tokenType)
}
return nil
}

8
store/store.go
Просмотреть файл

@@ -512,11 +512,11 @@ type LicenseStore interface {
}
type TokenStore interface {
Save(recovery *model.Token) *model.AppError
Delete(token string) *model.AppError
GetByToken(token string) (*model.Token, *model.AppError)
Save(recovery *model.Token) error
Delete(token string) error
GetByToken(token string) (*model.Token, error)
Cleanup()
RemoveAllTokensByType(tokenType string) *model.AppError
RemoveAllTokensByType(tokenType string) error
}
type EmojiStore interface {

40
store/storetest/mocks/TokenStore.go
Просмотреть файл

@@ -20,23 +20,21 @@ func (_m *TokenStore) Cleanup() {
}
// Delete provides a mock function with given fields: token
func (_m *TokenStore) Delete(token string) *model.AppError {
func (_m *TokenStore) Delete(token string) error {
ret := _m.Called(token)
var r0 *model.AppError
if rf, ok := ret.Get(0).(func(string) *model.AppError); ok {
var r0 error
if rf, ok := ret.Get(0).(func(string) error); ok {
r0 = rf(token)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.AppError)
}
r0 = ret.Error(0)
}
return r0
}
// GetByToken provides a mock function with given fields: token
func (_m *TokenStore) GetByToken(token string) (*model.Token, *model.AppError) {
func (_m *TokenStore) GetByToken(token string) (*model.Token, error) {
ret := _m.Called(token)
var r0 *model.Token
@@ -48,45 +46,39 @@ func (_m *TokenStore) GetByToken(token string) (*model.Token, *model.AppError) {
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(string) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(string) error); ok {
r1 = rf(token)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
}
// RemoveAllTokensByType provides a mock function with given fields: tokenType
func (_m *TokenStore) RemoveAllTokensByType(tokenType string) *model.AppError {
func (_m *TokenStore) RemoveAllTokensByType(tokenType string) error {
ret := _m.Called(tokenType)
var r0 *model.AppError
if rf, ok := ret.Get(0).(func(string) *model.AppError); ok {
var r0 error
if rf, ok := ret.Get(0).(func(string) error); ok {
r0 = rf(tokenType)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.AppError)
}
r0 = ret.Error(0)
}
return r0
}
// Save provides a mock function with given fields: recovery
func (_m *TokenStore) Save(recovery *model.Token) *model.AppError {
func (_m *TokenStore) Save(recovery *model.Token) error {
ret := _m.Called(recovery)
var r0 *model.AppError
if rf, ok := ret.Get(0).(func(*model.Token) *model.AppError); ok {
var r0 error
if rf, ok := ret.Get(0).(func(*model.Token) error); ok {
r0 = rf(recovery)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.AppError)
}
r0 = ret.Error(0)
}
return r0

8
store/timer_layer.go
Просмотреть файл

@@ -6760,7 +6760,7 @@ func (s *TimerLayerTokenStore) Cleanup() {
}
}
func (s *TimerLayerTokenStore) Delete(token string) *model.AppError {
func (s *TimerLayerTokenStore) Delete(token string) error {
start := timemodule.Now()
resultVar0 := s.TokenStore.Delete(token)
@@ -6776,7 +6776,7 @@ func (s *TimerLayerTokenStore) Delete(token string) *model.AppError {
return resultVar0
}
func (s *TimerLayerTokenStore) GetByToken(token string) (*model.Token, *model.AppError) {
func (s *TimerLayerTokenStore) GetByToken(token string) (*model.Token, error) {
start := timemodule.Now()
resultVar0, resultVar1 := s.TokenStore.GetByToken(token)
@@ -6792,7 +6792,7 @@ func (s *TimerLayerTokenStore) GetByToken(token string) (*model.Token, *model.Ap
return resultVar0, resultVar1
}
func (s *TimerLayerTokenStore) RemoveAllTokensByType(tokenType string) *model.AppError {
func (s *TimerLayerTokenStore) RemoveAllTokensByType(tokenType string) error {
start := timemodule.Now()
resultVar0 := s.TokenStore.RemoveAllTokensByType(tokenType)
@@ -6808,7 +6808,7 @@ func (s *TimerLayerTokenStore) RemoveAllTokensByType(tokenType string) *model.Ap
return resultVar0
}
func (s *TimerLayerTokenStore) Save(recovery *model.Token) *model.AppError {
func (s *TimerLayerTokenStore) Save(recovery *model.Token) error {
start := timemodule.Now()
resultVar0 := s.TokenStore.Save(recovery)