TrueCloudLab/frostfs-node
20
1
Fork 27
Code Issues 96 Pull requests 4 Projects Releases 1 Activity Actions

[#2079] cli: Do not panic in object hash

Browse source 
Sign RPC requests with the provided key.

Signed-off-by: Pavel Karpy <carpawell@nspcc.ru>
This commit is contained in:
Pavel Karpy 2022-11-22 20:21:10 +03:00 committed by fyrchik
parent 960a2d0629
commit 761e82fecd
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -42,6 +42,7 @@ Changelog for NeoFS Node
- Ignore error if a transaction already exists in a morph client (#2075) - Ignore error if a transaction already exists in a morph client (#2075)
- ObjectID signature output in the CLI (#2104) - ObjectID signature output in the CLI (#2104)
- Pack arguments of `setPrice` invocation during contract update (#2078) - Pack arguments of `setPrice` invocation during contract update (#2078)
- `neofs-cli object hash` panic (#2079)
### Removed ### Removed
- `-g` option from `neofs-cli control ...` and `neofs-cli container create` commands (#2089) - `-g` option from `neofs-cli control ...` and `neofs-cli container create` commands (#2089)

4
cmd/neofs-cli/modules/object/hash.go
View file

@ -64,11 +64,13 @@ func getObjectHash(cmd *cobra.Command, _ []string) {
common.ExitOnErr(cmd, "could not decode salt: %w", err) common.ExitOnErr(cmd, "could not decode salt: %w", err)
pk := key.GetOrGenerate(cmd) pk := key.GetOrGenerate(cmd)
cli := internalclient.GetSDKClientByFlag(cmd, pk, commonflags.RPC)
tz := typ == hashTz tz := typ == hashTz
fullHash := len(ranges) == 0 fullHash := len(ranges) == 0
if fullHash { if fullHash {
var headPrm internalclient.HeadObjectPrm var headPrm internalclient.HeadObjectPrm
headPrm.SetClient(cli)
Prepare(cmd, &headPrm) Prepare(cmd, &headPrm)
headPrm.SetAddress(objAddr) headPrm.SetAddress(objAddr)
@ -94,8 +96,6 @@ func getObjectHash(cmd *cobra.Command, _ []string) {
return return
} }
cli := internalclient.GetSDKClientByFlag(cmd, pk, commonflags.RPC)
var hashPrm internalclient.HashPayloadRangesPrm var hashPrm internalclient.HashPayloadRangesPrm
hashPrm.SetClient(cli) hashPrm.SetClient(cli)
Prepare(cmd, &hashPrm) Prepare(cmd, &hashPrm)