JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix downloading non encrypted segments (#2870)

Browse Source
This commit is contained in:
Michal Niewrzal 2019-08-29 10:00:20 +02:00 committed by GitHub
parent b4d7d6778f
commit 5fb823843f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
satellite/metainfo/metainfo.go
View File

@ -1715,28 +1715,29 @@ func (endpoint *Endpoint) DownloadSegment(ctx context.Context, req *pb.SegmentDo
var encryptedKeyNonce storj.Nonce
var encryptedKey []byte
if len(pointer.Metadata) != 0 {
segmentMeta := pb.SegmentMeta{}
var segmentMeta *pb.SegmentMeta
if req.CursorPosition.Index == lastSegment {
streamMeta := &pb.StreamMeta{}
err = proto.Unmarshal(pointer.Metadata, streamMeta)
if err != nil {
return nil, status.Error(codes.Internal, err.Error())
}
segmentMeta = *streamMeta.LastSegmentMeta
segmentMeta = streamMeta.LastSegmentMeta
} else {
err = proto.Unmarshal(pointer.Metadata, &segmentMeta)
err = proto.Unmarshal(pointer.Metadata, segmentMeta)
if err != nil {
return nil, status.Error(codes.Internal, err.Error())
}
}
if segmentMeta != nil {
encryptedKeyNonce, err = storj.NonceFromBytes(segmentMeta.KeyNonce)
if err != nil {
endpoint.log.Error("unable to get encryption key nonce from metadata", zap.Error(err))
return nil, status.Error(codes.Internal, err.Error())
}
encryptedKeyNonce, err = storj.NonceFromBytes(segmentMeta.KeyNonce)
if err != nil {
endpoint.log.Error("unable to get encryption key nonce from metadata", zap.Error(err))
return nil, status.Error(codes.Internal, err.Error())
encryptedKey = segmentMeta.EncryptedKey
}
encryptedKey = segmentMeta.EncryptedKey
}
if pointer.Type == pb.Pointer_INLINE {