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
154 lines
4.0 KiB
Go
154 lines
4.0 KiB
Go
// Copyright (C) 2019 Storj Labs, Inc.
|
|
// See LICENSE for copying information.
|
|
|
|
package paths
|
|
|
|
import (
|
|
"strings"
|
|
)
|
|
|
|
//
|
|
// To avoid confusion about when paths are encrypted, unencrypted, empty or
|
|
// non existent, we create some wrapper types so that the compiler will complain
|
|
// if someone attempts to use one in the wrong context.
|
|
//
|
|
|
|
// Unencrypted is an opaque type representing an unencrypted path.
|
|
type Unencrypted struct {
|
|
raw string
|
|
}
|
|
|
|
// Encrypted is an opaque type representing an encrypted path.
|
|
type Encrypted struct {
|
|
raw string
|
|
}
|
|
|
|
//
|
|
// unencrypted paths
|
|
//
|
|
|
|
// NewUnencrypted takes a raw unencrypted path and returns it wrapped.
|
|
func NewUnencrypted(raw string) Unencrypted {
|
|
return Unencrypted{raw: raw}
|
|
}
|
|
|
|
// Valid returns if the unencrypted path is valid, which is the same as not being empty.
|
|
func (path Unencrypted) Valid() bool {
|
|
return path.raw != ""
|
|
}
|
|
|
|
// Raw returns the original raw path for the Unencrypted.
|
|
func (path Unencrypted) Raw() string {
|
|
return path.raw
|
|
}
|
|
|
|
// String returns a human readable form of the Unencrypted.
|
|
func (path Unencrypted) String() string {
|
|
return path.Raw()
|
|
}
|
|
|
|
// Consume attempts to remove the prefix from the Unencrypted path and
|
|
// reports a boolean indicating if it was able to do so.
|
|
func (path Unencrypted) Consume(prefix Unencrypted) (Unencrypted, bool) {
|
|
if len(path.raw) >= len(prefix.raw) && path.raw[:len(prefix.raw)] == prefix.raw {
|
|
return NewUnencrypted(path.raw[len(prefix.raw):]), true
|
|
}
|
|
return Unencrypted{}, false
|
|
}
|
|
|
|
// Iterator returns an iterator over the components of the Unencrypted.
|
|
func (path Unencrypted) Iterator() Iterator {
|
|
return NewIterator(path.raw)
|
|
}
|
|
|
|
// Less returns true if 'path' should be sorted earlier than 'other'
|
|
func (path Unencrypted) Less(other Unencrypted) bool {
|
|
return path.raw < other.raw
|
|
}
|
|
|
|
//
|
|
// encrypted path
|
|
//
|
|
|
|
// NewEncrypted takes a raw encrypted path and returns it wrapped.
|
|
func NewEncrypted(raw string) Encrypted {
|
|
return Encrypted{raw: raw}
|
|
}
|
|
|
|
// Valid returns if the encrypted path is valid, which is the same as not being empty.
|
|
func (path Encrypted) Valid() bool {
|
|
return path.raw != ""
|
|
}
|
|
|
|
// Raw returns the original path for the Encrypted.
|
|
func (path Encrypted) Raw() string {
|
|
return path.raw
|
|
}
|
|
|
|
// String returns a human readable form of the Encrypted.
|
|
func (path Encrypted) String() string {
|
|
return path.Raw()
|
|
}
|
|
|
|
// Consume attempts to remove the prefix from the Encrypted path and
|
|
// reports a boolean indicating if it was able to do so.
|
|
func (path Encrypted) Consume(prefix Encrypted) (Encrypted, bool) {
|
|
if len(path.raw) >= len(prefix.raw) && path.raw[:len(prefix.raw)] == prefix.raw {
|
|
return NewEncrypted(path.raw[len(prefix.raw):]), true
|
|
}
|
|
return Encrypted{}, false
|
|
}
|
|
|
|
// Iterator returns an iterator over the components of the Encrypted.
|
|
func (path Encrypted) Iterator() Iterator {
|
|
return NewIterator(path.raw)
|
|
}
|
|
|
|
// Less returns true if 'path' should be sorted earlier than 'other'
|
|
func (path Encrypted) Less(other Encrypted) bool {
|
|
return path.raw < other.raw
|
|
}
|
|
|
|
//
|
|
// path component iteration
|
|
//
|
|
|
|
// Iterator allows one to efficiently iterate over components of a path.
|
|
type Iterator struct {
|
|
raw string
|
|
consumed int
|
|
lastEmpty bool
|
|
}
|
|
|
|
// NewIterator returns an Iterator for components of the provided raw path.
|
|
func NewIterator(raw string) Iterator {
|
|
return Iterator{raw: raw, lastEmpty: raw != ""}
|
|
}
|
|
|
|
// Consumed reports how much of the path has been consumed (if any).
|
|
func (pi Iterator) Consumed() string { return pi.raw[:pi.consumed] }
|
|
|
|
// Remaining reports how much of the path is remaining.
|
|
func (pi Iterator) Remaining() string { return pi.raw[pi.consumed:] }
|
|
|
|
// Done reports if the path has been fully consumed.
|
|
func (pi Iterator) Done() bool { return len(pi.raw) == pi.consumed && !pi.lastEmpty }
|
|
|
|
// Next returns the first component of the path, consuming it.
|
|
func (pi *Iterator) Next() string {
|
|
if pi.Done() {
|
|
return ""
|
|
}
|
|
|
|
rem := pi.Remaining()
|
|
index := strings.IndexByte(rem, '/')
|
|
if index == -1 {
|
|
pi.consumed += len(rem)
|
|
pi.lastEmpty = false
|
|
return rem
|
|
}
|
|
pi.consumed += index + 1
|
|
pi.lastEmpty = index == len(rem)-1
|
|
return rem[:index]
|
|
}
|