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
5 changes: 5 additions & 0 deletions .changeset/fix-avatar-zero-size-header.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fix `Content-Length` header being omitted when avatar file size is zero, violating HTTP spec.
13 changes: 13 additions & 0 deletions apps/meteor/server/routes/avatar/utils.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,19 @@ describe('#serveAvatarFile()', () => {
expect(response.setHeader.getCall(3).calledWith('Content-Length', file.size)).to.be.true;
expect(mocks.fileUploadGet.calledWith(file, request, response, next)).to.be.true;
});

it('should serve avatar and set Content-Length 0 when file size is exactly 0', () => {
const zeroSizeFile = { uploadedAt: new Date(0), type: 'image/png', size: 0 };
const request = { headers: { 'if-modified-since': new Date(200000).toUTCString() } };
serveAvatarFile(zeroSizeFile, request, response, next);

const contentLengthCall = response.setHeader.getCalls().find(
(c) => c.args[0] === 'Content-Length'
);

expect(contentLengthCall).to.exist;
expect(contentLengthCall?.args[1]).to.equal(0);
});
});

describe('#serveSvgAvatarInRequestedFormat()', () => {
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/server/routes/avatar/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export const serveAvatarFile = (file: IUpload, req: IIncomingMessage, res: Serve
res.setHeader('Content-Type', file.type);
}

if (file.size) {
if (typeof file.size === 'number') {
res.setHeader('Content-Length', file.size);
}

Expand Down