From 7d66148d1f7705d43d3175a3488102e5f4d6078f Mon Sep 17 00:00:00 2001 From: Evgenii Baidakov Date: Thu, 13 Apr 2023 15:15:35 +0400 Subject: [PATCH] filter: Add payload and homomorphic hash filter methods Signed-off-by: Evgenii Baidakov --- object/search.go | 13 ++++++++ object/search_test.go | 78 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+) diff --git a/object/search.go b/object/search.go index 2174a29..b78e5e0 100644 --- a/object/search.go +++ b/object/search.go @@ -1,6 +1,8 @@ package object import ( + "crypto/sha256" + "encoding/hex" "encoding/json" "strconv" @@ -9,6 +11,7 @@ import ( oid "github.com/nspcc-dev/neofs-sdk-go/object/id" "github.com/nspcc-dev/neofs-sdk-go/user" "github.com/nspcc-dev/neofs-sdk-go/version" + "github.com/nspcc-dev/tzhash/tz" ) // SearchMatchType indicates match operation on specified header. @@ -299,3 +302,13 @@ func (f *SearchFilters) UnmarshalJSON(data []byte) error { return nil } + +// AddPayloadHashFilter adds filter by payload hash. +func (f *SearchFilters) AddPayloadHashFilter(m SearchMatchType, sum [sha256.Size]byte) { + f.addReservedFilter(m, fKeyPayloadHash, staticStringer(hex.EncodeToString(sum[:]))) +} + +// AddHomomorphicHashFilter adds filter by homomorphic hash. +func (f *SearchFilters) AddHomomorphicHashFilter(m SearchMatchType, sum [tz.Size]byte) { + f.addReservedFilter(m, fKeyHomomorphicHash, staticStringer(hex.EncodeToString(sum[:]))) +} diff --git a/object/search_test.go b/object/search_test.go index 26faaf6..04fb5ac 100644 --- a/object/search_test.go +++ b/object/search_test.go @@ -2,12 +2,16 @@ package object_test import ( "crypto/sha256" + "encoding/hex" + "fmt" "math/rand" "testing" v2object "github.com/nspcc-dev/neofs-api-go/v2/object" + "github.com/nspcc-dev/neofs-sdk-go/checksum" "github.com/nspcc-dev/neofs-sdk-go/object" oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/nspcc-dev/tzhash/tz" "github.com/stretchr/testify/require" ) @@ -207,3 +211,77 @@ func TestSearchMatchType_String(t *testing.T) { {val: toPtr(object.MatchUnknown), str: "MATCH_TYPE_UNSPECIFIED"}, }) } + +func testChecksumSha256() [sha256.Size]byte { + cs := [sha256.Size]byte{} + rand.Read(cs[:]) + + return cs +} + +func testChecksumTZ() [tz.Size]byte { + cs := [tz.Size]byte{} + rand.Read(cs[:]) + + return cs +} + +func TestSearchFilters_AddPayloadHashFilter(t *testing.T) { + cs := testChecksumSha256() + + fs := new(object.SearchFilters) + fs.AddPayloadHashFilter(object.MatchStringEqual, cs) + + t.Run("v2", func(t *testing.T) { + fsV2 := fs.ToV2() + + require.Len(t, fsV2, 1) + + require.Equal(t, v2object.FilterHeaderPayloadHash, fsV2[0].GetKey()) + require.Equal(t, hex.EncodeToString(cs[:]), fsV2[0].GetValue()) + require.Equal(t, v2object.MatchStringEqual, fsV2[0].GetMatchType()) + }) +} + +func ExampleSearchFilters_AddPayloadHashFilter() { + hash, _ := hex.DecodeString("66842cfea090b1d906b52400fae49d86df078c0670f2bdd059ba289ebe24a498") + + var v [sha256.Size]byte + copy(v[:], hash[:sha256.Size]) + + var cs checksum.Checksum + cs.SetSHA256(v) + + fmt.Println(hex.EncodeToString(cs.Value())) + // Output: 66842cfea090b1d906b52400fae49d86df078c0670f2bdd059ba289ebe24a498 +} + +func TestSearchFilters_AddHomomorphicHashFilter(t *testing.T) { + cs := testChecksumTZ() + + fs := new(object.SearchFilters) + fs.AddHomomorphicHashFilter(object.MatchStringEqual, cs) + + t.Run("v2", func(t *testing.T) { + fsV2 := fs.ToV2() + + require.Len(t, fsV2, 1) + + require.Equal(t, v2object.FilterHeaderHomomorphicHash, fsV2[0].GetKey()) + require.Equal(t, hex.EncodeToString(cs[:]), fsV2[0].GetValue()) + require.Equal(t, v2object.MatchStringEqual, fsV2[0].GetMatchType()) + }) +} + +func ExampleSearchFilters_AddHomomorphicHashFilter() { + hash, _ := hex.DecodeString("7e302ebb3937e810feb501965580c746048db99cebd095c3ce27022407408bf904dde8d9aa8085d2cf7202345341cc947fa9d722c6b6699760d307f653815d0c") + + var v [tz.Size]byte + copy(v[:], hash[:tz.Size]) + + var cs checksum.Checksum + cs.SetTillichZemor(v) + + fmt.Println(hex.EncodeToString(cs.Value())) + // Output: 7e302ebb3937e810feb501965580c746048db99cebd095c3ce27022407408bf904dde8d9aa8085d2cf7202345341cc947fa9d722c6b6699760d307f653815d0c +}