30f790a040
* add path implementation This commit adds a pkg/paths package which contains two types, Encrypted and Unencrypted, to statically enforce what is contained in a path. It's part of a refactoring of the code base to be more clear about what is contained in a storj.Path at all the layers. Change-Id: Ifc4d4932da26a97ea99749b8356b4543496a8864 * add encryption store This change adds an encryption.Store type to keep a collection of root keys for arbitrary locations in some buckets. It allows one to look up all of the necessary information to encrypt paths, decrypt paths and decrypt list operations. It adds some exported functions to perform encryption on paths using a Store. Change-Id: I1a3d230c521d65f0ede727f93e1cb389f8be9497 * add shim around streams store This commit changes no functionality, but just reorganizes the code so that changes can be made directly to the streams store implementation without affecting callers. It also adds a Path type that will be used at the interface boundary for the streams store so that it can be sure that it's getting well formed paths that it expects. Change-Id: I50bd682995b185beb653b00562fab62ef11f1ab5 * refactor streams to use encryption store This commit changes the streams store to use the path type as well as the encryption store to handle all of it's encryption and decryption. Some changes were made to how the default key is returned in the encryption store to have it include the case when the bucket exists but no paths matched. The path iterator could also be simplified to not report if a consume was valid: that information is no longer necessary. The kvmetainfo tests were changed to appropriately pass the subtests *testing.T rather than having the closure it executes use the parent one. The test framework now correctly reports which test did the failing. There are still some latent issues with listing in that listing for "a/" and listing for "a" are not the same operation, but we treat them as such. I suspect that there are also issues with paths like "/" or "//foo", but that's for another time. Change-Id: I81cad4ba2850c3d14ba7e632777c4cac93db9472 * use an encryption store at the upper layers Change-Id: Id9b4dd5f27b3ecac863de586e9ae076f4f927f6f * fix linting failures Change-Id: Ifb8378879ad308d4d047a0483850156371a41280 * fix linting in encryption test Change-Id: Ia35647dfe18b0f20fe13763b28e53294f75c38fa * get rid of kvmetainfo rootKey Change-Id: Id795ca03d9417e3fe9634365a121430eb678d6d5 * Fix linting failure for return with else Change-Id: I0b9ffd92be42ffcd8fef7ea735c5fc114a55d3b5 * fix some bugs adding enc store to kvmetainfo Change-Id: I8e765970ba817289c65ec62971ae3bfa2c53a1ba * respond to review feedback Change-Id: I43e2ce29ce2fb6677b1cd6b9469838d80ec92c86
61 lines
1.5 KiB
Go
61 lines
1.5 KiB
Go
// Copyright (C) 2019 Storj Labs, Inc.
|
|
// See LICENSE for copying information.
|
|
|
|
package streams
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
|
|
"storj.io/storj/pkg/paths"
|
|
)
|
|
|
|
// Path is a representation of an object path within a bucket
|
|
type Path struct {
|
|
bucket string
|
|
unencPath paths.Unencrypted
|
|
raw []byte
|
|
}
|
|
|
|
// Bucket returns the bucket part of the path.
|
|
func (p Path) Bucket() string { return p.bucket }
|
|
|
|
// UnencryptedPath returns the unencrypted path part of the path.
|
|
func (p Path) UnencryptedPath() paths.Unencrypted { return p.unencPath }
|
|
|
|
// Raw returns the raw data in the path.
|
|
func (p Path) Raw() []byte { return append([]byte(nil), p.raw...) }
|
|
|
|
// String returns the string form of the raw data in the path.
|
|
func (p Path) String() string { return string(p.raw) }
|
|
|
|
// ParsePath returns a new Path with the given raw bytes.
|
|
func ParsePath(ctx context.Context, raw []byte) (path Path, err error) {
|
|
defer mon.Task()(&ctx)(&err)
|
|
|
|
// A path must contain a bucket and maybe an unencrypted path.
|
|
parts := bytes.SplitN(raw, []byte("/"), 2)
|
|
|
|
path.raw = raw
|
|
path.bucket = string(parts[0])
|
|
if len(parts) > 1 {
|
|
path.unencPath = paths.NewUnencrypted(string(parts[1]))
|
|
}
|
|
|
|
return path, nil
|
|
}
|
|
|
|
// CreatePath will create a Path for the provided information.
|
|
func CreatePath(bucket string, unencPath paths.Unencrypted) (path Path) {
|
|
path.bucket = bucket
|
|
path.unencPath = unencPath
|
|
|
|
path.raw = append(path.raw, bucket...)
|
|
if unencPath.Valid() {
|
|
path.raw = append(path.raw, '/')
|
|
path.raw = append(path.raw, unencPath.Raw()...)
|
|
}
|
|
|
|
return path
|
|
}
|