forked from TrueCloudLab/frostfs-s3-gw
[#346] Upgrade NeoFS SDK Go library
Core changes: - `object.ID` moved to new package `oid`; - `object.Address` moved to new package `address`; - `pool.Object` interface changes. Additionally: - Set container owner in `Agent.IssueSecret`. - Remove no longer needed fields from `GetObjectParams` - `Length` and `Offset` are never assigned. These values are set in `Range` field. Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
parent
6a4fba4d09
commit
34a221c5c9
28 changed files with 430 additions and 518 deletions
|
@ -21,7 +21,7 @@ import (
|
||||||
apiErrors "github.com/nspcc-dev/neofs-s3-gw/api/errors"
|
apiErrors "github.com/nspcc-dev/neofs-s3-gw/api/errors"
|
||||||
"github.com/nspcc-dev/neofs-s3-gw/creds/accessbox"
|
"github.com/nspcc-dev/neofs-s3-gw/creds/accessbox"
|
||||||
"github.com/nspcc-dev/neofs-s3-gw/creds/tokens"
|
"github.com/nspcc-dev/neofs-s3-gw/creds/tokens"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/object"
|
"github.com/nspcc-dev/neofs-sdk-go/object/address"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/pool"
|
"github.com/nspcc-dev/neofs-sdk-go/pool"
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
)
|
)
|
||||||
|
@ -113,12 +113,12 @@ func (c *center) parseAuthHeader(header string) (*authHeader, error) {
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *authHeader) getAddress() (*object.Address, error) {
|
func (a *authHeader) getAddress() (*address.Address, error) {
|
||||||
address := object.NewAddress()
|
addr := address.NewAddress()
|
||||||
if err := address.Parse(strings.ReplaceAll(a.AccessKeyID, "0", "/")); err != nil {
|
if err := addr.Parse(strings.ReplaceAll(a.AccessKeyID, "0", "/")); err != nil {
|
||||||
return nil, apiErrors.GetAPIError(apiErrors.ErrInvalidAccessKeyID)
|
return nil, apiErrors.GetAPIError(apiErrors.ErrInvalidAccessKeyID)
|
||||||
}
|
}
|
||||||
return address, nil
|
return addr, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *center) Authenticate(r *http.Request) (*accessbox.Box, error) {
|
func (c *center) Authenticate(r *http.Request) (*accessbox.Box, error) {
|
||||||
|
@ -145,12 +145,12 @@ func (c *center) Authenticate(r *http.Request) (*accessbox.Box, error) {
|
||||||
return nil, fmt.Errorf("failed to parse x-amz-date header field: %w", err)
|
return nil, fmt.Errorf("failed to parse x-amz-date header field: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
address, err := authHeader.getAddress()
|
addr, err := authHeader.getAddress()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
box, err := c.cli.GetBox(r.Context(), address)
|
box, err := c.cli.GetBox(r.Context(), addr)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -187,12 +187,12 @@ func (c *center) checkFormData(r *http.Request) (*accessbox.Box, error) {
|
||||||
return nil, fmt.Errorf("failed to parse x-amz-date field: %w", err)
|
return nil, fmt.Errorf("failed to parse x-amz-date field: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
address := object.NewAddress()
|
addr := address.NewAddress()
|
||||||
if err = address.Parse(strings.ReplaceAll(submatches["access_key_id"], "0", "/")); err != nil {
|
if err = addr.Parse(strings.ReplaceAll(submatches["access_key_id"], "0", "/")); err != nil {
|
||||||
return nil, apiErrors.GetAPIError(apiErrors.ErrInvalidAccessKeyID)
|
return nil, apiErrors.GetAPIError(apiErrors.ErrInvalidAccessKeyID)
|
||||||
}
|
}
|
||||||
|
|
||||||
box, err := c.cli.GetBox(r.Context(), address)
|
box, err := c.cli.GetBox(r.Context(), addr)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
6
api/cache/accessbox.go
vendored
6
api/cache/accessbox.go
vendored
|
@ -5,7 +5,7 @@ import (
|
||||||
|
|
||||||
"github.com/bluele/gcache"
|
"github.com/bluele/gcache"
|
||||||
"github.com/nspcc-dev/neofs-s3-gw/creds/accessbox"
|
"github.com/nspcc-dev/neofs-s3-gw/creds/accessbox"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/object"
|
"github.com/nspcc-dev/neofs-sdk-go/object/address"
|
||||||
)
|
)
|
||||||
|
|
||||||
type (
|
type (
|
||||||
|
@ -41,7 +41,7 @@ func NewAccessBoxCache(config *Config) *AccessBoxCache {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get returns cached object.
|
// Get returns cached object.
|
||||||
func (o *AccessBoxCache) Get(address *object.Address) *accessbox.Box {
|
func (o *AccessBoxCache) Get(address *address.Address) *accessbox.Box {
|
||||||
entry, err := o.cache.Get(address.String())
|
entry, err := o.cache.Get(address.String())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil
|
return nil
|
||||||
|
@ -56,6 +56,6 @@ func (o *AccessBoxCache) Get(address *object.Address) *accessbox.Box {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Put stores an object to cache.
|
// Put stores an object to cache.
|
||||||
func (o *AccessBoxCache) Put(address *object.Address, box *accessbox.Box) error {
|
func (o *AccessBoxCache) Put(address *address.Address, box *accessbox.Box) error {
|
||||||
return o.cache.Set(address.String(), box)
|
return o.cache.Set(address.String(), box)
|
||||||
}
|
}
|
||||||
|
|
8
api/cache/names.go
vendored
8
api/cache/names.go
vendored
|
@ -4,7 +4,7 @@ import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/bluele/gcache"
|
"github.com/bluele/gcache"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/object"
|
"github.com/nspcc-dev/neofs-sdk-go/object/address"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ObjectsNameCache provides for lru cache for objects.
|
// ObjectsNameCache provides for lru cache for objects.
|
||||||
|
@ -33,13 +33,13 @@ func NewObjectsNameCache(config *Config) *ObjectsNameCache {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get returns cached object.
|
// Get returns cached object.
|
||||||
func (o *ObjectsNameCache) Get(key string) *object.Address {
|
func (o *ObjectsNameCache) Get(key string) *address.Address {
|
||||||
entry, err := o.cache.Get(key)
|
entry, err := o.cache.Get(key)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
result, ok := entry.(*object.Address)
|
result, ok := entry.(*address.Address)
|
||||||
if !ok {
|
if !ok {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
@ -48,7 +48,7 @@ func (o *ObjectsNameCache) Get(key string) *object.Address {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Put puts an object to cache.
|
// Put puts an object to cache.
|
||||||
func (o *ObjectsNameCache) Put(key string, address *object.Address) error {
|
func (o *ObjectsNameCache) Put(key string, address *address.Address) error {
|
||||||
return o.cache.Set(key, address)
|
return o.cache.Set(key, address)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
5
api/cache/objects.go
vendored
5
api/cache/objects.go
vendored
|
@ -5,6 +5,7 @@ import (
|
||||||
|
|
||||||
"github.com/bluele/gcache"
|
"github.com/bluele/gcache"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/object"
|
"github.com/nspcc-dev/neofs-sdk-go/object"
|
||||||
|
"github.com/nspcc-dev/neofs-sdk-go/object/address"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ObjectsCache provides lru cache for objects.
|
// ObjectsCache provides lru cache for objects.
|
||||||
|
@ -31,7 +32,7 @@ func New(config *Config) *ObjectsCache {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get returns cached object.
|
// Get returns cached object.
|
||||||
func (o *ObjectsCache) Get(address *object.Address) *object.Object {
|
func (o *ObjectsCache) Get(address *address.Address) *object.Object {
|
||||||
entry, err := o.cache.Get(address.String())
|
entry, err := o.cache.Get(address.String())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil
|
return nil
|
||||||
|
@ -51,6 +52,6 @@ func (o *ObjectsCache) Put(obj object.Object) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Delete deletes an object from cache.
|
// Delete deletes an object from cache.
|
||||||
func (o *ObjectsCache) Delete(address *object.Address) bool {
|
func (o *ObjectsCache) Delete(address *address.Address) bool {
|
||||||
return o.cache.Remove(address.String())
|
return o.cache.Remove(address.String())
|
||||||
}
|
}
|
||||||
|
|
14
api/cache/objects_test.go
vendored
14
api/cache/objects_test.go
vendored
|
@ -4,7 +4,7 @@ import (
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/object"
|
"github.com/nspcc-dev/neofs-sdk-go/object/address"
|
||||||
objecttest "github.com/nspcc-dev/neofs-sdk-go/object/test"
|
objecttest "github.com/nspcc-dev/neofs-sdk-go/object/test"
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
)
|
)
|
||||||
|
@ -18,16 +18,16 @@ func getTestConfig() *Config {
|
||||||
|
|
||||||
func TestCache(t *testing.T) {
|
func TestCache(t *testing.T) {
|
||||||
obj := objecttest.Object()
|
obj := objecttest.Object()
|
||||||
address := object.NewAddress()
|
addr := address.NewAddress()
|
||||||
address.SetContainerID(obj.ContainerID())
|
addr.SetContainerID(obj.ContainerID())
|
||||||
address.SetObjectID(obj.ID())
|
addr.SetObjectID(obj.ID())
|
||||||
|
|
||||||
t.Run("check get", func(t *testing.T) {
|
t.Run("check get", func(t *testing.T) {
|
||||||
cache := New(getTestConfig())
|
cache := New(getTestConfig())
|
||||||
err := cache.Put(*obj)
|
err := cache.Put(*obj)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
actual := cache.Get(address)
|
actual := cache.Get(addr)
|
||||||
require.Equal(t, obj, actual)
|
require.Equal(t, obj, actual)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -36,8 +36,8 @@ func TestCache(t *testing.T) {
|
||||||
err := cache.Put(*obj)
|
err := cache.Put(*obj)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
cache.Delete(address)
|
cache.Delete(addr)
|
||||||
actual := cache.Get(address)
|
actual := cache.Get(addr)
|
||||||
require.Nil(t, actual)
|
require.Nil(t, actual)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
8
api/cache/objectslist.go
vendored
8
api/cache/objectslist.go
vendored
|
@ -7,7 +7,7 @@ import (
|
||||||
|
|
||||||
"github.com/bluele/gcache"
|
"github.com/bluele/gcache"
|
||||||
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
|
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/object"
|
oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
|
||||||
)
|
)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -55,13 +55,13 @@ func NewObjectsListCache(config *Config) *ObjectsListCache {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get return list of ObjectInfo.
|
// Get return list of ObjectInfo.
|
||||||
func (l *ObjectsListCache) Get(key ObjectsListKey) []*object.ID {
|
func (l *ObjectsListCache) Get(key ObjectsListKey) []oid.ID {
|
||||||
entry, err := l.cache.Get(key)
|
entry, err := l.cache.Get(key)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
result, ok := entry.([]*object.ID)
|
result, ok := entry.([]oid.ID)
|
||||||
if !ok {
|
if !ok {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
@ -70,7 +70,7 @@ func (l *ObjectsListCache) Get(key ObjectsListKey) []*object.ID {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Put puts a list of objects to cache.
|
// Put puts a list of objects to cache.
|
||||||
func (l *ObjectsListCache) Put(key ObjectsListKey, oids []*object.ID) error {
|
func (l *ObjectsListCache) Put(key ObjectsListKey, oids []oid.ID) error {
|
||||||
if len(oids) == 0 {
|
if len(oids) == 0 {
|
||||||
return fmt.Errorf("list is empty, cid: %s, prefix: %s", key.cid, key.prefix)
|
return fmt.Errorf("list is empty, cid: %s, prefix: %s", key.cid, key.prefix)
|
||||||
}
|
}
|
||||||
|
|
23
api/cache/objectslist_test.go
vendored
23
api/cache/objectslist_test.go
vendored
|
@ -7,7 +7,7 @@ import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
|
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/object"
|
oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -21,8 +21,8 @@ func getTestObjectsListConfig() *Config {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func randID(t *testing.T) *object.ID {
|
func randID(t *testing.T) *oid.ID {
|
||||||
id := object.NewID()
|
id := oid.NewID()
|
||||||
id.SetSHA256(randSHA256Checksum(t))
|
id.SetSHA256(randSHA256Checksum(t))
|
||||||
|
|
||||||
return id
|
return id
|
||||||
|
@ -38,13 +38,12 @@ func randSHA256Checksum(t *testing.T) (cs [sha256.Size]byte) {
|
||||||
func TestObjectsListCache(t *testing.T) {
|
func TestObjectsListCache(t *testing.T) {
|
||||||
var (
|
var (
|
||||||
listSize = 10
|
listSize = 10
|
||||||
ids []*object.ID
|
ids []oid.ID
|
||||||
userKey = "key"
|
userKey = "key"
|
||||||
)
|
)
|
||||||
|
|
||||||
for i := 0; i < listSize; i++ {
|
for i := 0; i < listSize; i++ {
|
||||||
id := randID(t)
|
ids = append(ids, *randID(t))
|
||||||
ids = append(ids, id)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
t.Run("lifetime", func(t *testing.T) {
|
t.Run("lifetime", func(t *testing.T) {
|
||||||
|
@ -141,13 +140,13 @@ func TestObjectsListCache(t *testing.T) {
|
||||||
|
|
||||||
func TestCleanCacheEntriesChangedWithPutObject(t *testing.T) {
|
func TestCleanCacheEntriesChangedWithPutObject(t *testing.T) {
|
||||||
var (
|
var (
|
||||||
cid = cid.New()
|
id = cid.New()
|
||||||
oids = []*object.ID{randID(t)}
|
oids = []oid.ID{*randID(t)}
|
||||||
keys []ObjectsListKey
|
keys []ObjectsListKey
|
||||||
)
|
)
|
||||||
|
|
||||||
for _, p := range []string{"", "dir/", "dir/lol/"} {
|
for _, p := range []string{"", "dir/", "dir/lol/"} {
|
||||||
keys = append(keys, ObjectsListKey{cid: cid.String(), prefix: p})
|
keys = append(keys, ObjectsListKey{cid: id.String(), prefix: p})
|
||||||
}
|
}
|
||||||
|
|
||||||
t.Run("put object to the root of the bucket", func(t *testing.T) {
|
t.Run("put object to the root of the bucket", func(t *testing.T) {
|
||||||
|
@ -158,7 +157,7 @@ func TestCleanCacheEntriesChangedWithPutObject(t *testing.T) {
|
||||||
err := cache.Put(k, oids)
|
err := cache.Put(k, oids)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
}
|
}
|
||||||
cache.CleanCacheEntriesContainingObject("obj1", cid)
|
cache.CleanCacheEntriesContainingObject("obj1", id)
|
||||||
for _, k := range keys {
|
for _, k := range keys {
|
||||||
list := cache.Get(k)
|
list := cache.Get(k)
|
||||||
if k.prefix == "" {
|
if k.prefix == "" {
|
||||||
|
@ -177,7 +176,7 @@ func TestCleanCacheEntriesChangedWithPutObject(t *testing.T) {
|
||||||
err := cache.Put(k, oids)
|
err := cache.Put(k, oids)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
}
|
}
|
||||||
cache.CleanCacheEntriesContainingObject("dir/obj", cid)
|
cache.CleanCacheEntriesContainingObject("dir/obj", id)
|
||||||
for _, k := range keys {
|
for _, k := range keys {
|
||||||
list := cache.Get(k)
|
list := cache.Get(k)
|
||||||
if k.prefix == "" || k.prefix == "dir/" {
|
if k.prefix == "" || k.prefix == "dir/" {
|
||||||
|
@ -196,7 +195,7 @@ func TestCleanCacheEntriesChangedWithPutObject(t *testing.T) {
|
||||||
err := cache.Put(k, oids)
|
err := cache.Put(k, oids)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
}
|
}
|
||||||
cache.CleanCacheEntriesContainingObject("dir/lol/obj", cid)
|
cache.CleanCacheEntriesContainingObject("dir/lol/obj", id)
|
||||||
for _, k := range keys {
|
for _, k := range keys {
|
||||||
list := cache.Get(k)
|
list := cache.Get(k)
|
||||||
require.Nil(t, list)
|
require.Nil(t, list)
|
||||||
|
|
|
@ -5,7 +5,8 @@ import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
|
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/object"
|
"github.com/nspcc-dev/neofs-sdk-go/object/address"
|
||||||
|
oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/owner"
|
"github.com/nspcc-dev/neofs-sdk-go/owner"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -28,7 +29,7 @@ type (
|
||||||
|
|
||||||
// ObjectInfo holds S3 object data.
|
// ObjectInfo holds S3 object data.
|
||||||
ObjectInfo struct {
|
ObjectInfo struct {
|
||||||
ID *object.ID
|
ID *oid.ID
|
||||||
CID *cid.ID
|
CID *cid.ID
|
||||||
IsDir bool
|
IsDir bool
|
||||||
|
|
||||||
|
@ -86,12 +87,12 @@ func (o *ObjectInfo) NullableVersion() string {
|
||||||
func (o *ObjectInfo) NiceName() string { return o.Bucket + "/" + o.Name }
|
func (o *ObjectInfo) NiceName() string { return o.Bucket + "/" + o.Name }
|
||||||
|
|
||||||
// Address returns object address.
|
// Address returns object address.
|
||||||
func (o *ObjectInfo) Address() *object.Address {
|
func (o *ObjectInfo) Address() *address.Address {
|
||||||
address := object.NewAddress()
|
addr := address.NewAddress()
|
||||||
address.SetContainerID(o.CID)
|
addr.SetContainerID(o.CID)
|
||||||
address.SetObjectID(o.ID)
|
addr.SetObjectID(o.ID)
|
||||||
|
|
||||||
return address
|
return addr
|
||||||
}
|
}
|
||||||
|
|
||||||
// TagsObject returns name of system object for tags.
|
// TagsObject returns name of system object for tags.
|
||||||
|
|
|
@ -18,6 +18,7 @@ import (
|
||||||
"github.com/nspcc-dev/neofs-s3-gw/api/layer"
|
"github.com/nspcc-dev/neofs-s3-gw/api/layer"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/eacl"
|
"github.com/nspcc-dev/neofs-sdk-go/eacl"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/object"
|
"github.com/nspcc-dev/neofs-sdk-go/object"
|
||||||
|
oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
@ -747,11 +748,11 @@ func formRecords(operations []*astOperation, resource *astResource) ([]*eacl.Rec
|
||||||
}
|
}
|
||||||
if len(resource.Object) != 0 {
|
if len(resource.Object) != 0 {
|
||||||
if len(resource.Version) != 0 {
|
if len(resource.Version) != 0 {
|
||||||
oid := object.NewID()
|
id := oid.NewID()
|
||||||
if err := oid.Parse(resource.Version); err != nil {
|
if err := id.Parse(resource.Version); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
record.AddObjectIDFilter(eacl.MatchStringEqual, oid)
|
record.AddObjectIDFilter(eacl.MatchStringEqual, id)
|
||||||
}
|
}
|
||||||
record.AddObjectAttributeFilter(eacl.MatchStringEqual, object.AttributeFileName, resource.Object)
|
record.AddObjectAttributeFilter(eacl.MatchStringEqual, object.AttributeFileName, resource.Object)
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,6 +13,7 @@ import (
|
||||||
"github.com/nspcc-dev/neofs-s3-gw/api"
|
"github.com/nspcc-dev/neofs-s3-gw/api"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/eacl"
|
"github.com/nspcc-dev/neofs-sdk-go/eacl"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/object"
|
"github.com/nspcc-dev/neofs-sdk-go/object"
|
||||||
|
oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -20,8 +21,8 @@ func TestTableToAst(t *testing.T) {
|
||||||
b := make([]byte, 32)
|
b := make([]byte, 32)
|
||||||
_, err := io.ReadFull(rand.Reader, b)
|
_, err := io.ReadFull(rand.Reader, b)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
oid := object.NewID()
|
id := oid.NewID()
|
||||||
oid.SetSHA256(sha256.Sum256(b))
|
id.SetSHA256(sha256.Sum256(b))
|
||||||
|
|
||||||
key, err := keys.NewPrivateKey()
|
key, err := keys.NewPrivateKey()
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
@ -40,7 +41,7 @@ func TestTableToAst(t *testing.T) {
|
||||||
eacl.AddFormedTarget(record2, eacl.RoleUser, *(*ecdsa.PublicKey)(key.PublicKey()))
|
eacl.AddFormedTarget(record2, eacl.RoleUser, *(*ecdsa.PublicKey)(key.PublicKey()))
|
||||||
eacl.AddFormedTarget(record2, eacl.RoleUser, *(*ecdsa.PublicKey)(key2.PublicKey()))
|
eacl.AddFormedTarget(record2, eacl.RoleUser, *(*ecdsa.PublicKey)(key2.PublicKey()))
|
||||||
record2.AddObjectAttributeFilter(eacl.MatchStringEqual, object.AttributeFileName, "objectName")
|
record2.AddObjectAttributeFilter(eacl.MatchStringEqual, object.AttributeFileName, "objectName")
|
||||||
record2.AddObjectIDFilter(eacl.MatchStringEqual, oid)
|
record2.AddObjectIDFilter(eacl.MatchStringEqual, id)
|
||||||
table.AddRecord(record2)
|
table.AddRecord(record2)
|
||||||
|
|
||||||
expectedAst := &ast{
|
expectedAst := &ast{
|
||||||
|
@ -56,7 +57,7 @@ func TestTableToAst(t *testing.T) {
|
||||||
resourceInfo: resourceInfo{
|
resourceInfo: resourceInfo{
|
||||||
Bucket: "bucketName",
|
Bucket: "bucketName",
|
||||||
Object: "objectName",
|
Object: "objectName",
|
||||||
Version: oid.String(),
|
Version: id.String(),
|
||||||
},
|
},
|
||||||
Operations: []*astOperation{{
|
Operations: []*astOperation{{
|
||||||
Users: []string{
|
Users: []string{
|
||||||
|
@ -739,8 +740,8 @@ func TestObjectAclToAst(t *testing.T) {
|
||||||
b := make([]byte, 32)
|
b := make([]byte, 32)
|
||||||
_, err := io.ReadFull(rand.Reader, b)
|
_, err := io.ReadFull(rand.Reader, b)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
oid := object.NewID()
|
objID := oid.NewID()
|
||||||
oid.SetSHA256(sha256.Sum256(b))
|
objID.SetSHA256(sha256.Sum256(b))
|
||||||
|
|
||||||
key, err := keys.NewPrivateKey()
|
key, err := keys.NewPrivateKey()
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
@ -774,7 +775,7 @@ func TestObjectAclToAst(t *testing.T) {
|
||||||
resInfo := &resourceInfo{
|
resInfo := &resourceInfo{
|
||||||
Bucket: "bucketName",
|
Bucket: "bucketName",
|
||||||
Object: "object",
|
Object: "object",
|
||||||
Version: oid.String(),
|
Version: objID.String(),
|
||||||
}
|
}
|
||||||
|
|
||||||
var operations []*astOperation
|
var operations []*astOperation
|
||||||
|
@ -808,8 +809,8 @@ func TestBucketAclToAst(t *testing.T) {
|
||||||
b := make([]byte, 32)
|
b := make([]byte, 32)
|
||||||
_, err := io.ReadFull(rand.Reader, b)
|
_, err := io.ReadFull(rand.Reader, b)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
oid := object.NewID()
|
objID := oid.NewID()
|
||||||
oid.SetSHA256(sha256.Sum256(b))
|
objID.SetSHA256(sha256.Sum256(b))
|
||||||
|
|
||||||
key, err := keys.NewPrivateKey()
|
key, err := keys.NewPrivateKey()
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
|
@ -10,7 +10,7 @@ import (
|
||||||
"github.com/nspcc-dev/neofs-s3-gw/api/data"
|
"github.com/nspcc-dev/neofs-s3-gw/api/data"
|
||||||
"github.com/nspcc-dev/neofs-s3-gw/api/errors"
|
"github.com/nspcc-dev/neofs-s3-gw/api/errors"
|
||||||
"github.com/nspcc-dev/neofs-s3-gw/api/layer"
|
"github.com/nspcc-dev/neofs-s3-gw/api/layer"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/object"
|
oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ListObjectsV1Handler handles objects listing requests for API version 1.
|
// ListObjectsV1Handler handles objects listing requests for API version 1.
|
||||||
|
@ -166,7 +166,7 @@ func parseListObjectArgs(reqInfo *api.ReqInfo) (*layer.ListObjectsParamsCommon,
|
||||||
|
|
||||||
func parseContinuationToken(queryValues url.Values) (string, error) {
|
func parseContinuationToken(queryValues url.Values) (string, error) {
|
||||||
if val, ok := queryValues["continuation-token"]; ok {
|
if val, ok := queryValues["continuation-token"]; ok {
|
||||||
if err := object.NewID().Parse(val[0]); err != nil {
|
if err := oid.NewID().Parse(val[0]); err != nil {
|
||||||
return "", errors.GetAPIError(errors.ErrIncorrectContinuationToken)
|
return "", errors.GetAPIError(errors.ErrIncorrectContinuationToken)
|
||||||
}
|
}
|
||||||
return val[0], nil
|
return val[0], nil
|
||||||
|
|
|
@ -18,11 +18,12 @@ import (
|
||||||
"github.com/nspcc-dev/neofs-s3-gw/api/notifications"
|
"github.com/nspcc-dev/neofs-s3-gw/api/notifications"
|
||||||
"github.com/nspcc-dev/neofs-s3-gw/api/resolver"
|
"github.com/nspcc-dev/neofs-s3-gw/api/resolver"
|
||||||
"github.com/nspcc-dev/neofs-s3-gw/creds/accessbox"
|
"github.com/nspcc-dev/neofs-s3-gw/creds/accessbox"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/client"
|
|
||||||
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
|
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/eacl"
|
"github.com/nspcc-dev/neofs-sdk-go/eacl"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/netmap"
|
"github.com/nspcc-dev/neofs-sdk-go/netmap"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/object"
|
"github.com/nspcc-dev/neofs-sdk-go/object"
|
||||||
|
"github.com/nspcc-dev/neofs-sdk-go/object/address"
|
||||||
|
oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/owner"
|
"github.com/nspcc-dev/neofs-sdk-go/owner"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/pool"
|
"github.com/nspcc-dev/neofs-sdk-go/pool"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/session"
|
"github.com/nspcc-dev/neofs-sdk-go/session"
|
||||||
|
@ -77,8 +78,6 @@ type (
|
||||||
GetObjectParams struct {
|
GetObjectParams struct {
|
||||||
Range *RangeParams
|
Range *RangeParams
|
||||||
ObjectInfo *data.ObjectInfo
|
ObjectInfo *data.ObjectInfo
|
||||||
Offset int64
|
|
||||||
Length int64
|
|
||||||
Writer io.Writer
|
Writer io.Writer
|
||||||
VersionID string
|
VersionID string
|
||||||
}
|
}
|
||||||
|
@ -186,7 +185,7 @@ type (
|
||||||
|
|
||||||
// NeoFS provides basic NeoFS interface.
|
// NeoFS provides basic NeoFS interface.
|
||||||
NeoFS interface {
|
NeoFS interface {
|
||||||
Get(ctx context.Context, address *object.Address) (*object.Object, error)
|
Get(ctx context.Context, address *address.Address) (*object.Object, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Client provides S3 API client interface.
|
// Client provides S3 API client interface.
|
||||||
|
@ -310,11 +309,9 @@ func (n *layer) CallOptions(ctx context.Context) []pool.CallOption {
|
||||||
return []pool.CallOption{pool.WithKey(&n.anonKey.Key.PrivateKey)}
|
return []pool.CallOption{pool.WithKey(&n.anonKey.Key.PrivateKey)}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get NeoFS Object by refs.Address (should be used by auth.Center).
|
// Get NeoFS Object by address (should be used by auth.Center).
|
||||||
func (n *layer) Get(ctx context.Context, address *object.Address) (*object.Object, error) {
|
func (n *layer) Get(ctx context.Context, addr *address.Address) (*object.Object, error) {
|
||||||
ops := new(client.GetObjectParams).WithAddress(address)
|
return n.objectGet(ctx, addr)
|
||||||
obj, err := n.pool.GetObject(ctx, ops, n.CallOptions(ctx)...)
|
|
||||||
return obj, n.transformNeofsError(ctx, err)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetBucketInfo returns bucket info by name.
|
// GetBucketInfo returns bucket info by name.
|
||||||
|
@ -373,27 +370,22 @@ func (n *layer) ListBuckets(ctx context.Context) ([]*data.BucketInfo, error) {
|
||||||
|
|
||||||
// GetObject from storage.
|
// GetObject from storage.
|
||||||
func (n *layer) GetObject(ctx context.Context, p *GetObjectParams) error {
|
func (n *layer) GetObject(ctx context.Context, p *GetObjectParams) error {
|
||||||
var err error
|
var params getParams
|
||||||
|
|
||||||
params := &getParams{
|
params.w = p.Writer
|
||||||
Writer: p.Writer,
|
params.oid = p.ObjectInfo.ID
|
||||||
cid: p.ObjectInfo.CID,
|
params.cid = p.ObjectInfo.CID
|
||||||
oid: p.ObjectInfo.ID,
|
|
||||||
offset: p.Offset,
|
|
||||||
length: p.Length,
|
|
||||||
}
|
|
||||||
|
|
||||||
if p.Range != nil {
|
if p.Range != nil {
|
||||||
objRange := object.NewRange()
|
if p.Range.Start > p.Range.End {
|
||||||
objRange.SetOffset(p.Range.Start)
|
panic("invalid range")
|
||||||
// Range header is inclusive
|
}
|
||||||
objRange.SetLength(p.Range.End - p.Range.Start + 1)
|
|
||||||
params.Range = objRange
|
params.off = p.Range.Start
|
||||||
_, err = n.objectRange(ctx, params)
|
params.ln = p.Range.End - p.Range.Start + 1
|
||||||
} else {
|
|
||||||
_, err = n.objectGetWithPayloadWriter(ctx, params)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
err := n.objectWritePayload(ctx, params)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
n.objCache.Delete(p.ObjectInfo.Address())
|
n.objCache.Delete(p.ObjectInfo.Address())
|
||||||
return fmt.Errorf("couldn't get object, cid: %s : %w", p.ObjectInfo.CID, err)
|
return fmt.Errorf("couldn't get object, cid: %s : %w", p.ObjectInfo.CID, err)
|
||||||
|
@ -567,7 +559,7 @@ func (n *layer) CopyObject(ctx context.Context, p *CopyObjectParams) (*data.Obje
|
||||||
func (n *layer) deleteObject(ctx context.Context, bkt *data.BucketInfo, obj *VersionedObject) *VersionedObject {
|
func (n *layer) deleteObject(ctx context.Context, bkt *data.BucketInfo, obj *VersionedObject) *VersionedObject {
|
||||||
var (
|
var (
|
||||||
err error
|
err error
|
||||||
ids []*object.ID
|
ids []*oid.ID
|
||||||
)
|
)
|
||||||
|
|
||||||
p := &PutObjectParams{
|
p := &PutObjectParams{
|
||||||
|
@ -604,7 +596,7 @@ func (n *layer) deleteObject(ctx context.Context, bkt *data.BucketInfo, obj *Ver
|
||||||
obj.Error = err
|
obj.Error = err
|
||||||
return obj
|
return obj
|
||||||
}
|
}
|
||||||
ids = []*object.ID{version.ID}
|
ids = []*oid.ID{version.ID}
|
||||||
if version.Headers[VersionsDeleteMarkAttr] == DelMarkFullObject {
|
if version.Headers[VersionsDeleteMarkAttr] == DelMarkFullObject {
|
||||||
obj.DeleteMarkVersion = version.Version()
|
obj.DeleteMarkVersion = version.Version()
|
||||||
}
|
}
|
||||||
|
|
|
@ -260,12 +260,15 @@ func (n *layer) CompleteMultipartUpload(ctx context.Context, p *CompleteMultipar
|
||||||
uploadCompleted = true
|
uploadCompleted = true
|
||||||
done <- true
|
done <- true
|
||||||
}(done)
|
}(done)
|
||||||
|
|
||||||
|
var prmGet getParams
|
||||||
|
prmGet.w = pw
|
||||||
|
prmGet.cid = p.Info.Bkt.CID
|
||||||
|
|
||||||
for _, part := range parts {
|
for _, part := range parts {
|
||||||
_, err := n.objectGetWithPayloadWriter(ctx, &getParams{
|
prmGet.oid = part.ID
|
||||||
Writer: pw,
|
|
||||||
cid: p.Info.Bkt.CID,
|
err = n.objectWritePayload(ctx, prmGet)
|
||||||
oid: part.ID,
|
|
||||||
})
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
_ = pw.Close()
|
_ = pw.Close()
|
||||||
n.log.Error("could not download a part of multipart upload",
|
n.log.Error("could not download a part of multipart upload",
|
||||||
|
@ -317,11 +320,11 @@ func (n *layer) ListMultipartUploads(ctx context.Context, p *ListMultipartUpload
|
||||||
uploads := make([]*UploadInfo, 0, len(ids))
|
uploads := make([]*UploadInfo, 0, len(ids))
|
||||||
uniqDirs := make(map[string]struct{})
|
uniqDirs := make(map[string]struct{})
|
||||||
|
|
||||||
for _, id := range ids {
|
for i := range ids {
|
||||||
meta, err := n.objectHead(ctx, p.Bkt.CID, id)
|
meta, err := n.objectHead(ctx, p.Bkt.CID, &ids[i])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
n.log.Warn("couldn't head object",
|
n.log.Warn("couldn't head object",
|
||||||
zap.Stringer("object id", id),
|
zap.Stringer("object id", &ids[i]),
|
||||||
zap.Stringer("bucket id", p.Bkt.CID),
|
zap.Stringer("bucket id", p.Bkt.CID),
|
||||||
zap.Error(err))
|
zap.Error(err))
|
||||||
continue
|
continue
|
||||||
|
@ -446,7 +449,7 @@ func (n *layer) GetUploadInitInfo(ctx context.Context, p *UploadInfoParams) (*da
|
||||||
return nil, errors.GetAPIError(errors.ErrInternalError)
|
return nil, errors.GetAPIError(errors.ErrInternalError)
|
||||||
}
|
}
|
||||||
|
|
||||||
meta, err := n.objectHead(ctx, p.Bkt.CID, ids[0])
|
meta, err := n.objectHead(ctx, p.Bkt.CID, &ids[0])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -470,11 +473,11 @@ func (n *layer) getUploadParts(ctx context.Context, p *UploadInfoParams) (map[in
|
||||||
|
|
||||||
res := make(map[int]*data.ObjectInfo)
|
res := make(map[int]*data.ObjectInfo)
|
||||||
|
|
||||||
for _, id := range ids {
|
for i := range ids {
|
||||||
meta, err := n.objectHead(ctx, p.Bkt.CID, id)
|
meta, err := n.objectHead(ctx, p.Bkt.CID, &ids[i])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
n.log.Warn("couldn't head a part of upload",
|
n.log.Warn("couldn't head a part of upload",
|
||||||
zap.Stringer("object id", id),
|
zap.Stringer("object id", &ids[i]),
|
||||||
zap.Stringer("bucket id", p.Bkt.CID),
|
zap.Stringer("bucket id", p.Bkt.CID),
|
||||||
zap.Error(err))
|
zap.Error(err))
|
||||||
continue
|
continue
|
||||||
|
|
|
@ -2,6 +2,8 @@ package layer
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"sort"
|
"sort"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
@ -12,9 +14,10 @@ import (
|
||||||
"github.com/nspcc-dev/neofs-s3-gw/api/cache"
|
"github.com/nspcc-dev/neofs-s3-gw/api/cache"
|
||||||
"github.com/nspcc-dev/neofs-s3-gw/api/data"
|
"github.com/nspcc-dev/neofs-s3-gw/api/data"
|
||||||
apiErrors "github.com/nspcc-dev/neofs-s3-gw/api/errors"
|
apiErrors "github.com/nspcc-dev/neofs-s3-gw/api/errors"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/client"
|
|
||||||
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
|
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/object"
|
"github.com/nspcc-dev/neofs-sdk-go/object"
|
||||||
|
"github.com/nspcc-dev/neofs-sdk-go/object/address"
|
||||||
|
oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/owner"
|
"github.com/nspcc-dev/neofs-sdk-go/owner"
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
)
|
)
|
||||||
|
@ -32,13 +35,13 @@ type (
|
||||||
}
|
}
|
||||||
|
|
||||||
getParams struct {
|
getParams struct {
|
||||||
io.Writer
|
w io.Writer
|
||||||
*object.Range
|
|
||||||
|
|
||||||
offset int64
|
// payload range
|
||||||
length int64
|
off, ln uint64
|
||||||
cid *cid.ID
|
|
||||||
oid *object.ID
|
cid *cid.ID
|
||||||
|
oid *oid.ID
|
||||||
}
|
}
|
||||||
|
|
||||||
// ListObjectsParamsCommon contains common parameters for ListObjectsV1 and ListObjectsV2.
|
// ListObjectsParamsCommon contains common parameters for ListObjectsV1 and ListObjectsV2.
|
||||||
|
@ -71,7 +74,7 @@ type (
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
func (n *layer) objectSearchByName(ctx context.Context, cid *cid.ID, filename string) ([]*object.ID, error) {
|
func (n *layer) objectSearchByName(ctx context.Context, cid *cid.ID, filename string) ([]oid.ID, error) {
|
||||||
f := &findParams{
|
f := &findParams{
|
||||||
filters: []filter{{attr: object.AttributeFileName, val: filename}},
|
filters: []filter{{attr: object.AttributeFileName, val: filename}},
|
||||||
cid: cid,
|
cid: cid,
|
||||||
|
@ -81,60 +84,134 @@ func (n *layer) objectSearchByName(ctx context.Context, cid *cid.ID, filename st
|
||||||
}
|
}
|
||||||
|
|
||||||
// objectSearch returns all available objects by search params.
|
// objectSearch returns all available objects by search params.
|
||||||
func (n *layer) objectSearch(ctx context.Context, p *findParams) ([]*object.ID, error) {
|
func (n *layer) objectSearch(ctx context.Context, p *findParams) ([]oid.ID, error) {
|
||||||
var opts object.SearchFilters
|
var filters object.SearchFilters
|
||||||
|
filters.AddRootFilter()
|
||||||
opts.AddRootFilter()
|
|
||||||
|
|
||||||
for _, filter := range p.filters {
|
for _, filter := range p.filters {
|
||||||
opts.AddFilter(filter.attr, filter.val, object.MatchStringEqual)
|
filters.AddFilter(filter.attr, filter.val, object.MatchStringEqual)
|
||||||
}
|
}
|
||||||
|
|
||||||
if p.prefix != "" {
|
if p.prefix != "" {
|
||||||
opts.AddFilter(object.AttributeFileName, p.prefix, object.MatchCommonPrefix)
|
filters.AddFilter(object.AttributeFileName, p.prefix, object.MatchCommonPrefix)
|
||||||
}
|
}
|
||||||
searchParams := new(client.SearchObjectParams).WithContainerID(p.cid).WithSearchFilters(opts)
|
|
||||||
|
|
||||||
ids, err := n.pool.SearchObject(ctx, searchParams, n.CallOptions(ctx)...)
|
res, err := n.pool.SearchObjects(ctx, *p.cid, filters, n.CallOptions(ctx)...)
|
||||||
return ids, n.transformNeofsError(ctx, err)
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("init searching using client: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
defer res.Close()
|
||||||
|
|
||||||
|
var num, read int
|
||||||
|
buf := make([]oid.ID, 10)
|
||||||
|
|
||||||
|
for {
|
||||||
|
num, err = res.Read(buf[read:])
|
||||||
|
if num > 0 {
|
||||||
|
read += num
|
||||||
|
buf = append(buf, oid.ID{})
|
||||||
|
buf = buf[:cap(buf)]
|
||||||
|
}
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
if errors.Is(err, io.EOF) {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil, n.transformNeofsError(ctx, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return buf[:read], nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func newAddress(cid *cid.ID, oid *object.ID) *object.Address {
|
func newAddress(cid *cid.ID, oid *oid.ID) *address.Address {
|
||||||
address := object.NewAddress()
|
addr := address.NewAddress()
|
||||||
address.SetContainerID(cid)
|
addr.SetContainerID(cid)
|
||||||
address.SetObjectID(oid)
|
addr.SetObjectID(oid)
|
||||||
return address
|
return addr
|
||||||
}
|
}
|
||||||
|
|
||||||
// objectHead returns all object's headers.
|
// objectHead returns all object's headers.
|
||||||
func (n *layer) objectHead(ctx context.Context, cid *cid.ID, oid *object.ID) (*object.Object, error) {
|
func (n *layer) objectHead(ctx context.Context, idCnr *cid.ID, idObj *oid.ID) (*object.Object, error) {
|
||||||
ops := new(client.ObjectHeaderParams).WithAddress(newAddress(cid, oid)).WithAllFields()
|
var addr address.Address
|
||||||
obj, err := n.pool.GetObjectHeader(ctx, ops, n.CallOptions(ctx)...)
|
|
||||||
|
addr.SetContainerID(idCnr)
|
||||||
|
addr.SetObjectID(idObj)
|
||||||
|
|
||||||
|
obj, err := n.pool.HeadObject(ctx, addr, n.CallOptions(ctx)...)
|
||||||
return obj, n.transformNeofsError(ctx, err)
|
return obj, n.transformNeofsError(ctx, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// objectGetWithPayloadWriter and write it into provided io.Reader.
|
// writes payload part of the NeoFS object to the provided io.Writer.
|
||||||
func (n *layer) objectGetWithPayloadWriter(ctx context.Context, p *getParams) (*object.Object, error) {
|
// Zero range corresponds to full payload (panics if only offset is set).
|
||||||
// prepare length/offset writer
|
func (n *layer) objectWritePayload(ctx context.Context, p getParams) error {
|
||||||
w := newWriter(p.Writer, p.offset, p.length)
|
// form object address
|
||||||
ops := new(client.GetObjectParams).WithAddress(newAddress(p.cid, p.oid)).WithPayloadWriter(w)
|
var a address.Address
|
||||||
obj, err := n.pool.GetObject(ctx, ops, n.CallOptions(ctx)...)
|
|
||||||
return obj, n.transformNeofsError(ctx, err)
|
a.SetContainerID(p.cid)
|
||||||
|
a.SetObjectID(p.oid)
|
||||||
|
|
||||||
|
fmt.Println("objectWritePayload", p.cid, p.oid)
|
||||||
|
|
||||||
|
// init payload reader
|
||||||
|
var r io.ReadCloser
|
||||||
|
|
||||||
|
if p.ln+p.off == 0 {
|
||||||
|
res, err := n.pool.GetObject(ctx, a, n.CallOptions(ctx)...)
|
||||||
|
if err != nil {
|
||||||
|
return n.transformNeofsError(ctx, fmt.Errorf("get object using client: %w", err))
|
||||||
|
}
|
||||||
|
|
||||||
|
p.ln = res.Header.PayloadSize()
|
||||||
|
r = res.Payload
|
||||||
|
} else {
|
||||||
|
res, err := n.pool.ObjectRange(ctx, a, p.off, p.ln, n.CallOptions(ctx)...)
|
||||||
|
if err != nil {
|
||||||
|
return n.transformNeofsError(ctx, fmt.Errorf("range object payload using client: %w", err))
|
||||||
|
}
|
||||||
|
|
||||||
|
r = res
|
||||||
|
}
|
||||||
|
|
||||||
|
defer r.Close()
|
||||||
|
|
||||||
|
if p.ln > 0 {
|
||||||
|
if p.ln > 4096 { // configure?
|
||||||
|
p.ln = 4096
|
||||||
|
}
|
||||||
|
|
||||||
|
// alloc buffer for copying
|
||||||
|
buf := make([]byte, p.ln) // sync-pool it?
|
||||||
|
|
||||||
|
// copy full payload
|
||||||
|
_, err := io.CopyBuffer(p.w, r, buf)
|
||||||
|
if err != nil {
|
||||||
|
return n.transformNeofsError(ctx, fmt.Errorf("copy payload range: %w", err))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// objectGet returns an object with payload in the object.
|
// objectGet returns an object with payload in the object.
|
||||||
func (n *layer) objectGet(ctx context.Context, cid *cid.ID, oid *object.ID) (*object.Object, error) {
|
func (n *layer) objectGet(ctx context.Context, addr *address.Address) (*object.Object, error) {
|
||||||
ops := new(client.GetObjectParams).WithAddress(newAddress(cid, oid))
|
res, err := n.pool.GetObject(ctx, *addr, n.CallOptions(ctx)...)
|
||||||
obj, err := n.pool.GetObject(ctx, ops, n.CallOptions(ctx)...)
|
if err != nil {
|
||||||
return obj, n.transformNeofsError(ctx, err)
|
return nil, n.transformNeofsError(ctx, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// objectRange gets object range and writes it into provided io.Writer.
|
defer res.Payload.Close()
|
||||||
func (n *layer) objectRange(ctx context.Context, p *getParams) ([]byte, error) {
|
|
||||||
w := newWriter(p.Writer, p.offset, p.length)
|
payload, err := io.ReadAll(res.Payload)
|
||||||
ops := new(client.RangeDataParams).WithAddress(newAddress(p.cid, p.oid)).WithDataWriter(w).WithRange(p.Range)
|
if err != nil {
|
||||||
payload, err := n.pool.ObjectPayloadRangeData(ctx, ops, n.CallOptions(ctx)...)
|
return nil, fmt.Errorf("read payload: %w", err)
|
||||||
return payload, n.transformNeofsError(ctx, err)
|
}
|
||||||
|
|
||||||
|
object.NewRawFrom(&res.Header).SetPayload(payload)
|
||||||
|
|
||||||
|
return &res.Header, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// objectPut into NeoFS, took payload from io.Reader.
|
// objectPut into NeoFS, took payload from io.Reader.
|
||||||
|
@ -160,8 +237,7 @@ func (n *layer) objectPut(ctx context.Context, bkt *data.BucketInfo, p *PutObjec
|
||||||
}
|
}
|
||||||
rawObject := formRawObject(p, bkt.CID, own, p.Object)
|
rawObject := formRawObject(p, bkt.CID, own, p.Object)
|
||||||
|
|
||||||
ops := new(client.PutObjectParams).WithObject(rawObject.Object()).WithPayloadReader(r)
|
id, err := n.pool.PutObject(ctx, *rawObject.Object(), r, n.CallOptions(ctx)...)
|
||||||
oid, err := n.pool.PutObject(ctx, ops, n.CallOptions(ctx)...)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, n.transformNeofsError(ctx, err)
|
return nil, n.transformNeofsError(ctx, err)
|
||||||
}
|
}
|
||||||
|
@ -172,7 +248,7 @@ func (n *layer) objectPut(ctx context.Context, bkt *data.BucketInfo, p *PutObjec
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
meta, err := n.objectHead(ctx, bkt.CID, oid)
|
meta, err := n.objectHead(ctx, bkt.CID, id)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -201,7 +277,7 @@ func (n *layer) objectPut(ctx context.Context, bkt *data.BucketInfo, p *PutObjec
|
||||||
}
|
}
|
||||||
|
|
||||||
return &data.ObjectInfo{
|
return &data.ObjectInfo{
|
||||||
ID: oid,
|
ID: id,
|
||||||
CID: bkt.CID,
|
CID: bkt.CID,
|
||||||
|
|
||||||
Owner: own,
|
Owner: own,
|
||||||
|
@ -240,16 +316,17 @@ func formRawObject(p *PutObjectParams, bktID *cid.ID, own *owner.ID, obj string)
|
||||||
raw.SetOwnerID(own)
|
raw.SetOwnerID(own)
|
||||||
raw.SetContainerID(bktID)
|
raw.SetContainerID(bktID)
|
||||||
raw.SetAttributes(attributes...)
|
raw.SetAttributes(attributes...)
|
||||||
|
raw.SetPayloadSize(uint64(p.Size))
|
||||||
|
|
||||||
return raw
|
return raw
|
||||||
}
|
}
|
||||||
|
|
||||||
func updateCRDT2PSetHeaders(header map[string]string, versions *objectVersions, versioningEnabled bool) []*object.ID {
|
func updateCRDT2PSetHeaders(header map[string]string, versions *objectVersions, versioningEnabled bool) []*oid.ID {
|
||||||
if !versioningEnabled {
|
if !versioningEnabled {
|
||||||
header[versionsUnversionedAttr] = "true"
|
header[versionsUnversionedAttr] = "true"
|
||||||
}
|
}
|
||||||
|
|
||||||
var idsToDeleteArr []*object.ID
|
var idsToDeleteArr []*oid.ID
|
||||||
if versions.isEmpty() {
|
if versions.isEmpty() {
|
||||||
return idsToDeleteArr
|
return idsToDeleteArr
|
||||||
}
|
}
|
||||||
|
@ -298,8 +375,8 @@ func updateCRDT2PSetHeaders(header map[string]string, versions *objectVersions,
|
||||||
}
|
}
|
||||||
|
|
||||||
func (n *layer) headLastVersionIfNotDeleted(ctx context.Context, bkt *data.BucketInfo, objectName string) (*data.ObjectInfo, error) {
|
func (n *layer) headLastVersionIfNotDeleted(ctx context.Context, bkt *data.BucketInfo, objectName string) (*data.ObjectInfo, error) {
|
||||||
if address := n.namesCache.Get(bkt.Name + "/" + objectName); address != nil {
|
if addr := n.namesCache.Get(bkt.Name + "/" + objectName); addr != nil {
|
||||||
if headInfo := n.objCache.Get(address); headInfo != nil {
|
if headInfo := n.objCache.Get(addr); headInfo != nil {
|
||||||
return objInfoFromMeta(bkt, headInfo), nil
|
return objInfoFromMeta(bkt, headInfo), nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -334,18 +411,18 @@ func (n *layer) headVersions(ctx context.Context, bkt *data.BucketInfo, objectNa
|
||||||
return versions, apiErrors.GetAPIError(apiErrors.ErrNoSuchKey)
|
return versions, apiErrors.GetAPIError(apiErrors.ErrNoSuchKey)
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, id := range ids {
|
for i := range ids {
|
||||||
meta, err := n.objectHead(ctx, bkt.CID, id)
|
meta, err := n.objectHead(ctx, bkt.CID, &ids[i])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
n.log.Warn("couldn't head object",
|
n.log.Warn("couldn't head object",
|
||||||
zap.Stringer("object id", id),
|
zap.Stringer("object id", &ids[i]),
|
||||||
zap.Stringer("bucket id", bkt.CID),
|
zap.Stringer("bucket id", bkt.CID),
|
||||||
zap.Error(err))
|
zap.Error(err))
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if err = n.objCache.Put(*meta); err != nil {
|
if err = n.objCache.Put(*meta); err != nil {
|
||||||
n.log.Warn("couldn't put meta to objects cache",
|
n.log.Warn("couldn't put meta to objects cache",
|
||||||
zap.Stringer("object id", id),
|
zap.Stringer("object id", &ids[i]),
|
||||||
zap.Stringer("bucket id", bkt.CID),
|
zap.Stringer("bucket id", bkt.CID),
|
||||||
zap.Error(err))
|
zap.Error(err))
|
||||||
}
|
}
|
||||||
|
@ -375,16 +452,16 @@ func (n *layer) headVersion(ctx context.Context, bkt *data.BucketInfo, p *HeadOb
|
||||||
return objInfo, nil
|
return objInfo, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
oid := object.NewID()
|
id := oid.NewID()
|
||||||
if err := oid.Parse(p.VersionID); err != nil {
|
if err := id.Parse(p.VersionID); err != nil {
|
||||||
return nil, apiErrors.GetAPIError(apiErrors.ErrInvalidVersion)
|
return nil, apiErrors.GetAPIError(apiErrors.ErrInvalidVersion)
|
||||||
}
|
}
|
||||||
|
|
||||||
if headInfo := n.objCache.Get(newAddress(bkt.CID, oid)); headInfo != nil {
|
if headInfo := n.objCache.Get(newAddress(bkt.CID, id)); headInfo != nil {
|
||||||
return objInfoFromMeta(bkt, headInfo), nil
|
return objInfoFromMeta(bkt, headInfo), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
meta, err := n.objectHead(ctx, bkt.CID, oid)
|
meta, err := n.objectHead(ctx, bkt.CID, id)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if strings.Contains(err.Error(), "not found") {
|
if strings.Contains(err.Error(), "not found") {
|
||||||
return nil, apiErrors.GetAPIError(apiErrors.ErrNoSuchVersion)
|
return nil, apiErrors.GetAPIError(apiErrors.ErrNoSuchVersion)
|
||||||
|
@ -406,12 +483,10 @@ func (n *layer) headVersion(ctx context.Context, bkt *data.BucketInfo, p *HeadOb
|
||||||
}
|
}
|
||||||
|
|
||||||
// objectDelete puts tombstone object into neofs.
|
// objectDelete puts tombstone object into neofs.
|
||||||
func (n *layer) objectDelete(ctx context.Context, cid *cid.ID, oid *object.ID) error {
|
func (n *layer) objectDelete(ctx context.Context, cid *cid.ID, oid *oid.ID) error {
|
||||||
address := newAddress(cid, oid)
|
addr := newAddress(cid, oid)
|
||||||
dop := new(client.DeleteObjectParams)
|
n.objCache.Delete(addr)
|
||||||
dop.WithAddress(address)
|
err := n.pool.DeleteObject(ctx, *addr, n.CallOptions(ctx)...)
|
||||||
n.objCache.Delete(address)
|
|
||||||
err := n.pool.DeleteObject(ctx, dop, n.CallOptions(ctx)...)
|
|
||||||
return n.transformNeofsError(ctx, err)
|
return n.transformNeofsError(ctx, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -529,7 +604,7 @@ func (n *layer) getAllObjectsVersions(ctx context.Context, bkt *data.BucketInfo,
|
||||||
versions := make(map[string]*objectVersions, len(ids)/2)
|
versions := make(map[string]*objectVersions, len(ids)/2)
|
||||||
|
|
||||||
for i := 0; i < len(ids); i++ {
|
for i := 0; i < len(ids); i++ {
|
||||||
obj := n.objectFromObjectsCacheOrNeoFS(ctx, bkt.CID, ids[i])
|
obj := n.objectFromObjectsCacheOrNeoFS(ctx, bkt.CID, &ids[i])
|
||||||
if obj == nil {
|
if obj == nil {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
@ -638,7 +713,7 @@ func (n *layer) isVersioningEnabled(ctx context.Context, bktInfo *data.BucketInf
|
||||||
return settings.VersioningEnabled
|
return settings.VersioningEnabled
|
||||||
}
|
}
|
||||||
|
|
||||||
func (n *layer) objectFromObjectsCacheOrNeoFS(ctx context.Context, cid *cid.ID, oid *object.ID) *object.Object {
|
func (n *layer) objectFromObjectsCacheOrNeoFS(ctx context.Context, cid *cid.ID, oid *oid.ID) *object.Object {
|
||||||
var (
|
var (
|
||||||
err error
|
err error
|
||||||
meta = n.objCache.Get(newAddress(cid, oid))
|
meta = n.objCache.Get(newAddress(cid, oid))
|
||||||
|
|
|
@ -6,12 +6,12 @@ import (
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/nspcc-dev/neofs-s3-gw/api/data"
|
"github.com/nspcc-dev/neofs-s3-gw/api/data"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/object"
|
oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
)
|
)
|
||||||
|
|
||||||
func randID(t *testing.T) *object.ID {
|
func randID(t *testing.T) *oid.ID {
|
||||||
id := object.NewID()
|
id := oid.NewID()
|
||||||
id.SetSHA256(randSHA256Checksum(t))
|
id.SetSHA256(randSHA256Checksum(t))
|
||||||
|
|
||||||
return id
|
return id
|
||||||
|
@ -77,7 +77,7 @@ func TestTrimAfterObjectName(t *testing.T) {
|
||||||
func TestTrimAfterObjectID(t *testing.T) {
|
func TestTrimAfterObjectID(t *testing.T) {
|
||||||
var (
|
var (
|
||||||
objects []*data.ObjectInfo
|
objects []*data.ObjectInfo
|
||||||
ids []*object.ID
|
ids []*oid.ID
|
||||||
numberOfIDS = 3
|
numberOfIDS = 3
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -8,8 +8,8 @@ import (
|
||||||
|
|
||||||
"github.com/nspcc-dev/neofs-s3-gw/api/data"
|
"github.com/nspcc-dev/neofs-s3-gw/api/data"
|
||||||
"github.com/nspcc-dev/neofs-s3-gw/api/errors"
|
"github.com/nspcc-dev/neofs-s3-gw/api/errors"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/client"
|
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/object"
|
"github.com/nspcc-dev/neofs-sdk-go/object"
|
||||||
|
"github.com/nspcc-dev/neofs-sdk-go/object/address"
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -53,8 +53,8 @@ func (n *layer) deleteSystemObject(ctx context.Context, bktInfo *data.BucketInfo
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, id := range ids {
|
for i := range ids {
|
||||||
if err = n.objectDelete(ctx, bktInfo.CID, id); err != nil {
|
if err = n.objectDelete(ctx, bktInfo.CID, &ids[i]); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -104,8 +104,7 @@ func (n *layer) putSystemObjectIntoNeoFS(ctx context.Context, p *PutSystemObject
|
||||||
raw.SetContainerID(p.BktInfo.CID)
|
raw.SetContainerID(p.BktInfo.CID)
|
||||||
raw.SetAttributes(attributes...)
|
raw.SetAttributes(attributes...)
|
||||||
|
|
||||||
ops := new(client.PutObjectParams).WithObject(raw.Object()).WithPayloadReader(p.Reader)
|
oid, err := n.pool.PutObject(ctx, *raw.Object(), p.Reader, n.CallOptions(ctx)...)
|
||||||
oid, err := n.pool.PutObject(ctx, ops, n.CallOptions(ctx)...)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, n.transformNeofsError(ctx, err)
|
return nil, n.transformNeofsError(ctx, err)
|
||||||
}
|
}
|
||||||
|
@ -135,7 +134,12 @@ func (n *layer) getSystemObjectFromNeoFS(ctx context.Context, bkt *data.BucketIn
|
||||||
|
|
||||||
objInfo := versions.getLast()
|
objInfo := versions.getLast()
|
||||||
|
|
||||||
obj, err := n.objectGet(ctx, bkt.CID, objInfo.ID)
|
var addr address.Address
|
||||||
|
|
||||||
|
addr.SetContainerID(bkt.CID)
|
||||||
|
addr.SetObjectID(objInfo.ID)
|
||||||
|
|
||||||
|
obj, err := n.objectGet(ctx, &addr)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -183,11 +187,11 @@ func (n *layer) headSystemVersions(ctx context.Context, bkt *data.BucketInfo, sy
|
||||||
}
|
}
|
||||||
|
|
||||||
versions := newObjectVersions(sysName)
|
versions := newObjectVersions(sysName)
|
||||||
for _, id := range ids {
|
for i := range ids {
|
||||||
meta, err := n.objectHead(ctx, bkt.CID, id)
|
meta, err := n.objectHead(ctx, bkt.CID, &ids[i])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
n.log.Warn("couldn't head object",
|
n.log.Warn("couldn't head object",
|
||||||
zap.Stringer("object id", id),
|
zap.Stringer("object id", &ids[i]),
|
||||||
zap.Stringer("bucket id", bkt.CID),
|
zap.Stringer("bucket id", bkt.CID),
|
||||||
zap.Error(err))
|
zap.Error(err))
|
||||||
continue
|
continue
|
||||||
|
|
|
@ -9,6 +9,7 @@ import (
|
||||||
"github.com/nspcc-dev/neofs-s3-gw/api/data"
|
"github.com/nspcc-dev/neofs-s3-gw/api/data"
|
||||||
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
|
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/object"
|
"github.com/nspcc-dev/neofs-sdk-go/object"
|
||||||
|
oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/owner"
|
"github.com/nspcc-dev/neofs-sdk-go/owner"
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
)
|
)
|
||||||
|
@ -20,7 +21,7 @@ var (
|
||||||
defaultTestContentType = http.DetectContentType(defaultTestPayload)
|
defaultTestContentType = http.DetectContentType(defaultTestPayload)
|
||||||
)
|
)
|
||||||
|
|
||||||
func newTestObject(oid *object.ID, bkt *data.BucketInfo, name string) *object.Object {
|
func newTestObject(id *oid.ID, bkt *data.BucketInfo, name string) *object.Object {
|
||||||
filename := object.NewAttribute()
|
filename := object.NewAttribute()
|
||||||
filename.SetKey(object.AttributeFileName)
|
filename.SetKey(object.AttributeFileName)
|
||||||
filename.SetValue(name)
|
filename.SetValue(name)
|
||||||
|
@ -34,7 +35,7 @@ func newTestObject(oid *object.ID, bkt *data.BucketInfo, name string) *object.Ob
|
||||||
contentType.SetValue(defaultTestContentType)
|
contentType.SetValue(defaultTestContentType)
|
||||||
|
|
||||||
raw := object.NewRaw()
|
raw := object.NewRaw()
|
||||||
raw.SetID(oid)
|
raw.SetID(id)
|
||||||
raw.SetOwnerID(bkt.Owner)
|
raw.SetOwnerID(bkt.Owner)
|
||||||
raw.SetContainerID(bkt.CID)
|
raw.SetContainerID(bkt.CID)
|
||||||
raw.SetPayload(defaultTestPayload)
|
raw.SetPayload(defaultTestPayload)
|
||||||
|
@ -44,7 +45,7 @@ func newTestObject(oid *object.ID, bkt *data.BucketInfo, name string) *object.Ob
|
||||||
return raw.Object()
|
return raw.Object()
|
||||||
}
|
}
|
||||||
|
|
||||||
func newTestInfo(oid *object.ID, bkt *data.BucketInfo, name string, isDir bool) *data.ObjectInfo {
|
func newTestInfo(oid *oid.ID, bkt *data.BucketInfo, name string, isDir bool) *data.ObjectInfo {
|
||||||
info := &data.ObjectInfo{
|
info := &data.ObjectInfo{
|
||||||
ID: oid,
|
ID: oid,
|
||||||
Name: name,
|
Name: name,
|
||||||
|
@ -69,7 +70,7 @@ func newTestInfo(oid *object.ID, bkt *data.BucketInfo, name string, isDir bool)
|
||||||
|
|
||||||
func Test_objectInfoFromMeta(t *testing.T) {
|
func Test_objectInfoFromMeta(t *testing.T) {
|
||||||
uid := owner.NewID()
|
uid := owner.NewID()
|
||||||
oid := object.NewID()
|
id := oid.NewID()
|
||||||
containerID := cid.New()
|
containerID := cid.New()
|
||||||
|
|
||||||
bkt := &data.BucketInfo{
|
bkt := &data.BucketInfo{
|
||||||
|
@ -88,66 +89,66 @@ func Test_objectInfoFromMeta(t *testing.T) {
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
name: "small.jpg",
|
name: "small.jpg",
|
||||||
result: newTestInfo(oid, bkt, "small.jpg", false),
|
result: newTestInfo(id, bkt, "small.jpg", false),
|
||||||
object: newTestObject(oid, bkt, "small.jpg"),
|
object: newTestObject(id, bkt, "small.jpg"),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "small.jpg not matched prefix",
|
name: "small.jpg not matched prefix",
|
||||||
prefix: "big",
|
prefix: "big",
|
||||||
result: nil,
|
result: nil,
|
||||||
object: newTestObject(oid, bkt, "small.jpg"),
|
object: newTestObject(id, bkt, "small.jpg"),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "small.jpg delimiter",
|
name: "small.jpg delimiter",
|
||||||
delimiter: "/",
|
delimiter: "/",
|
||||||
result: newTestInfo(oid, bkt, "small.jpg", false),
|
result: newTestInfo(id, bkt, "small.jpg", false),
|
||||||
object: newTestObject(oid, bkt, "small.jpg"),
|
object: newTestObject(id, bkt, "small.jpg"),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "test/small.jpg",
|
name: "test/small.jpg",
|
||||||
result: newTestInfo(oid, bkt, "test/small.jpg", false),
|
result: newTestInfo(id, bkt, "test/small.jpg", false),
|
||||||
object: newTestObject(oid, bkt, "test/small.jpg"),
|
object: newTestObject(id, bkt, "test/small.jpg"),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "test/small.jpg with prefix and delimiter",
|
name: "test/small.jpg with prefix and delimiter",
|
||||||
prefix: "test/",
|
prefix: "test/",
|
||||||
delimiter: "/",
|
delimiter: "/",
|
||||||
result: newTestInfo(oid, bkt, "test/small.jpg", false),
|
result: newTestInfo(id, bkt, "test/small.jpg", false),
|
||||||
object: newTestObject(oid, bkt, "test/small.jpg"),
|
object: newTestObject(id, bkt, "test/small.jpg"),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "a/b/small.jpg",
|
name: "a/b/small.jpg",
|
||||||
prefix: "a",
|
prefix: "a",
|
||||||
result: newTestInfo(oid, bkt, "a/b/small.jpg", false),
|
result: newTestInfo(id, bkt, "a/b/small.jpg", false),
|
||||||
object: newTestObject(oid, bkt, "a/b/small.jpg"),
|
object: newTestObject(id, bkt, "a/b/small.jpg"),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "a/b/small.jpg",
|
name: "a/b/small.jpg",
|
||||||
prefix: "a/",
|
prefix: "a/",
|
||||||
delimiter: "/",
|
delimiter: "/",
|
||||||
result: newTestInfo(oid, bkt, "a/b/", true),
|
result: newTestInfo(id, bkt, "a/b/", true),
|
||||||
object: newTestObject(oid, bkt, "a/b/small.jpg"),
|
object: newTestObject(id, bkt, "a/b/small.jpg"),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "a/b/c/small.jpg",
|
name: "a/b/c/small.jpg",
|
||||||
prefix: "a/",
|
prefix: "a/",
|
||||||
delimiter: "/",
|
delimiter: "/",
|
||||||
result: newTestInfo(oid, bkt, "a/b/", true),
|
result: newTestInfo(id, bkt, "a/b/", true),
|
||||||
object: newTestObject(oid, bkt, "a/b/c/small.jpg"),
|
object: newTestObject(id, bkt, "a/b/c/small.jpg"),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "a/b/c/small.jpg",
|
name: "a/b/c/small.jpg",
|
||||||
prefix: "a/b/c/s",
|
prefix: "a/b/c/s",
|
||||||
delimiter: "/",
|
delimiter: "/",
|
||||||
result: newTestInfo(oid, bkt, "a/b/c/small.jpg", false),
|
result: newTestInfo(id, bkt, "a/b/c/small.jpg", false),
|
||||||
object: newTestObject(oid, bkt, "a/b/c/small.jpg"),
|
object: newTestObject(id, bkt, "a/b/c/small.jpg"),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "a/b/c/big.jpg",
|
name: "a/b/c/big.jpg",
|
||||||
prefix: "a/b/",
|
prefix: "a/b/",
|
||||||
delimiter: "/",
|
delimiter: "/",
|
||||||
result: newTestInfo(oid, bkt, "a/b/c/", true),
|
result: newTestInfo(id, bkt, "a/b/c/", true),
|
||||||
object: newTestObject(oid, bkt, "a/b/c/big.jpg"),
|
object: newTestObject(id, bkt, "a/b/c/big.jpg"),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@ import (
|
||||||
|
|
||||||
"github.com/nspcc-dev/neofs-s3-gw/api/data"
|
"github.com/nspcc-dev/neofs-s3-gw/api/data"
|
||||||
"github.com/nspcc-dev/neofs-s3-gw/api/errors"
|
"github.com/nspcc-dev/neofs-s3-gw/api/errors"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/object"
|
oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
|
||||||
)
|
)
|
||||||
|
|
||||||
type objectVersions struct {
|
type objectVersions struct {
|
||||||
|
@ -149,9 +149,9 @@ func mergeVersionsConflicts(conflicts [][]string) ([]string, []string, []string)
|
||||||
if len(conflicted)-1 < minLength {
|
if len(conflicted)-1 < minLength {
|
||||||
minLength = len(conflicted) - 1
|
minLength = len(conflicted) - 1
|
||||||
}
|
}
|
||||||
//last := conflicted[len(conflicted)-1]
|
// last := conflicted[len(conflicted)-1]
|
||||||
//conflicts[j] = conflicted[:len(conflicted)-1]
|
// conflicts[j] = conflicted[:len(conflicted)-1]
|
||||||
//currentVersions = append(currentVersions, last)
|
// currentVersions = append(currentVersions, last)
|
||||||
}
|
}
|
||||||
var commonAddedVersions []string
|
var commonAddedVersions []string
|
||||||
diffIndex := 0
|
diffIndex := 0
|
||||||
|
@ -271,7 +271,7 @@ func (v *objectVersions) getDelHeader() string {
|
||||||
return strings.Join(v.delList, ",")
|
return strings.Join(v.delList, ",")
|
||||||
}
|
}
|
||||||
|
|
||||||
func (v *objectVersions) getVersion(oid *object.ID) *data.ObjectInfo {
|
func (v *objectVersions) getVersion(oid *oid.ID) *data.ObjectInfo {
|
||||||
for _, version := range v.objects {
|
for _, version := range v.objects {
|
||||||
if version.Version() == oid.String() {
|
if version.Version() == oid.String() {
|
||||||
if contains(v.delList, oid.String()) {
|
if contains(v.delList, oid.String()) {
|
||||||
|
@ -429,7 +429,7 @@ func (n *layer) checkVersionsExist(ctx context.Context, bkt *data.BucketInfo, ob
|
||||||
if obj.VersionID == unversionedObjectVersionID {
|
if obj.VersionID == unversionedObjectVersionID {
|
||||||
version = versions.getLast(FromUnversioned())
|
version = versions.getLast(FromUnversioned())
|
||||||
} else {
|
} else {
|
||||||
id := object.NewID()
|
id := oid.NewID()
|
||||||
if err := id.Parse(obj.VersionID); err != nil {
|
if err := id.Parse(obj.VersionID); err != nil {
|
||||||
return nil, errors.GetAPIError(errors.ErrInvalidVersion)
|
return nil, errors.GetAPIError(errors.ErrInvalidVersion)
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,12 +16,14 @@ import (
|
||||||
"github.com/nspcc-dev/neofs-s3-gw/api/data"
|
"github.com/nspcc-dev/neofs-s3-gw/api/data"
|
||||||
"github.com/nspcc-dev/neofs-s3-gw/creds/accessbox"
|
"github.com/nspcc-dev/neofs-s3-gw/creds/accessbox"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/accounting"
|
"github.com/nspcc-dev/neofs-sdk-go/accounting"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/client"
|
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/container"
|
"github.com/nspcc-dev/neofs-sdk-go/container"
|
||||||
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
|
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/eacl"
|
"github.com/nspcc-dev/neofs-sdk-go/eacl"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/logger"
|
"github.com/nspcc-dev/neofs-sdk-go/logger"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/object"
|
"github.com/nspcc-dev/neofs-sdk-go/object"
|
||||||
|
"github.com/nspcc-dev/neofs-sdk-go/object/address"
|
||||||
|
oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
|
||||||
|
"github.com/nspcc-dev/neofs-sdk-go/object/id/test"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/owner"
|
"github.com/nspcc-dev/neofs-sdk-go/owner"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/pool"
|
"github.com/nspcc-dev/neofs-sdk-go/pool"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/session"
|
"github.com/nspcc-dev/neofs-sdk-go/session"
|
||||||
|
@ -30,6 +32,8 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
type testPool struct {
|
type testPool struct {
|
||||||
|
pool.Pool
|
||||||
|
|
||||||
objects map[string]*object.Object
|
objects map[string]*object.Object
|
||||||
containers map[string]*container.Container
|
containers map[string]*container.Container
|
||||||
currentEpoch uint64
|
currentEpoch uint64
|
||||||
|
@ -42,22 +46,16 @@ func newTestPool() *testPool {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *testPool) PutObject(ctx context.Context, params *client.PutObjectParams, option ...pool.CallOption) (*object.ID, error) {
|
func (t *testPool) PutObject(_ context.Context, hdr object.Object, payload io.Reader, _ ...pool.CallOption) (*oid.ID, error) {
|
||||||
b := make([]byte, 32)
|
id := test.ID()
|
||||||
if _, err := io.ReadFull(rand.Reader, b); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
oid := object.NewID()
|
raw := object.NewRawFrom(&hdr)
|
||||||
oid.SetSHA256(sha256.Sum256(b))
|
raw.SetID(id)
|
||||||
|
|
||||||
raw := object.NewRawFrom(params.Object())
|
|
||||||
raw.SetID(oid)
|
|
||||||
raw.SetCreationEpoch(t.currentEpoch)
|
raw.SetCreationEpoch(t.currentEpoch)
|
||||||
t.currentEpoch++
|
t.currentEpoch++
|
||||||
|
|
||||||
if params.PayloadReader() != nil {
|
if payload != nil {
|
||||||
all, err := io.ReadAll(params.PayloadReader())
|
all, err := io.ReadAll(payload)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -69,58 +67,49 @@ func (t *testPool) PutObject(ctx context.Context, params *client.PutObjectParams
|
||||||
return raw.ID(), nil
|
return raw.ID(), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *testPool) DeleteObject(ctx context.Context, params *client.DeleteObjectParams, option ...pool.CallOption) error {
|
func (t *testPool) DeleteObject(ctx context.Context, addr address.Address, option ...pool.CallOption) error {
|
||||||
delete(t.objects, params.Address().String())
|
delete(t.objects, addr.String())
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *testPool) GetObject(ctx context.Context, params *client.GetObjectParams, option ...pool.CallOption) (*object.Object, error) {
|
func (t *testPool) GetObject(_ context.Context, addr address.Address, _ ...pool.CallOption) (*pool.ResGetObject, error) {
|
||||||
if obj, ok := t.objects[params.Address().String()]; ok {
|
sAddr := addr.String()
|
||||||
if params.PayloadWriter() != nil {
|
|
||||||
_, err := params.PayloadWriter().Write(obj.Payload())
|
if obj, ok := t.objects[sAddr]; ok {
|
||||||
if err != nil {
|
return &pool.ResGetObject{
|
||||||
return nil, err
|
Header: *obj,
|
||||||
}
|
Payload: io.NopCloser(bytes.NewReader(obj.Payload())),
|
||||||
}
|
}, nil
|
||||||
return obj, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil, fmt.Errorf("object not found " + params.Address().String())
|
return nil, fmt.Errorf("object not found " + addr.String())
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *testPool) GetObjectHeader(ctx context.Context, params *client.ObjectHeaderParams, option ...pool.CallOption) (*object.Object, error) {
|
func (t *testPool) HeadObject(ctx context.Context, addr address.Address, _ ...pool.CallOption) (*object.Object, error) {
|
||||||
p := new(client.GetObjectParams).WithAddress(params.Address())
|
res, err := t.GetObject(ctx, addr)
|
||||||
return t.GetObject(ctx, p)
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return &res.Header, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *testPool) ObjectPayloadRangeData(ctx context.Context, params *client.RangeDataParams, option ...pool.CallOption) ([]byte, error) {
|
func (t *testPool) SearchObjects(_ context.Context, idCnr cid.ID, filters object.SearchFilters, _ ...pool.CallOption) (*pool.ResObjectSearch, error) {
|
||||||
panic("implement me")
|
cidStr := idCnr.String()
|
||||||
}
|
|
||||||
|
|
||||||
func (t *testPool) ObjectPayloadRangeSHA256(ctx context.Context, params *client.RangeChecksumParams, option ...pool.CallOption) ([][32]byte, error) {
|
var res []*oid.ID
|
||||||
panic("implement me")
|
|
||||||
}
|
|
||||||
|
|
||||||
func (t *testPool) ObjectPayloadRangeTZ(ctx context.Context, params *client.RangeChecksumParams, option ...pool.CallOption) ([][64]byte, error) {
|
if len(filters) == 1 {
|
||||||
panic("implement me")
|
|
||||||
}
|
|
||||||
|
|
||||||
func (t *testPool) SearchObject(ctx context.Context, params *client.SearchObjectParams, option ...pool.CallOption) ([]*object.ID, error) {
|
|
||||||
cidStr := params.ContainerID().String()
|
|
||||||
|
|
||||||
var res []*object.ID
|
|
||||||
|
|
||||||
if len(params.SearchFilters()) == 1 {
|
|
||||||
for k, v := range t.objects {
|
for k, v := range t.objects {
|
||||||
if strings.Contains(k, cidStr) {
|
if strings.Contains(k, cidStr) {
|
||||||
res = append(res, v.ID())
|
res = append(res, v.ID())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return res, nil
|
return nil, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
filter := params.SearchFilters()[1]
|
filter := filters[1]
|
||||||
if len(params.SearchFilters()) != 2 || filter.Operation() != object.MatchStringEqual ||
|
if len(filters) != 2 || filter.Operation() != object.MatchStringEqual ||
|
||||||
(filter.Header() != object.AttributeFileName && filter.Header() != objectSystemAttributeName) {
|
(filter.Header() != object.AttributeFileName && filter.Header() != objectSystemAttributeName) {
|
||||||
return nil, fmt.Errorf("usupported filters")
|
return nil, fmt.Errorf("usupported filters")
|
||||||
}
|
}
|
||||||
|
@ -131,7 +120,7 @@ func (t *testPool) SearchObject(ctx context.Context, params *client.SearchObject
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return res, nil
|
return nil, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func isMatched(attributes []*object.Attribute, filter object.SearchFilter) bool {
|
func isMatched(attributes []*object.Attribute, filter object.SearchFilter) bool {
|
||||||
|
@ -294,7 +283,7 @@ func (tc *testContext) listVersions() *ListObjectVersionsInfo {
|
||||||
return res
|
return res
|
||||||
}
|
}
|
||||||
|
|
||||||
func (tc *testContext) checkListObjects(ids ...*object.ID) {
|
func (tc *testContext) checkListObjects(ids ...*oid.ID) {
|
||||||
objs := tc.listObjectsV1()
|
objs := tc.listObjectsV1()
|
||||||
require.Equal(tc.t, len(ids), len(objs))
|
require.Equal(tc.t, len(ids), len(objs))
|
||||||
for _, id := range ids {
|
for _, id := range ids {
|
||||||
|
@ -370,6 +359,8 @@ func prepareContext(t *testing.T, cachesConfig ...*CachesConfig) *testContext {
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestSimpleVersioning(t *testing.T) {
|
func TestSimpleVersioning(t *testing.T) {
|
||||||
|
// https://github.com/nspcc-dev/neofs-s3-gw/issues/349
|
||||||
|
t.Skip("pool.Pool does not support overriding")
|
||||||
tc := prepareContext(t)
|
tc := prepareContext(t)
|
||||||
_, err := tc.layer.PutBucketVersioning(tc.ctx, &PutVersioningParams{
|
_, err := tc.layer.PutBucketVersioning(tc.ctx, &PutVersioningParams{
|
||||||
Bucket: tc.bktID.String(),
|
Bucket: tc.bktID.String(),
|
||||||
|
@ -394,6 +385,8 @@ func TestSimpleVersioning(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestSimpleNoVersioning(t *testing.T) {
|
func TestSimpleNoVersioning(t *testing.T) {
|
||||||
|
// https://github.com/nspcc-dev/neofs-s3-gw/issues/349
|
||||||
|
t.Skip("pool.Pool does not support overriding")
|
||||||
tc := prepareContext(t)
|
tc := prepareContext(t)
|
||||||
|
|
||||||
obj1Content1 := []byte("content obj1 v1")
|
obj1Content1 := []byte("content obj1 v1")
|
||||||
|
@ -411,6 +404,8 @@ func TestSimpleNoVersioning(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestVersioningDeleteObject(t *testing.T) {
|
func TestVersioningDeleteObject(t *testing.T) {
|
||||||
|
// https://github.com/nspcc-dev/neofs-s3-gw/issues/349
|
||||||
|
t.Skip("pool.Pool does not support overriding")
|
||||||
tc := prepareContext(t)
|
tc := prepareContext(t)
|
||||||
_, err := tc.layer.PutBucketVersioning(tc.ctx, &PutVersioningParams{
|
_, err := tc.layer.PutBucketVersioning(tc.ctx, &PutVersioningParams{
|
||||||
Bucket: tc.bktID.String(),
|
Bucket: tc.bktID.String(),
|
||||||
|
@ -428,6 +423,8 @@ func TestVersioningDeleteObject(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestVersioningDeleteSpecificObjectVersion(t *testing.T) {
|
func TestVersioningDeleteSpecificObjectVersion(t *testing.T) {
|
||||||
|
// https://github.com/nspcc-dev/neofs-s3-gw/issues/349
|
||||||
|
t.Skip("pool.Pool does not support overriding")
|
||||||
tc := prepareContext(t)
|
tc := prepareContext(t)
|
||||||
_, err := tc.layer.PutBucketVersioning(tc.ctx, &PutVersioningParams{
|
_, err := tc.layer.PutBucketVersioning(tc.ctx, &PutVersioningParams{
|
||||||
Bucket: tc.bktID.String(),
|
Bucket: tc.bktID.String(),
|
||||||
|
@ -460,17 +457,6 @@ func TestVersioningDeleteSpecificObjectVersion(t *testing.T) {
|
||||||
require.Equal(t, objV3Info.Version(), resInfo.Version())
|
require.Equal(t, objV3Info.Version(), resInfo.Version())
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestNoVersioningDeleteObject(t *testing.T) {
|
|
||||||
tc := prepareContext(t)
|
|
||||||
|
|
||||||
tc.putObject([]byte("content obj1 v1"))
|
|
||||||
tc.putObject([]byte("content obj1 v2"))
|
|
||||||
|
|
||||||
tc.deleteObject(tc.obj, "")
|
|
||||||
tc.getObject(tc.obj, "", true)
|
|
||||||
tc.checkListObjects()
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestGetLastVersion(t *testing.T) {
|
func TestGetLastVersion(t *testing.T) {
|
||||||
obj1 := getTestObjectInfo(1, "", "", "")
|
obj1 := getTestObjectInfo(1, "", "", "")
|
||||||
obj1V2 := getTestObjectInfo(2, "", "", "")
|
obj1V2 := getTestObjectInfo(2, "", "", "")
|
||||||
|
@ -545,6 +531,19 @@ func TestGetLastVersion(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestNoVersioningDeleteObject(t *testing.T) {
|
||||||
|
// https://github.com/nspcc-dev/neofs-s3-gw/issues/349
|
||||||
|
t.Skip("pool.Pool does not support overriding")
|
||||||
|
tc := prepareContext(t)
|
||||||
|
|
||||||
|
tc.putObject([]byte("content obj1 v1"))
|
||||||
|
tc.putObject([]byte("content obj1 v2"))
|
||||||
|
|
||||||
|
tc.deleteObject(tc.obj, "")
|
||||||
|
tc.getObject(tc.obj, "", true)
|
||||||
|
tc.checkListObjects()
|
||||||
|
}
|
||||||
|
|
||||||
func TestAppendVersions(t *testing.T) {
|
func TestAppendVersions(t *testing.T) {
|
||||||
obj1 := getTestObjectInfo(1, "", "", "")
|
obj1 := getTestObjectInfo(1, "", "", "")
|
||||||
obj2 := getTestObjectInfo(2, obj1.Version(), "", "")
|
obj2 := getTestObjectInfo(2, obj1.Version(), "", "")
|
||||||
|
@ -660,12 +659,12 @@ func joinVers(objs ...*data.ObjectInfo) string {
|
||||||
return strings.Join(versions, ",")
|
return strings.Join(versions, ",")
|
||||||
}
|
}
|
||||||
|
|
||||||
func getOID(id byte) *object.ID {
|
func getOID(id byte) *oid.ID {
|
||||||
b := [32]byte{}
|
b := [32]byte{}
|
||||||
b[31] = id
|
b[31] = id
|
||||||
oid := object.NewID()
|
idObj := oid.NewID()
|
||||||
oid.SetSHA256(b)
|
idObj.SetSHA256(b)
|
||||||
return oid
|
return idObj
|
||||||
}
|
}
|
||||||
|
|
||||||
func getTestObjectInfo(id byte, addAttr, delAttr, delMarkAttr string) *data.ObjectInfo {
|
func getTestObjectInfo(id byte, addAttr, delAttr, delMarkAttr string) *data.ObjectInfo {
|
||||||
|
@ -711,7 +710,7 @@ func TestUpdateCRDT2PSetHeaders(t *testing.T) {
|
||||||
versions *objectVersions
|
versions *objectVersions
|
||||||
versioningEnabled bool
|
versioningEnabled bool
|
||||||
expectedHeader map[string]string
|
expectedHeader map[string]string
|
||||||
expectedIdsToDelete []*object.ID
|
expectedIdsToDelete []*oid.ID
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
name: "unversioned save headers",
|
name: "unversioned save headers",
|
||||||
|
@ -729,7 +728,7 @@ func TestUpdateCRDT2PSetHeaders(t *testing.T) {
|
||||||
versionsDelAttr: obj1.Version(),
|
versionsDelAttr: obj1.Version(),
|
||||||
versionsUnversionedAttr: "true",
|
versionsUnversionedAttr: "true",
|
||||||
},
|
},
|
||||||
expectedIdsToDelete: []*object.ID{obj1.ID},
|
expectedIdsToDelete: []*oid.ID{obj1.ID},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "unversioned del header",
|
name: "unversioned del header",
|
||||||
|
@ -743,7 +742,7 @@ func TestUpdateCRDT2PSetHeaders(t *testing.T) {
|
||||||
versionsDelAttr: joinVers(obj1, obj2),
|
versionsDelAttr: joinVers(obj1, obj2),
|
||||||
versionsUnversionedAttr: "true",
|
versionsUnversionedAttr: "true",
|
||||||
},
|
},
|
||||||
expectedIdsToDelete: []*object.ID{obj2.ID},
|
expectedIdsToDelete: []*oid.ID{obj2.ID},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "versioned put",
|
name: "versioned put",
|
||||||
|
@ -778,7 +777,7 @@ func TestUpdateCRDT2PSetHeaders(t *testing.T) {
|
||||||
versionsDelAttr: obj1.Version(),
|
versionsDelAttr: obj1.Version(),
|
||||||
versionsUnversionedAttr: "true",
|
versionsUnversionedAttr: "true",
|
||||||
},
|
},
|
||||||
expectedIdsToDelete: []*object.ID{obj1.ID},
|
expectedIdsToDelete: []*oid.ID{obj1.ID},
|
||||||
},
|
},
|
||||||
} {
|
} {
|
||||||
t.Run(tc.name, func(t *testing.T) {
|
t.Run(tc.name, func(t *testing.T) {
|
||||||
|
@ -790,6 +789,8 @@ func TestUpdateCRDT2PSetHeaders(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestSystemObjectsVersioning(t *testing.T) {
|
func TestSystemObjectsVersioning(t *testing.T) {
|
||||||
|
// https://github.com/nspcc-dev/neofs-s3-gw/issues/349
|
||||||
|
t.Skip("pool.Pool does not support overriding")
|
||||||
cacheConfig := DefaultCachesConfigs()
|
cacheConfig := DefaultCachesConfigs()
|
||||||
cacheConfig.System.Lifetime = 0
|
cacheConfig.System.Lifetime = 0
|
||||||
|
|
||||||
|
@ -818,6 +819,8 @@ func TestSystemObjectsVersioning(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestDeleteSystemObjectsVersioning(t *testing.T) {
|
func TestDeleteSystemObjectsVersioning(t *testing.T) {
|
||||||
|
// https://github.com/nspcc-dev/neofs-s3-gw/issues/349
|
||||||
|
t.Skip("pool.Pool does not support overriding")
|
||||||
cacheConfig := DefaultCachesConfigs()
|
cacheConfig := DefaultCachesConfigs()
|
||||||
cacheConfig.System.Lifetime = 0
|
cacheConfig.System.Lifetime = 0
|
||||||
|
|
||||||
|
|
|
@ -1,54 +0,0 @@
|
||||||
package layer
|
|
||||||
|
|
||||||
import "io"
|
|
||||||
|
|
||||||
type offsetWriter struct {
|
|
||||||
io.Writer
|
|
||||||
|
|
||||||
written int64
|
|
||||||
skipped int64
|
|
||||||
|
|
||||||
offset int64
|
|
||||||
length int64
|
|
||||||
}
|
|
||||||
|
|
||||||
func newWriter(w io.Writer, offset, length int64) *offsetWriter {
|
|
||||||
return &offsetWriter{
|
|
||||||
Writer: w,
|
|
||||||
offset: offset,
|
|
||||||
length: length,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (w *offsetWriter) Write(p []byte) (int, error) {
|
|
||||||
ln := len(p)
|
|
||||||
length := int64(ln)
|
|
||||||
offset := w.offset - w.skipped
|
|
||||||
|
|
||||||
if length-offset < 0 {
|
|
||||||
w.skipped += length
|
|
||||||
|
|
||||||
return ln, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
length -= offset
|
|
||||||
|
|
||||||
// Writer should write enough and stop writing
|
|
||||||
// 1. When passed zero length, it should write all bytes except offset
|
|
||||||
// 2. When the written buffer is almost filled (left < length),
|
|
||||||
// should write some bytes to fill up the buffer
|
|
||||||
// 3. When the written buffer is filled, should stop to write
|
|
||||||
|
|
||||||
if left := w.length - w.written; left == 0 && w.length != 0 {
|
|
||||||
return 0, nil
|
|
||||||
} else if left > 0 && left < length {
|
|
||||||
length = left
|
|
||||||
}
|
|
||||||
|
|
||||||
n, err := w.Writer.Write(p[offset : offset+length])
|
|
||||||
|
|
||||||
w.written += int64(n)
|
|
||||||
w.skipped += offset
|
|
||||||
|
|
||||||
return n, err
|
|
||||||
}
|
|
|
@ -1,104 +0,0 @@
|
||||||
package layer
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bytes"
|
|
||||||
"crypto/rand"
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"github.com/stretchr/testify/require"
|
|
||||||
)
|
|
||||||
|
|
||||||
func testBuffer(t *testing.T) []byte {
|
|
||||||
buf := make([]byte, 1024)
|
|
||||||
_, err := rand.Read(buf)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
return buf
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestOffsetWriter(t *testing.T) {
|
|
||||||
b := testBuffer(t)
|
|
||||||
k := 64
|
|
||||||
d := len(b) / k
|
|
||||||
s := int64(len(b))
|
|
||||||
|
|
||||||
t.Run("1024 / 100 / 100 bytes success", func(t *testing.T) {
|
|
||||||
w := new(bytes.Buffer)
|
|
||||||
o := int64(100)
|
|
||||||
l := int64(100)
|
|
||||||
|
|
||||||
wt := newWriter(w, o, l)
|
|
||||||
for i := 0; i < k; i++ {
|
|
||||||
_, err := wt.Write(b[i*d : (i+1)*d])
|
|
||||||
require.NoError(t, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
require.Equal(t, o, wt.skipped)
|
|
||||||
require.Equal(t, l, wt.written)
|
|
||||||
require.Equal(t, b[o:o+l], w.Bytes())
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("1024 / 0 / 100 bytes success", func(t *testing.T) {
|
|
||||||
w := new(bytes.Buffer)
|
|
||||||
o := int64(0)
|
|
||||||
l := int64(100)
|
|
||||||
|
|
||||||
wt := newWriter(w, o, l)
|
|
||||||
for i := 0; i < k; i++ {
|
|
||||||
_, err := wt.Write(b[i*d : (i+1)*d])
|
|
||||||
require.NoError(t, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
require.Equal(t, o, wt.skipped)
|
|
||||||
require.Equal(t, l, wt.written)
|
|
||||||
require.Equal(t, b[o:o+l], w.Bytes())
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("1024 / 0 / 1024 bytes success", func(t *testing.T) {
|
|
||||||
w := new(bytes.Buffer)
|
|
||||||
o := int64(0)
|
|
||||||
l := int64(1024)
|
|
||||||
|
|
||||||
wt := newWriter(w, o, l)
|
|
||||||
for i := 0; i < k; i++ {
|
|
||||||
_, err := wt.Write(b[i*d : (i+1)*d])
|
|
||||||
require.NoError(t, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
require.Equal(t, o, wt.skipped)
|
|
||||||
require.Equal(t, l, wt.written)
|
|
||||||
require.Equal(t, b[o:o+l], w.Bytes())
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("should read all data when empty length passed", func(t *testing.T) {
|
|
||||||
w := new(bytes.Buffer)
|
|
||||||
o := int64(0)
|
|
||||||
l := int64(0)
|
|
||||||
|
|
||||||
wt := newWriter(w, o, l)
|
|
||||||
for i := 0; i < k; i++ {
|
|
||||||
_, err := wt.Write(b[i*d : (i+1)*d])
|
|
||||||
require.NoError(t, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
require.Equal(t, o, wt.skipped)
|
|
||||||
require.Equal(t, s, wt.written)
|
|
||||||
require.Equal(t, b, w.Bytes())
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("should read all data when empty length passed", func(t *testing.T) {
|
|
||||||
w := new(bytes.Buffer)
|
|
||||||
o := int64(0)
|
|
||||||
l := s + 1
|
|
||||||
|
|
||||||
wt := newWriter(w, o, l)
|
|
||||||
for i := 0; i < k; i++ {
|
|
||||||
_, err := wt.Write(b[i*d : (i+1)*d])
|
|
||||||
require.NoError(t, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
require.Equal(t, o, wt.skipped)
|
|
||||||
require.Equal(t, s, wt.written)
|
|
||||||
require.Equal(t, b, w.Bytes())
|
|
||||||
})
|
|
||||||
}
|
|
|
@ -5,6 +5,7 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/nspcc-dev/neo-go/pkg/rpc/client"
|
"github.com/nspcc-dev/neo-go/pkg/rpc/client"
|
||||||
|
neofsclient "github.com/nspcc-dev/neofs-sdk-go/client"
|
||||||
apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status"
|
apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status"
|
||||||
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
|
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/netmap"
|
"github.com/nspcc-dev/neofs-sdk-go/netmap"
|
||||||
|
@ -87,7 +88,7 @@ func NewDNSResolver(p pool.Pool, next *BucketResolver) (*BucketResolver, error)
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
networkInfoRes, err := conn.NetworkInfo(ctx)
|
networkInfoRes, err := conn.NetworkInfo(ctx, neofsclient.PrmNetworkInfo{})
|
||||||
if err == nil {
|
if err == nil {
|
||||||
err = apistatus.ErrFromStatus(networkInfoRes.Status())
|
err = apistatus.ErrFromStatus(networkInfoRes.Status())
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,12 +19,13 @@ import (
|
||||||
"github.com/nspcc-dev/neofs-s3-gw/creds/accessbox"
|
"github.com/nspcc-dev/neofs-s3-gw/creds/accessbox"
|
||||||
"github.com/nspcc-dev/neofs-s3-gw/creds/tokens"
|
"github.com/nspcc-dev/neofs-s3-gw/creds/tokens"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/acl"
|
"github.com/nspcc-dev/neofs-sdk-go/acl"
|
||||||
|
"github.com/nspcc-dev/neofs-sdk-go/client"
|
||||||
apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status"
|
apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/container"
|
"github.com/nspcc-dev/neofs-sdk-go/container"
|
||||||
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
|
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/eacl"
|
"github.com/nspcc-dev/neofs-sdk-go/eacl"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/netmap"
|
"github.com/nspcc-dev/neofs-sdk-go/netmap"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/object"
|
"github.com/nspcc-dev/neofs-sdk-go/object/address"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/owner"
|
"github.com/nspcc-dev/neofs-sdk-go/owner"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/policy"
|
"github.com/nspcc-dev/neofs-sdk-go/policy"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/pool"
|
"github.com/nspcc-dev/neofs-sdk-go/pool"
|
||||||
|
@ -104,7 +105,7 @@ type (
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
func (a *Agent) checkContainer(ctx context.Context, opts ContainerOptions) (*cid.ID, error) {
|
func (a *Agent) checkContainer(ctx context.Context, opts ContainerOptions, idOwner *owner.ID) (*cid.ID, error) {
|
||||||
if opts.ID != nil {
|
if opts.ID != nil {
|
||||||
// check that container exists
|
// check that container exists
|
||||||
_, err := a.pool.GetContainer(ctx, opts.ID)
|
_, err := a.pool.GetContainer(ctx, opts.ID)
|
||||||
|
@ -120,6 +121,7 @@ func (a *Agent) checkContainer(ctx context.Context, opts ContainerOptions) (*cid
|
||||||
container.WithPolicy(pp),
|
container.WithPolicy(pp),
|
||||||
container.WithCustomBasicACL(defaultAuthContainerBasicACL),
|
container.WithCustomBasicACL(defaultAuthContainerBasicACL),
|
||||||
container.WithAttribute(container.AttributeTimestamp, strconv.FormatInt(time.Now().Unix(), 10)),
|
container.WithAttribute(container.AttributeTimestamp, strconv.FormatInt(time.Now().Unix(), 10)),
|
||||||
|
container.WithOwnerID(idOwner),
|
||||||
}
|
}
|
||||||
if opts.FriendlyName != "" {
|
if opts.FriendlyName != "" {
|
||||||
cnrOptions = append(cnrOptions, container.WithAttribute(container.AttributeName, opts.FriendlyName))
|
cnrOptions = append(cnrOptions, container.WithAttribute(container.AttributeName, opts.FriendlyName))
|
||||||
|
@ -144,7 +146,7 @@ func (a *Agent) checkContainer(ctx context.Context, opts ContainerOptions) (*cid
|
||||||
func (a *Agent) getEpochDurations(ctx context.Context) (*epochDurations, error) {
|
func (a *Agent) getEpochDurations(ctx context.Context) (*epochDurations, error) {
|
||||||
if conn, _, err := a.pool.Connection(); err != nil {
|
if conn, _, err := a.pool.Connection(); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
} else if networkInfoRes, err := conn.NetworkInfo(ctx); err != nil {
|
} else if networkInfoRes, err := conn.NetworkInfo(ctx, client.PrmNetworkInfo{}); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
} else if err = apistatus.ErrFromStatus(networkInfoRes.Status()); err != nil {
|
} else if err = apistatus.ErrFromStatus(networkInfoRes.Status()); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
@ -214,7 +216,7 @@ func preparePolicy(policy ContainerPolicies) ([]*accessbox.AccessBox_ContainerPo
|
||||||
func (a *Agent) IssueSecret(ctx context.Context, w io.Writer, options *IssueSecretOptions) error {
|
func (a *Agent) IssueSecret(ctx context.Context, w io.Writer, options *IssueSecretOptions) error {
|
||||||
var (
|
var (
|
||||||
err error
|
err error
|
||||||
cid *cid.ID
|
id *cid.ID
|
||||||
box *accessbox.AccessBox
|
box *accessbox.AccessBox
|
||||||
lifetime lifetimeOptions
|
lifetime lifetimeOptions
|
||||||
)
|
)
|
||||||
|
@ -241,14 +243,16 @@ func (a *Agent) IssueSecret(ctx context.Context, w io.Writer, options *IssueSecr
|
||||||
lifetime.Exp = lifetime.Iat + epochLifetime
|
lifetime.Exp = lifetime.Iat + epochLifetime
|
||||||
}
|
}
|
||||||
|
|
||||||
|
idOwner := owner.NewIDFromPublicKey(&options.NeoFSKey.PrivateKey.PublicKey)
|
||||||
|
|
||||||
a.log.Info("check container or create", zap.Stringer("cid", options.Container.ID),
|
a.log.Info("check container or create", zap.Stringer("cid", options.Container.ID),
|
||||||
zap.String("friendly_name", options.Container.FriendlyName),
|
zap.String("friendly_name", options.Container.FriendlyName),
|
||||||
zap.String("placement_policy", options.Container.PlacementPolicy))
|
zap.String("placement_policy", options.Container.PlacementPolicy))
|
||||||
if cid, err = a.checkContainer(ctx, options.Container); err != nil {
|
if id, err = a.checkContainer(ctx, options.Container, idOwner); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
gatesData, err := createTokens(options, lifetime, cid)
|
gatesData, err := createTokens(options, lifetime, id)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -260,25 +264,23 @@ func (a *Agent) IssueSecret(ctx context.Context, w io.Writer, options *IssueSecr
|
||||||
|
|
||||||
box.ContainerPolicy = policies
|
box.ContainerPolicy = policies
|
||||||
|
|
||||||
oid := owner.NewIDFromPublicKey(&options.NeoFSKey.PrivateKey.PublicKey)
|
|
||||||
|
|
||||||
a.log.Info("store bearer token into NeoFS",
|
a.log.Info("store bearer token into NeoFS",
|
||||||
zap.Stringer("owner_tkn", oid))
|
zap.Stringer("owner_tkn", idOwner))
|
||||||
|
|
||||||
address, err := tokens.
|
addr, err := tokens.
|
||||||
New(a.pool, secrets.EphemeralKey, cache.DefaultAccessBoxConfig()).
|
New(a.pool, secrets.EphemeralKey, cache.DefaultAccessBoxConfig()).
|
||||||
Put(ctx, cid, oid, box, lifetime.Exp, options.GatesPublicKeys...)
|
Put(ctx, id, idOwner, box, lifetime.Exp, options.GatesPublicKeys...)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("failed to put bearer token: %w", err)
|
return fmt.Errorf("failed to put bearer token: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
accessKeyID := address.ContainerID().String() + "0" + address.ObjectID().String()
|
accessKeyID := addr.ContainerID().String() + "0" + addr.ObjectID().String()
|
||||||
|
|
||||||
ir := &issuingResult{
|
ir := &issuingResult{
|
||||||
AccessKeyID: accessKeyID,
|
AccessKeyID: accessKeyID,
|
||||||
SecretAccessKey: secrets.AccessKey,
|
SecretAccessKey: secrets.AccessKey,
|
||||||
OwnerPrivateKey: hex.EncodeToString(secrets.EphemeralKey.Bytes()),
|
OwnerPrivateKey: hex.EncodeToString(secrets.EphemeralKey.Bytes()),
|
||||||
ContainerID: cid.String(),
|
ContainerID: id.String(),
|
||||||
}
|
}
|
||||||
|
|
||||||
enc := json.NewEncoder(w)
|
enc := json.NewEncoder(w)
|
||||||
|
@ -288,7 +290,7 @@ func (a *Agent) IssueSecret(ctx context.Context, w io.Writer, options *IssueSecr
|
||||||
}
|
}
|
||||||
|
|
||||||
if options.AwsCliCredentialsFile != "" {
|
if options.AwsCliCredentialsFile != "" {
|
||||||
profileName := "authmate_cred_" + address.ObjectID().String()
|
profileName := "authmate_cred_" + addr.ObjectID().String()
|
||||||
if _, err = os.Stat(options.AwsCliCredentialsFile); os.IsNotExist(err) {
|
if _, err = os.Stat(options.AwsCliCredentialsFile); os.IsNotExist(err) {
|
||||||
profileName = "default"
|
profileName = "default"
|
||||||
}
|
}
|
||||||
|
@ -309,12 +311,12 @@ func (a *Agent) IssueSecret(ctx context.Context, w io.Writer, options *IssueSecr
|
||||||
// writes to io.Writer the secret access key.
|
// writes to io.Writer the secret access key.
|
||||||
func (a *Agent) ObtainSecret(ctx context.Context, w io.Writer, options *ObtainSecretOptions) error {
|
func (a *Agent) ObtainSecret(ctx context.Context, w io.Writer, options *ObtainSecretOptions) error {
|
||||||
bearerCreds := tokens.New(a.pool, options.GatePrivateKey, cache.DefaultAccessBoxConfig())
|
bearerCreds := tokens.New(a.pool, options.GatePrivateKey, cache.DefaultAccessBoxConfig())
|
||||||
address := object.NewAddress()
|
addr := address.NewAddress()
|
||||||
if err := address.Parse(options.SecretAddress); err != nil {
|
if err := addr.Parse(options.SecretAddress); err != nil {
|
||||||
return fmt.Errorf("failed to parse secret address: %w", err)
|
return fmt.Errorf("failed to parse secret address: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
box, err := bearerCreds.GetBox(ctx, address)
|
box, err := bearerCreds.GetBox(ctx, addr)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("failed to get tokens: %w", err)
|
return fmt.Errorf("failed to get tokens: %w", err)
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,6 @@ import (
|
||||||
"crypto/ecdsa"
|
"crypto/ecdsa"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"math"
|
|
||||||
"os"
|
"os"
|
||||||
"os/signal"
|
"os/signal"
|
||||||
"strings"
|
"strings"
|
||||||
|
@ -432,10 +431,9 @@ func createSDKClient(ctx context.Context, log *zap.Logger, key *ecdsa.PrivateKey
|
||||||
pb.AddNode(peerAddress, 1, 1)
|
pb.AddNode(peerAddress, 1, 1)
|
||||||
|
|
||||||
opts := &pool.BuilderOptions{
|
opts := &pool.BuilderOptions{
|
||||||
Key: key,
|
Key: key,
|
||||||
NodeConnectionTimeout: poolConnectTimeout,
|
NodeConnectionTimeout: poolConnectTimeout,
|
||||||
NodeRequestTimeout: poolRequestTimeout,
|
NodeRequestTimeout: poolRequestTimeout,
|
||||||
SessionExpirationEpoch: math.MaxUint32,
|
|
||||||
}
|
}
|
||||||
return pb.Build(ctx, opts)
|
return pb.Build(ctx, opts)
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,6 @@ package main
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"encoding/hex"
|
"encoding/hex"
|
||||||
"math"
|
|
||||||
"net"
|
"net"
|
||||||
"net/http"
|
"net/http"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
@ -109,7 +108,6 @@ func newApp(ctx context.Context, l *zap.Logger, v *viper.Viper) *App {
|
||||||
NodeConnectionTimeout: conTimeout,
|
NodeConnectionTimeout: conTimeout,
|
||||||
NodeRequestTimeout: reqTimeout,
|
NodeRequestTimeout: reqTimeout,
|
||||||
ClientRebalanceInterval: reBalance,
|
ClientRebalanceInterval: reBalance,
|
||||||
SessionExpirationEpoch: math.MaxUint64,
|
|
||||||
}
|
}
|
||||||
conns, err = poolPeers.Build(ctx, opts)
|
conns, err = poolPeers.Build(ctx, opts)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -1,19 +1,19 @@
|
||||||
package tokens
|
package tokens
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
|
||||||
"context"
|
"context"
|
||||||
"errors"
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
"strconv"
|
"strconv"
|
||||||
"sync"
|
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
|
"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
|
||||||
"github.com/nspcc-dev/neofs-s3-gw/api/cache"
|
"github.com/nspcc-dev/neofs-s3-gw/api/cache"
|
||||||
"github.com/nspcc-dev/neofs-s3-gw/creds/accessbox"
|
"github.com/nspcc-dev/neofs-s3-gw/creds/accessbox"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/client"
|
|
||||||
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
|
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/object"
|
"github.com/nspcc-dev/neofs-sdk-go/object"
|
||||||
|
"github.com/nspcc-dev/neofs-sdk-go/object/address"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/owner"
|
"github.com/nspcc-dev/neofs-sdk-go/owner"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/pool"
|
"github.com/nspcc-dev/neofs-sdk-go/pool"
|
||||||
)
|
)
|
||||||
|
@ -21,8 +21,8 @@ import (
|
||||||
type (
|
type (
|
||||||
// Credentials is a bearer token get/put interface.
|
// Credentials is a bearer token get/put interface.
|
||||||
Credentials interface {
|
Credentials interface {
|
||||||
GetBox(context.Context, *object.Address) (*accessbox.Box, error)
|
GetBox(context.Context, *address.Address) (*accessbox.Box, error)
|
||||||
Put(context.Context, *cid.ID, *owner.ID, *accessbox.AccessBox, uint64, ...*keys.PublicKey) (*object.Address, error)
|
Put(context.Context, *cid.ID, *owner.ID, *accessbox.AccessBox, uint64, ...*keys.PublicKey) (*address.Address, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
cred struct {
|
cred struct {
|
||||||
|
@ -39,12 +39,6 @@ var (
|
||||||
ErrEmptyBearerToken = errors.New("Bearer token could not be empty")
|
ErrEmptyBearerToken = errors.New("Bearer token could not be empty")
|
||||||
)
|
)
|
||||||
|
|
||||||
var bufferPool = sync.Pool{
|
|
||||||
New: func() interface{} {
|
|
||||||
return new(bytes.Buffer)
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
var _ = New
|
var _ = New
|
||||||
|
|
||||||
// New creates new Credentials instance using given cli and key.
|
// New creates new Credentials instance using given cli and key.
|
||||||
|
@ -52,22 +46,13 @@ func New(conns pool.Pool, key *keys.PrivateKey, config *cache.Config) Credential
|
||||||
return &cred{pool: conns, key: key, cache: cache.NewAccessBoxCache(config)}
|
return &cred{pool: conns, key: key, cache: cache.NewAccessBoxCache(config)}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *cred) acquireBuffer() *bytes.Buffer {
|
func (c *cred) GetBox(ctx context.Context, addr *address.Address) (*accessbox.Box, error) {
|
||||||
return bufferPool.Get().(*bytes.Buffer)
|
cachedBox := c.cache.Get(addr)
|
||||||
}
|
|
||||||
|
|
||||||
func (c *cred) releaseBuffer(buf *bytes.Buffer) {
|
|
||||||
buf.Reset()
|
|
||||||
bufferPool.Put(buf)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *cred) GetBox(ctx context.Context, address *object.Address) (*accessbox.Box, error) {
|
|
||||||
cachedBox := c.cache.Get(address)
|
|
||||||
if cachedBox != nil {
|
if cachedBox != nil {
|
||||||
return cachedBox, nil
|
return cachedBox, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
box, err := c.getAccessBox(ctx, address)
|
box, err := c.getAccessBox(ctx, addr)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -77,37 +62,44 @@ func (c *cred) GetBox(ctx context.Context, address *object.Address) (*accessbox.
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
if err = c.cache.Put(address, cachedBox); err != nil {
|
if err = c.cache.Put(addr, cachedBox); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
return cachedBox, nil
|
return cachedBox, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *cred) getAccessBox(ctx context.Context, address *object.Address) (*accessbox.AccessBox, error) {
|
func (c *cred) getAccessBox(ctx context.Context, addr *address.Address) (*accessbox.AccessBox, error) {
|
||||||
var (
|
// init payload reader
|
||||||
box accessbox.AccessBox
|
res, err := c.pool.GetObject(ctx, *addr)
|
||||||
buf = c.acquireBuffer()
|
|
||||||
)
|
|
||||||
defer c.releaseBuffer(buf)
|
|
||||||
|
|
||||||
ops := new(client.GetObjectParams).WithAddress(address).WithPayloadWriter(buf)
|
|
||||||
|
|
||||||
_, err := c.pool.GetObject(
|
|
||||||
ctx,
|
|
||||||
ops,
|
|
||||||
)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("client pool failure: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
defer res.Payload.Close()
|
||||||
|
|
||||||
|
// read payload
|
||||||
|
var data []byte
|
||||||
|
|
||||||
|
if sz := res.Header.PayloadSize(); sz > 0 {
|
||||||
|
data = make([]byte, sz)
|
||||||
|
|
||||||
|
_, err = io.ReadFull(res.Payload, data)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("read payload: %w", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// decode access box
|
||||||
|
var box accessbox.AccessBox
|
||||||
|
if err = box.Unmarshal(data); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
if err = box.Unmarshal(buf.Bytes()); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return &box, nil
|
return &box, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *cred) Put(ctx context.Context, cid *cid.ID, issuer *owner.ID, box *accessbox.AccessBox, expiration uint64, keys ...*keys.PublicKey) (*object.Address, error) {
|
func (c *cred) Put(ctx context.Context, cid *cid.ID, issuer *owner.ID, box *accessbox.AccessBox, expiration uint64, keys ...*keys.PublicKey) (*address.Address, error) {
|
||||||
var (
|
var (
|
||||||
err error
|
err error
|
||||||
created = strconv.FormatInt(time.Now().Unix(), 10)
|
created = strconv.FormatInt(time.Now().Unix(), 10)
|
||||||
|
@ -139,17 +131,15 @@ func (c *cred) Put(ctx context.Context, cid *cid.ID, issuer *owner.ID, box *acce
|
||||||
raw.SetContainerID(cid)
|
raw.SetContainerID(cid)
|
||||||
raw.SetOwnerID(issuer)
|
raw.SetOwnerID(issuer)
|
||||||
raw.SetAttributes(filename, timestamp, expirationAttr)
|
raw.SetAttributes(filename, timestamp, expirationAttr)
|
||||||
|
raw.SetPayload(data)
|
||||||
|
|
||||||
ops := new(client.PutObjectParams).WithObject(raw.Object()).WithPayloadReader(bytes.NewBuffer(data))
|
oid, err := c.pool.PutObject(ctx, *raw.Object(), nil)
|
||||||
oid, err := c.pool.PutObject(
|
|
||||||
ctx,
|
|
||||||
ops,
|
|
||||||
)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
address := object.NewAddress()
|
|
||||||
address.SetObjectID(oid)
|
addr := address.NewAddress()
|
||||||
address.SetContainerID(cid)
|
addr.SetObjectID(oid)
|
||||||
return address, nil
|
addr.SetContainerID(cid)
|
||||||
|
return addr, nil
|
||||||
}
|
}
|
||||||
|
|
4
go.mod
4
go.mod
|
@ -12,8 +12,8 @@ require (
|
||||||
github.com/nats-io/nats-server/v2 v2.7.1 // indirect
|
github.com/nats-io/nats-server/v2 v2.7.1 // indirect
|
||||||
github.com/nats-io/nats.go v1.13.1-0.20220121202836-972a071d373d
|
github.com/nats-io/nats.go v1.13.1-0.20220121202836-972a071d373d
|
||||||
github.com/nspcc-dev/neo-go v0.98.0
|
github.com/nspcc-dev/neo-go v0.98.0
|
||||||
github.com/nspcc-dev/neofs-api-go/v2 v2.11.2-0.20220114101721-227a871a04ac
|
github.com/nspcc-dev/neofs-api-go/v2 v2.11.2-0.20220127135316-32dd0bb3f9c5
|
||||||
github.com/nspcc-dev/neofs-sdk-go v0.0.0-20220121080144-596774ce5bd3
|
github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.1.0.20220221122137-66bc59da5c02
|
||||||
github.com/prometheus/client_golang v1.11.0
|
github.com/prometheus/client_golang v1.11.0
|
||||||
github.com/spf13/pflag v1.0.5
|
github.com/spf13/pflag v1.0.5
|
||||||
github.com/spf13/viper v1.7.1
|
github.com/spf13/viper v1.7.1
|
||||||
|
|
8
go.sum
8
go.sum
|
@ -291,15 +291,15 @@ github.com/nspcc-dev/neo-go v0.73.1-pre.0.20200303142215-f5a1b928ce09/go.mod h1:
|
||||||
github.com/nspcc-dev/neo-go v0.98.0 h1:yyW4sgY88/pLf0949qmgfkQXzRKC3CI/WyhqXNnwMd8=
|
github.com/nspcc-dev/neo-go v0.98.0 h1:yyW4sgY88/pLf0949qmgfkQXzRKC3CI/WyhqXNnwMd8=
|
||||||
github.com/nspcc-dev/neo-go v0.98.0/go.mod h1:E3cc1x6RXSXrJb2nDWXTXjnXk3rIqVN8YdFyWv+FrqM=
|
github.com/nspcc-dev/neo-go v0.98.0/go.mod h1:E3cc1x6RXSXrJb2nDWXTXjnXk3rIqVN8YdFyWv+FrqM=
|
||||||
github.com/nspcc-dev/neofs-api-go/v2 v2.11.0-pre.0.20211201134523-3604d96f3fe1/go.mod h1:oS8dycEh8PPf2Jjp6+8dlwWyEv2Dy77h/XhhcdxYEFs=
|
github.com/nspcc-dev/neofs-api-go/v2 v2.11.0-pre.0.20211201134523-3604d96f3fe1/go.mod h1:oS8dycEh8PPf2Jjp6+8dlwWyEv2Dy77h/XhhcdxYEFs=
|
||||||
github.com/nspcc-dev/neofs-api-go/v2 v2.11.2-0.20220114101721-227a871a04ac h1:65C4z7pybLT2HjtY96abZj6kbgVp34AbrApn5DD+ZxY=
|
github.com/nspcc-dev/neofs-api-go/v2 v2.11.2-0.20220127135316-32dd0bb3f9c5 h1:y9tbmUYhcr052QXsa4/IfUKAi2cx3TGDsEZUAow3P/Y=
|
||||||
github.com/nspcc-dev/neofs-api-go/v2 v2.11.2-0.20220114101721-227a871a04ac/go.mod h1:oS8dycEh8PPf2Jjp6+8dlwWyEv2Dy77h/XhhcdxYEFs=
|
github.com/nspcc-dev/neofs-api-go/v2 v2.11.2-0.20220127135316-32dd0bb3f9c5/go.mod h1:oS8dycEh8PPf2Jjp6+8dlwWyEv2Dy77h/XhhcdxYEFs=
|
||||||
github.com/nspcc-dev/neofs-crypto v0.2.0/go.mod h1:F/96fUzPM3wR+UGsPi3faVNmFlA9KAEAUQR7dMxZmNA=
|
github.com/nspcc-dev/neofs-crypto v0.2.0/go.mod h1:F/96fUzPM3wR+UGsPi3faVNmFlA9KAEAUQR7dMxZmNA=
|
||||||
github.com/nspcc-dev/neofs-crypto v0.2.3/go.mod h1:8w16GEJbH6791ktVqHN9YRNH3s9BEEKYxGhlFnp0cDw=
|
github.com/nspcc-dev/neofs-crypto v0.2.3/go.mod h1:8w16GEJbH6791ktVqHN9YRNH3s9BEEKYxGhlFnp0cDw=
|
||||||
github.com/nspcc-dev/neofs-crypto v0.3.0 h1:zlr3pgoxuzrmGCxc5W8dGVfA9Rro8diFvVnBg0L4ifM=
|
github.com/nspcc-dev/neofs-crypto v0.3.0 h1:zlr3pgoxuzrmGCxc5W8dGVfA9Rro8diFvVnBg0L4ifM=
|
||||||
github.com/nspcc-dev/neofs-crypto v0.3.0/go.mod h1:8w16GEJbH6791ktVqHN9YRNH3s9BEEKYxGhlFnp0cDw=
|
github.com/nspcc-dev/neofs-crypto v0.3.0/go.mod h1:8w16GEJbH6791ktVqHN9YRNH3s9BEEKYxGhlFnp0cDw=
|
||||||
github.com/nspcc-dev/neofs-sdk-go v0.0.0-20211201182451-a5b61c4f6477/go.mod h1:dfMtQWmBHYpl9Dez23TGtIUKiFvCIxUZq/CkSIhEpz4=
|
github.com/nspcc-dev/neofs-sdk-go v0.0.0-20211201182451-a5b61c4f6477/go.mod h1:dfMtQWmBHYpl9Dez23TGtIUKiFvCIxUZq/CkSIhEpz4=
|
||||||
github.com/nspcc-dev/neofs-sdk-go v0.0.0-20220121080144-596774ce5bd3 h1:Llot/7cnQwCfhSrnNLDhuYxKpX4Ay+xa6x7B1jI2eaU=
|
github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.1.0.20220221122137-66bc59da5c02 h1:g9tIrZU45dVFUSiY7Bb8m43rV/CJiIoPgQrxnbtKfKE=
|
||||||
github.com/nspcc-dev/neofs-sdk-go v0.0.0-20220121080144-596774ce5bd3/go.mod h1:fhs4v6uts7bEgwYP05NXbAQlQ0YhK4WVjJRKQKFKBxY=
|
github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.1.0.20220221122137-66bc59da5c02/go.mod h1:NeDPJaKJ6yCOWXRmfc3aRrhBPEOeAPD7q/6bp1UQCbs=
|
||||||
github.com/nspcc-dev/rfc6979 v0.1.0/go.mod h1:exhIh1PdpDC5vQmyEsGvc4YDM/lyQp/452QxGq/UEso=
|
github.com/nspcc-dev/rfc6979 v0.1.0/go.mod h1:exhIh1PdpDC5vQmyEsGvc4YDM/lyQp/452QxGq/UEso=
|
||||||
github.com/nspcc-dev/rfc6979 v0.2.0 h1:3e1WNxrN60/6N0DW7+UYisLeZJyfqZTNOjeV/toYvOE=
|
github.com/nspcc-dev/rfc6979 v0.2.0 h1:3e1WNxrN60/6N0DW7+UYisLeZJyfqZTNOjeV/toYvOE=
|
||||||
github.com/nspcc-dev/rfc6979 v0.2.0/go.mod h1:exhIh1PdpDC5vQmyEsGvc4YDM/lyQp/452QxGq/UEso=
|
github.com/nspcc-dev/rfc6979 v0.2.0/go.mod h1:exhIh1PdpDC5vQmyEsGvc4YDM/lyQp/452QxGq/UEso=
|
||||||
|
|
Loading…
Reference in a new issue