Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions packages/sirv/index.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,16 @@ function send(req, res, file, stats, headers) {
if (req.headers.range) {
code = 206;
let [x, y] = req.headers.range.replace('bytes=', '').split('-');
let end = opts.end = parseInt(y, 10) || stats.size - 1;
let start = opts.start = parseInt(x, 10) || 0;
let parsedY = parseInt(y, 10);
let parsedX = parseInt(x, 10);
let end = opts.end = (Number.isSafeInteger(parsedY) && parsedY > 0) ? parsedY : stats.size - 1;
let start = opts.start = (Number.isSafeInteger(parsedX) && parsedX >= 0) ? parsedX : 0;

if (end >= stats.size) {
end = stats.size - 1;
end = opts.end = stats.size - 1;
}

if (start >= stats.size) {
if (start >= stats.size || start > end) {
res.setHeader('Content-Range', `bytes */${stats.size}`);
res.statusCode = 416;
return res.end();
Expand Down
46 changes: 46 additions & 0 deletions tests/sirv.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -1100,6 +1100,52 @@ ranges('should shrink range end if it cannot be met (overflow)', async () => {
}
});

// Regression: a malformed `Range` end larger than `Number.MAX_SAFE_INTEGER`
// (e.g. `2^64-1` from a bot probe) used to crash the process because the
// lexical `end` variable was clamped but `opts.end` retained the unsafe
// value, which `fs.createReadStream({ end })` rejects with `RangeError`.
ranges('should clamp range end above MAX_SAFE_INTEGER without crashing', async () => {
let server = utils.http();

try {
let headers = { Range: 'bytes=0-18446744073709551615' };
let file = await utils.lookup('bundle.67329.js', 'utf8');
let res = await server.send('GET', '/bundle.67329.js', { headers });
assert.is(res.statusCode, 206);
assert.is(res.headers['content-range'], `bytes 0-${file.size - 1}/${file.size}`);
} finally {
server.close();
}
});

ranges('should fall back to a full-file response when range start is above MAX_SAFE_INTEGER', async () => {
let server = utils.http();

try {
let headers = { Range: 'bytes=18446744073709551615-' };
let file = await utils.lookup('bundle.67329.js', 'utf8');
let res = await server.send('GET', '/bundle.67329.js', { headers });
assert.is(res.statusCode, 206);
assert.is(res.headers['content-range'], `bytes 0-${file.size - 1}/${file.size}`);
} finally {
server.close();
}
});

ranges('should treat a non-numeric range as a full-file request', async () => {
let server = utils.http();

try {
let headers = { Range: 'bytes=abc-def' };
let file = await utils.lookup('bundle.67329.js', 'utf8');
let res = await server.send('GET', '/bundle.67329.js', { headers });
assert.is(res.statusCode, 206);
assert.is(res.headers['content-range'], `bytes 0-${file.size - 1}/${file.size}`);
} finally {
server.close();
}
});

ranges('should not mutate response headers on subsequent non-Range requests :: dev', async () => {
let server = utils.http({ dev: true });

Expand Down