fix listing with encrypted paths

storj · Oct 11, 2018 · 50a20cc · 50a20cc
1 parent 51daf31
commit 50a20cc
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/pkg/storage/streams/store.go b/pkg/storage/streams/store.go
@@ -381,11 +381,18 @@ func (s *streamStore) List(ctx context.Context, prefix, startAfter, endBefore pa
 	if err != nil {
 		return nil, false, err
 	}
-	encStartAfter, err := startAfter.Encrypt(s.rootKey)
+
+	prefixNoBucket := paths.Path([]string(prefix)[1:])
+	prefixKey, err := prefixNoBucket.DeriveKey(s.rootKey, len(prefixNoBucket))
+	if err != nil {
+		return nil, false, err
+	}
+
+	encStartAfter, err := startAfter.Encrypt(prefixKey)
 	if err != nil {
 		return nil, false, err
 	}
-	encEndBefore, err := endBefore.Encrypt(s.rootKey)
+	encEndBefore, err := endBefore.Encrypt(prefixKey)
 	if err != nil {
 		return nil, false, err
 	}
@@ -401,7 +408,7 @@ func (s *streamStore) List(ctx context.Context, prefix, startAfter, endBefore pa
 		if err != nil {
 			return nil, false, err
 		}
-		decPath, err := item.Path.Decrypt(s.rootKey)
+		decPath, err := item.Path.Decrypt(prefixKey)
 		if err != nil {
 			return nil, false, err
 		}