jonny
/
Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix handling of 206 status code in updater

This commit is contained in:
Fedor Indutny 2022-04-26 16:58:29 -07:00 committed by GitHub
parent c8842d94ec
commit 0a24ca8d88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ts/test-node/updater/differential_test.ts
View File

@ -112,7 +112,7 @@ describe('updater/differential', () => {
});
if (ranges.length === 1) {
res.writeHead(200, {
res.writeHead(206, {
'content-type': 'application/octet-stream',
});
if (shouldTimeout === 'response') {

23
ts/updater/differential.ts
View File

@ -386,8 +386,14 @@ export async function downloadRanges(
'response'
);
// When the result is single range we might get 200 status code
if (ranges.length === 1 && statusCode === 200) {
strictAssert(statusCode === 206, `Invalid status code: ${statusCode}`);
const match = headers['content-type']?.match(
/^multipart\/byteranges;\s*boundary=([^\s;]+)/
);
// When the result is single range we might non-multipart response
if (ranges.length === 1 && !match) {
await saveDiffStream({
diff: ranges[0],
stream,
@ -398,13 +404,6 @@ export async function downloadRanges(
return;
}
strictAssert(statusCode === 206, `Invalid status code: ${statusCode}`);
const match = headers['content-type']?.match(
/^multipart\/byteranges;\s*boundary=([^\s;]+)/
);
strictAssert(match, `Invalid Content-Type: ${headers['content-type']}`);
// eslint-disable-next-line prefer-destructuring
boundary = match[1];
} catch (error) {
@ -511,6 +510,12 @@ async function saveDiffStream({
await output.write(chunk, 0, chunk.length, offset + diff.writeOffset);
offset += chunk.length;
// Check for signal again so that we don't invoke status callback when
// aborted.
if (abortSignal?.aborted) {
return;
}
chunkStatusCallback(chunk.length);
}