Merge remote-tracking branch 'upstream/master'

This commit is contained in:
fisch0920 2014-05-15 06:31:58 -04:00
commit 6857b65d0b
3 changed files with 4 additions and 6 deletions

View File

@ -36,8 +36,7 @@ module.exports = function (metadata) {
// if buffer fails to decode or there is no info key, then metadata is corrupt // if buffer fails to decode or there is no info key, then metadata is corrupt
info = bncode.encode(bncode.decode(metadata).info) info = bncode.encode(bncode.decode(metadata).info)
} catch (err) { } catch (err) {
// TODO: throw or disregard invalid metadata? throw new Error('`ut_metadata` constructed with corrupt/invalid metadata')
//throw new Error('ut_metadata constructed with invalid metadata')
} }
if (info) if (info)

View File

@ -1,7 +1,7 @@
{ {
"name": "ut_metadata", "name": "ut_metadata",
"description": "Extension for Peers to Send Metadata Files (BEP 9)", "description": "Extension for Peers to Send Metadata Files (BEP 9)",
"version": "1.4.0", "version": "2.0.1",
"author": { "author": {
"name": "Feross Aboukhadijeh", "name": "Feross Aboukhadijeh",
"email": "feross@feross.org", "email": "feross@feross.org",

View File

@ -122,7 +122,7 @@ test('fetch() large torrent', function (t) {
} else if (ext === 'ut_metadata') { } else if (ext === 'ut_metadata') {
// note: this should get called twice, once for each block of the ubuntu metadata // note: this should get called twice, once for each block of the ubuntu metadata
t.pass('got extended ut_metadata message') t.pass('got extended ut_metadata message')
// this is emitted for consistency's sake, but it's ignored // this is emitted for consistency's sake, but it's ignored
// by the user since the ut_metadata package handles the // by the user since the ut_metadata package handles the
// complexities internally // complexities internally
@ -142,7 +142,7 @@ test('discard invalid metadata', function (t) {
wire1.pipe(wire2).pipe(wire1) wire1.pipe(wire2).pipe(wire1)
var invalidMetadata = metadata.slice(0) var invalidMetadata = metadata.slice(0)
invalidMetadata[0] = 99 // mess up the first byte of the metadata invalidMetadata[55] = 65 // mess up a byte in the info block
wire1.use(ut_metadata(invalidMetadata)) wire1.use(ut_metadata(invalidMetadata))
wire2.use(ut_metadata()) wire2.use(ut_metadata())
@ -163,4 +163,3 @@ test('discard invalid metadata', function (t) {
wire1.handshake(parsedTorrent.infoHash, id1) wire1.handshake(parsedTorrent.infoHash, id1)
}) })