github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-02-20 22:21:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #19668 from overleaf/jpa-file-not-found-404

Browse source 
[web] entity not found when downloading file yields 404

GitOrigin-RevId: e6a2a7cf60f717fae53a42f39efb65f1624f71bb
This commit is contained in:
Alf Eaton 2024-08-02 09:13:00 +01:00 committed by Copybot
parent 603ff28df0
commit 0f2aaa6c0c
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
services/web/app/src/Features/FileStore/FileStoreController.js
View file

@ -15,18 +15,21 @@ module.exports = {
{ project_id: projectId, element_id: fileId, type: 'file' },
function (err, file) {
if (err) {
if (err.name === 'NotFoundError') {
if (err instanceof Errors.NotFoundError) {
logger.warn(
{ err, projectId, fileId, queryString },
'entity not found when downloading file'
)
// res.sendStatus() sends a description of the status as body.
// Using res.status().end() avoids sending that fake body.
return res.status(404).end()
} else {
logger.err(
{ err, projectId, fileId, queryString },
'error finding element for downloading file'
)
return res.status(500).end()
}
return res.sendStatus(500)
}
FileStoreHandler.getFileStream(
projectId,

9
services/web/test/unit/src/FileStore/FileStoreControllerTests.js
View file

@ -93,6 +93,15 @@ describe('FileStoreController', function () {
this.controller.getFile(this.req, this.res)
})
it('should return a 404 when not found', function (done) {
this.res.callback = () => {
expect(this.res.statusCode).to.equal(404)
done()
}
this.ProjectLocator.findElement.yields(new Errors.NotFoundError())
this.controller.getFile(this.req, this.res)
})
// Test behaviour around handling html files
;['.html', '.htm', '.xhtml'].forEach(extension => {
describe(`with a '${extension}' file extension`, function () {