goldcollection
/
muwire
mirror of https://github.com/zlatinb/muwire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add upper bounds to the file length and piece size

pull/24/head
Zlatin Balevsky 2019-10-28 23:25:32 +00:00
parent 2320d650f6
commit f6ee49c0f5
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/groovy/com/muwire/core/files/FileHasher.groovy
View File

@ -13,8 +13,9 @@ import java.security.NoSuchAlgorithmException
class FileHasher {
public static final int MAX_PIECE_SIZE_POW2 = 37
/** max size of shared file is 128 GB */
public static final long MAX_SIZE = 0x1L << 37
public static final long MAX_SIZE = 0x1L << MAX_PIECE_SIZE_POW2
/**
* @param size of the file to be shared
@ -26,7 +27,7 @@ class FileHasher {
if (size <= 0x1 << 30)
return 17
for (int i = 31; i <= 37; i++) {
for (int i = 31; i <= MAX_PIECE_SIZE_POW2; i++) {
if (size <= 0x1L << i) {
return i-13
}

17
core/src/main/groovy/com/muwire/core/search/ResultsParser.groovy
View File

@ -6,6 +6,7 @@ import javax.naming.directory.InvalidSearchControlsException
import com.muwire.core.InfoHash
import com.muwire.core.Persona
import com.muwire.core.files.FileHasher
import com.muwire.core.util.DataUtil
import net.i2p.data.Base64
@ -30,12 +31,12 @@ class ResultsParser {
private static parseV1(Persona p, UUID uuid, def json) {
if (json.name == null)
throw new InvalidSearchResultException("name missing")
if (json.size == null || json.size <= 0)
throw new InvalidSearchResultException("length missing")
if (json.size == null || json.size <= 0 || json.size > FileHasher.MAX_SIZE)
throw new InvalidSearchResultException("length missing or invalid, $json.size")
if (json.infohash == null)
throw new InvalidSearchResultException("infohash missing")
if (json.pieceSize == null || json.pieceSize <= 0)
throw new InvalidSearchResultException("pieceSize missing")
if (json.pieceSize == null || json.pieceSize <= 0 || json.pieceSize > FileHasher.MAX_PIECE_SIZE_POW2)
throw new InvalidSearchResultException("pieceSize missing or invalid, $json.pieceSize")
if (!(json.hashList instanceof List))
throw new InvalidSearchResultException("hashlist not a list")
try {
@ -71,12 +72,12 @@ class ResultsParser {
private static UIResultEvent parseV2(Persona p, UUID uuid, def json) {
if (json.name == null)
throw new InvalidSearchResultException("name missing")
if (json.size == null || json.size <= 0)
throw new InvalidSearchResultException("length missing")
if (json.size == null || json.size <= 0 || json.size > FileHasher.MAX_SIZE)
throw new InvalidSearchResultException("length missing or invalid $json.size")
if (json.infohash == null)
throw new InvalidSearchResultException("infohash missing")
if (json.pieceSize == null || json.pieceSize <= 0)
throw new InvalidSearchResultException("pieceSize missing")
if (json.pieceSize == null || json.pieceSize <= 0 || json.pieceSize > FileHasher.MAX_PIECE_SIZE_POW2)
throw new InvalidSearchResultException("pieceSize missing or invalid, $json.pieceSize")
if (json.hashList != null)
throw new InvalidSearchResultException("V2 result with hashlist")
try {