99640225fd
The old paths.Path type is now replaced with the new storj.Path.
storj.Path is simply an alias to the built-in string type. As such it can be used just as any string, which simplifies a lot working with paths. No more conversions paths.New and path.String().
As an alias storj.Path does not define any methods. However, any functions applying to strings (like those from the strings package) gracefully apply to storj.Path too. In addition we have a few more functions defined:
storj.SplitPath
storj.JoinPaths
encryption.EncryptPath
encryption.DecryptPath
encryption.DerivePathKey
encryption.DeriveContentKey
All code in master is migrated to the new storj.Path type.
The Path example is also updated and is good for reference: /pkg/encryption/examples_test.go
This PR also resolve a nonce misuse issue in path encryption: https://storjlabs.atlassian.net/browse/V3-545
68 lines
1.8 KiB
Go
68 lines
1.8 KiB
Go
// Copyright (C) 2018 Storj Labs, Inc.
|
|
// See LICENSE for copying information.
|
|
|
|
package buckets
|
|
|
|
import (
|
|
"context"
|
|
"io"
|
|
"time"
|
|
|
|
"storj.io/storj/pkg/ranger"
|
|
"storj.io/storj/pkg/storage/objects"
|
|
"storj.io/storj/pkg/storj"
|
|
)
|
|
|
|
type prefixedObjStore struct {
|
|
o objects.Store
|
|
prefix string
|
|
}
|
|
|
|
func (o *prefixedObjStore) Meta(ctx context.Context, path storj.Path) (meta objects.Meta, err error) {
|
|
defer mon.Task()(&ctx)(&err)
|
|
|
|
if len(path) == 0 {
|
|
return objects.Meta{}, objects.NoPathError.New("")
|
|
}
|
|
|
|
m, err := o.o.Meta(ctx, storj.JoinPaths(o.prefix, path))
|
|
return m, err
|
|
}
|
|
|
|
func (o *prefixedObjStore) Get(ctx context.Context, path storj.Path) (rr ranger.Ranger, meta objects.Meta, err error) {
|
|
defer mon.Task()(&ctx)(&err)
|
|
|
|
if len(path) == 0 {
|
|
return nil, objects.Meta{}, objects.NoPathError.New("")
|
|
}
|
|
|
|
rr, m, err := o.o.Get(ctx, storj.JoinPaths(o.prefix, path))
|
|
return rr, m, err
|
|
}
|
|
|
|
func (o *prefixedObjStore) Put(ctx context.Context, path storj.Path, data io.Reader, metadata objects.SerializableMeta, expiration time.Time) (meta objects.Meta, err error) {
|
|
defer mon.Task()(&ctx)(&err)
|
|
|
|
if len(path) == 0 {
|
|
return objects.Meta{}, objects.NoPathError.New("")
|
|
}
|
|
|
|
m, err := o.o.Put(ctx, storj.JoinPaths(o.prefix, path), data, metadata, expiration)
|
|
return m, err
|
|
}
|
|
|
|
func (o *prefixedObjStore) Delete(ctx context.Context, path storj.Path) (err error) {
|
|
defer mon.Task()(&ctx)(&err)
|
|
|
|
if len(path) == 0 {
|
|
return objects.NoPathError.New("")
|
|
}
|
|
|
|
return o.o.Delete(ctx, storj.JoinPaths(o.prefix, path))
|
|
}
|
|
|
|
func (o *prefixedObjStore) List(ctx context.Context, prefix, startAfter, endBefore storj.Path, recursive bool, limit int, metaFlags uint32) (items []objects.ListItem, more bool, err error) {
|
|
defer mon.Task()(&ctx)(&err)
|
|
return o.o.List(ctx, storj.JoinPaths(o.prefix, prefix), startAfter, endBefore, recursive, limit, metaFlags)
|
|
}
|