mkadilov/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Pull requests Activity

[#1618] node: Use OID/CID from the request in eACL checks

Browse source 
Also, try to fetch object header info from the local storage to find as much
object info as possible for the requests which do not assume returning
object header as a response.

Signed-off-by: Pavel Karpy <carpawell@nspcc.ru>
This commit is contained in:
Pavel Karpy 2022-07-21 16:47:42 +03:00 committed by fyrchik
parent 6049022f7e
commit 589a54805d
2 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -17,6 +17,8 @@ Changelog for NeoFS Node
### Fixed
- Losing request context in eACL response checks (#1595)
### Removed
### Updated

32
pkg/services/object/acl/eacl/v2/headers.go
View file

@ -114,16 +114,10 @@ func (h *cfg) readObjectHeaders(dst *headerSource) error {
return errMissingOID
}
var addr oid.Address
addr.SetContainer(h.cnr)
addr.SetObject(*h.obj)
objHeaders, completed := h.localObjectHeaders(h.cnr, h.obj)
obj, err := h.storage.Head(addr)
if err == nil {
dst.objectHeaders = headersFromObject(obj, h.cnr, h.obj)
} else {
dst.incompleteObjectHeaders = true
}
dst.objectHeaders = objHeaders
dst.incompleteObjectHeaders = !completed
case
*objectV2.GetRangeRequest,
*objectV2.GetRangeHashRequest,
@ -155,6 +149,11 @@ func (h *cfg) readObjectHeaders(dst *headerSource) error {
}
case responseXHeaderSource:
switch resp := m.resp.(type) {
default:
objectHeaders, completed := h.localObjectHeaders(h.cnr, h.obj)
dst.objectHeaders = objectHeaders
dst.incompleteObjectHeaders = !completed
case *objectV2.GetResponse:
if v, ok := resp.GetBody().GetObjectPart().(*objectV2.GetObjectPartInit); ok {
oV2 := new(objectV2.Object)
@ -194,6 +193,21 @@ func (h *cfg) readObjectHeaders(dst *headerSource) error {
return nil
}
func (h *cfg) localObjectHeaders(cnr cid.ID, idObj *oid.ID) ([]eaclSDK.Header, bool) {
if idObj != nil {
var addr oid.Address
addr.SetContainer(cnr)
addr.SetObject(*idObj)
obj, err := h.storage.Head(addr)
if err == nil {
return headersFromObject(obj, cnr, idObj), true
}
}
return addressHeaders(cnr, idObj), false
}
func cidHeader(idCnr cid.ID) sysObjHdr {
return sysObjHdr{
k: acl.FilterObjectContainerID,