Bitmessage/bitmessage-js
2
0
Fork 1
Code Issues 1 Pull Requests 1 Actions Packages Releases Activity

Check max message payload length

Browse Source 
Relates: Bitmessage/PyBitmessage#767
This commit is contained in:
Kagami Hiiragi 2015-02-07 14:14:53 +03:00
parent 254fd196bf
commit f8327baf73
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -85,7 +85,7 @@ console.log("Deterministic Bitmessage address:", addr2.encode());
bitmessage - JavaScript Bitmessage library bitmessage - JavaScript Bitmessage library
Written in 2014 by Kagami Hiiragi <kagami@genshiken.org> Written in 2014-2015 by Kagami Hiiragi <kagami@genshiken.org>
To the extent possible under law, the author(s) have dedicated all copyright and related and neighboring rights to this software to the public domain worldwide. This software is distributed without any warranty. To the extent possible under law, the author(s) have dedicated all copyright and related and neighboring rights to this software to the public domain worldwide. This software is distributed without any warranty.

6
lib/structs.js
View File

@ -118,7 +118,7 @@ var message = exports.message = {
// Payload length. // Payload length.
var payloadLength = buf.readUInt32BE(16, true); var payloadLength = buf.readUInt32BE(16, true);
var msgLength = 24 + payloadLength; var msgLength = 24 + payloadLength;
// See also: <https://github.com/Bitmessage/PyBitmessage/issues/767>. // See: <https://github.com/Bitmessage/PyBitmessage/issues/767>.
if (payloadLength > 1600003) { if (payloadLength > 1600003) {
res.error = new Error("Message is too large, skipping it"); res.error = new Error("Message is too large, skipping it");
if (buf.length > msgLength) { if (buf.length > msgLength) {
@ -193,6 +193,7 @@ var message = exports.message = {
// than default "utf-8" encoding. // than default "utf-8" encoding.
command = command.slice(0, firstNonNull).toString("ascii"); command = command.slice(0, firstNonNull).toString("ascii");
var payloadLength = buf.readUInt32BE(16, true); var payloadLength = buf.readUInt32BE(16, true);
assert(payloadLength <= 1600003, "Message payload is too big");
var length = 24 + payloadLength; var length = 24 + payloadLength;
assert(buf.length >= length, "Truncated payload"); assert(buf.length >= length, "Truncated payload");
var checksum = buf.slice(20, 24); var checksum = buf.slice(20, 24);
@ -217,6 +218,7 @@ var message = exports.message = {
if (!payload) { if (!payload) {
payload = new Buffer(0); payload = new Buffer(0);
} }
assert(payload.length <= 1600003, "Message payload is too big");
var buf = new Buffer(24 + payload.length); var buf = new Buffer(24 + payload.length);
buf.fill(0); buf.fill(0);
buf.writeUInt32BE(message.MAGIC, 0, true); buf.writeUInt32BE(message.MAGIC, 0, true);
@ -558,7 +560,7 @@ function inet_pton(str) {
var buf = new Buffer(16); var buf = new Buffer(16);
buf.fill(0); buf.fill(0);
// IPv4-mapped IPv6. // IPv4-mapped IPv6.
if (str.indexOf("::ffff:") === 0) { if (str.slice(0, 7) === "::ffff:") {
str = str.slice(7); str = str.slice(7);
} }
// IPv4. // IPv4.

10
tests/unit.js
View File

@ -173,6 +173,16 @@ describe("Common structures", function() {
expect(res.rest.readUInt32BE(0)).to.equal(message.MAGIC); expect(res.rest.readUInt32BE(0)).to.equal(message.MAGIC);
expect(res).to.not.have.property("message"); expect(res).to.not.have.property("message");
}); });
it("should check for max payload length", function() {
var fn = message.encode.bind(null, "test", Buffer(2000000));
expect(fn).to.throw(/payload is too big/i);
var bigmsg = message.encode("test");
bigmsg.writeUInt32BE(2000000, 16);
fn = message.decode.bind(null, bigmsg);
expect(fn).to.throw(/payload is too big/i);
});
}); });
describe("object", function() { describe("object", function() {