From 795d1e0789dc1d1ac433b36e3c1c7febdb422e81 Mon Sep 17 00:00:00 2001
From: Evgenii Stratonikov <evgeniy@nspcc.ru>
Date: Thu, 9 Jun 2022 14:26:50 +0300
Subject: [PATCH] [#1494] go.mod: Update neofs-sdk-go

Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
---
 go.mod                                       |   2 +-
 go.sum                                       | Bin 98718 -> 98718 bytes
 pkg/services/object/acl/acl.go               |   2 +-
 pkg/services/object/acl/eacl/v2/eacl_test.go |  23 ++++++++++++++-----
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/go.mod b/go.mod
index cd2adc1f..7012823f 100644
--- a/go.mod
+++ b/go.mod
@@ -19,7 +19,7 @@ require (
 	github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220601120906-3bec6657f5c5 // indirect
 	github.com/nspcc-dev/neofs-api-go/v2 v2.12.2
 	github.com/nspcc-dev/neofs-contract v0.15.1
-	github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.4.0.20220607185339-031eac2f48f6
+	github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.4.0.20220609064532-517d7a1e4a0f
 	github.com/nspcc-dev/tzhash v1.5.2
 	github.com/panjf2000/ants/v2 v2.4.0
 	github.com/paulmach/orb v0.2.2
diff --git a/go.sum b/go.sum
index 06c5614d13eef5887f1eabd60ec85b654fbf0cf2..6c1c756e50e8a6993ff94aeb81b1790c1adf2128 100644
GIT binary patch
delta 110
zcmbQ&%r>u?ZG+-mCrbk}6H{X&T~kBz6!S#GRFg!5G=&U9tBS(hutfjjWCQ1bi109<
x!jdqzG*6E-kHC_oT(b!G9RKn#zewj?|J2CIj`JiY|DU5Ig3YMS8|S`#3;?anC0YOg

delta 111
zcmbQ&%r>u?ZG+-mXLCafQ)6RGT?1po)Wl??G!u(7GldL8tHi*Zl<ZXJpn?pKu;AR{
y02gfoQ*GyRp8(I?QlIk5V6W`VbRT2K%#c!x$%50QCfCiC7r|!M=8bdTJ_Z1$uOyQI

diff --git a/pkg/services/object/acl/acl.go b/pkg/services/object/acl/acl.go
index 39e6895d..6774f09b 100644
--- a/pkg/services/object/acl/acl.go
+++ b/pkg/services/object/acl/acl.go
@@ -190,7 +190,7 @@ func (c *Checker) CheckEACL(msg interface{}, reqInfo v2.RequestInfo) error {
 		return fmt.Errorf("can't parse headers: %w", err)
 	}
 
-	action := c.validator.CalculateAction(new(eaclSDK.ValidationUnit).
+	action, _ := c.validator.CalculateAction(new(eaclSDK.ValidationUnit).
 		WithRole(reqInfo.RequestRole()).
 		WithOperation(reqInfo.Operation()).
 		WithContainerID(&cnr).
diff --git a/pkg/services/object/acl/eacl/v2/eacl_test.go b/pkg/services/object/acl/eacl/v2/eacl_test.go
index 7eba649c..1105b3bd 100644
--- a/pkg/services/object/acl/eacl/v2/eacl_test.go
+++ b/pkg/services/object/acl/eacl/v2/eacl_test.go
@@ -120,21 +120,21 @@ func TestHeadRequest(t *testing.T) {
 
 	validator := eaclSDK.NewValidator()
 
-	require.Equal(t, eaclSDK.ActionDeny, validator.CalculateAction(unit.WithHeaderSource(newSource(t))))
+	checkAction(t, eaclSDK.ActionDeny, validator, unit.WithHeaderSource(newSource(t)))
 
 	meta.SetXHeaders(nil)
 
-	require.Equal(t, eaclSDK.ActionAllow, validator.CalculateAction(unit.WithHeaderSource(newSource(t))))
+	checkDefaultAction(t, validator, unit.WithHeaderSource(newSource(t)))
 
 	meta.SetXHeaders(xHdrs)
 
 	obj.SetAttributes()
 
-	require.Equal(t, eaclSDK.ActionAllow, validator.CalculateAction(unit.WithHeaderSource(newSource(t))))
+	checkDefaultAction(t, validator, unit.WithHeaderSource(newSource(t)))
 
 	lStorage.err = errors.New("any error")
 
-	require.Equal(t, eaclSDK.ActionAllow, validator.CalculateAction(unit.WithHeaderSource(newSource(t))))
+	checkDefaultAction(t, validator, unit.WithHeaderSource(newSource(t)))
 
 	r.SetAction(eaclSDK.ActionAllow)
 
@@ -149,6 +149,17 @@ func TestHeadRequest(t *testing.T) {
 	table.AddRecord(rID)
 
 	unit.WithEACLTable(table)
-
-	require.Equal(t, eaclSDK.ActionAllow, validator.CalculateAction(unit.WithHeaderSource(newSource(t))))
+	checkDefaultAction(t, validator, unit.WithHeaderSource(newSource(t)))
+}
+
+func checkAction(t *testing.T, expected eaclSDK.Action, v *eaclSDK.Validator, u *eaclSDK.ValidationUnit) {
+	actual, fromRule := v.CalculateAction(u)
+	require.True(t, fromRule)
+	require.Equal(t, expected, actual)
+}
+
+func checkDefaultAction(t *testing.T, v *eaclSDK.Validator, u *eaclSDK.ValidationUnit) {
+	actual, fromRule := v.CalculateAction(u)
+	require.False(t, fromRule)
+	require.Equal(t, eaclSDK.ActionAllow, actual)
 }