From 630afaacb6ec8c5925ea34c7ee844abfd69fee63 Mon Sep 17 00:00:00 2001 From: HaoyangLiu Date: Sun, 2 Jul 2023 15:22:55 +0800 Subject: [PATCH] [R4R] - {develop}: fix consensys audit issue: cs-6.37 (#1207) fix Msgf directives Co-authored-by: Raymond <6427270+wukongcheng@users.noreply.github.com> --- tss/node/tsslib/storage/secrets_mgr.go | 11 ++++++----- tss/node/tsslib/storage/shamir_mgr.go | 2 +- tss/node/tsslib/tss.go | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/tss/node/tsslib/storage/secrets_mgr.go b/tss/node/tsslib/storage/secrets_mgr.go index 61be950c3..40066dc71 100644 --- a/tss/node/tsslib/storage/secrets_mgr.go +++ b/tss/node/tsslib/storage/secrets_mgr.go @@ -4,12 +4,13 @@ import ( "context" "encoding/json" "errors" + "time" + "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/service/secretsmanager" bkeygen "github.com/binance-chain/tss-lib/ecdsa/keygen" "github.com/rs/zerolog/log" - "time" ) const CtxTimeout = 30 * time.Second @@ -42,12 +43,12 @@ func NewSecretsMgr(secretId string) (*SecretsMgr, error) { result, err := client.GetSecretValue(ctx, params) if err != nil { - log.Error().Err(err).Msgf("fail to get secret value form aws secrets manager :%w", err) + log.Error().Err(err).Msgf("fail to get secret value form aws secrets manager :%v", err) return nil, err } var keys map[string]KeygenLocalState if err := json.Unmarshal(result.SecretBinary, &keys); err != nil { - log.Error().Err(err).Msgf("fail to unmarshal data to map :%w", err) + log.Error().Err(err).Msgf("fail to unmarshal data to map :%v", err) keys = map[string]KeygenLocalState{} } @@ -74,7 +75,7 @@ func (sm *SecretsMgr) Save() error { } buf, err := json.Marshal(sm.keys) if err != nil { - log.Error().Err(err).Msgf("fail to marshal secrets keys map to json: %w", err) + log.Error().Err(err).Msgf("fail to marshal secrets keys map to json: %v", err) return err } params := &secretsmanager.UpdateSecretInput{ @@ -83,7 +84,7 @@ func (sm *SecretsMgr) Save() error { } output, err := sm.client.UpdateSecret(context.TODO(), params) if err != nil { - log.Error().Err(err).Msgf("fail to put data to aws's secrets manager : %w", err) + log.Error().Err(err).Msgf("fail to put data to aws's secrets manager : %v", err) return err } log.Info().Msgf("put data to aws's secrets manager success, version is:%s", output.VersionId) diff --git a/tss/node/tsslib/storage/shamir_mgr.go b/tss/node/tsslib/storage/shamir_mgr.go index 7a2c5650b..e9bfbd870 100644 --- a/tss/node/tsslib/storage/shamir_mgr.go +++ b/tss/node/tsslib/storage/shamir_mgr.go @@ -82,7 +82,7 @@ func (sh *ShamirMgr) GetKeyFile(pubKey, localPartyKey string) (KeygenLocalState, } var keygenlocalstate KeygenLocalState if err := json.Unmarshal([]byte(keygen), &keygenlocalstate); err != nil { - log.Error().Err(err).Msgf("fail to unmarshal data to map :%w", err) + log.Error().Err(err).Msgf("fail to unmarshal data to map :%v", err) return KeygenLocalState{}, err } //缓存在内存中 diff --git a/tss/node/tsslib/tss.go b/tss/node/tsslib/tss.go index bb79e8587..3344acd0d 100644 --- a/tss/node/tsslib/tss.go +++ b/tss/node/tsslib/tss.go @@ -76,13 +76,13 @@ func NewTss( if shamirConfig.Enable { shamirManager, err = storage2.NewShamirMgr(shamirConfig) if err != nil { - log.Error().Err(err).Msgf("fail to create shamir manager :%w", err) + log.Error().Err(err).Msgf("fail to create shamir manager :%v", err) return nil, errors.New("fail to create shamir manager") } } else if secretsEnable { secretsManager, err = storage2.NewSecretsMgr(secretId) if err != nil { - log.Error().Err(err).Msgf("fail to create secrets manager :%w", err) + log.Error().Err(err).Msgf("fail to create secrets manager :%v", err) return nil, errors.New("fail to create secrets manager") } }