Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

remove sort from get_stream_hash

Browse source 
error on zero length data blobs or a non-zero length stream terminator blob
This commit is contained in:
Jack Robison 2018-02-21 16:34:48 -05:00
parent 0904c74273
commit 3e6b00ad00
No known key found for this signature in database
GPG key ID: DF25C68FE0239BB2
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lbrynet/core/StreamDescriptor.py
View file

@ -358,13 +358,14 @@ def get_stream_hash(hex_stream_name, key, hex_suggested_file_name, blob_infos):
h.update(key) h.update(key)
h.update(hex_suggested_file_name) h.update(hex_suggested_file_name)
blobs_hashsum = get_lbry_hash_obj() blobs_hashsum = get_lbry_hash_obj()
sorted_blob_infos = sorted(blob_infos, key=lambda x: x['blob_num']) if any(blob['length'] for blob in blob_infos if blob['length'] <= 0):
for blob in sorted_blob_infos: raise InvalidStreamDescriptorError("Contains invalid length data blobs")
blobs_hashsum.update(get_blob_hashsum(blob)) if blob_infos[-1]['length'] != 0:
if sorted_blob_infos[-1]['length'] != 0:
raise InvalidStreamDescriptorError("Does not end with a zero-length blob.") raise InvalidStreamDescriptorError("Does not end with a zero-length blob.")
if 'blob_hash' in sorted_blob_infos[-1]: if 'blob_hash' in blob_infos[-1]:
raise InvalidStreamDescriptorError("Stream terminator blob should not have a hash") raise InvalidStreamDescriptorError("Stream terminator blob should not have a hash")
for blob in blob_infos:
blobs_hashsum.update(get_blob_hashsum(blob))
h.update(blobs_hashsum.digest()) h.update(blobs_hashsum.digest())
return h.hexdigest() return h.hexdigest()