Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

return no-cache on 404 #2609

Merged
merged 4 commits into from
Feb 12, 2025
Merged

return no-cache on 404 #2609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0934860
return no-cache on 404
taoeffect Feb 11, 2025
de9264c
rename function, remove redundant no-cache
taoeffect Feb 12, 2025
a145c24
feedback
taoeffect Feb 12, 2025
a44b1e9
Should close #2572 - french classes heisenbug
taoeffect Feb 12, 2025
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
25 changes: 13 additions & 12 deletions backend/routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,12 @@ const route = new Proxy({}, {
}
})

// helper function that returns 404 and prevents client from caching the 404 response
// which can sometimes break things: https://github.com/okTurtles/group-income/issues/2608
function notFoundNoCache (h) {
return h.response().code(404).header('Cache-Control', 'no-store')
}

// RESTful API routes

// TODO: Update this regex once `chel` uses prefixed manifests
Expand Down Expand Up @@ -277,7 +283,7 @@ route.GET('/latestHEADinfo/{contractID}', {
const HEADinfo = await sbp('chelonia/db/latestHEADinfo', contractID)
if (!HEADinfo) {
console.warn(`[backend] latestHEADinfo not found for ${contractID}`)
return Boom.notFound()
return notFoundNoCache(h)
}
return HEADinfo
} catch (err) {
Expand Down Expand Up @@ -458,13 +464,7 @@ route.POST('/file', {

// Serve data from Chelonia DB.
// Note that a `Last-Modified` header isn't included in the response.
route.GET('/file/{hash}', {
cache: {
// Do not set other cache options here, to make sure the 'otherwise' option
// will be used so that the 'immutable' directive gets included.
otherwise: 'public,max-age=31536000,immutable'
}
}, async function (request, h) {
route.GET('/file/{hash}', {}, async function (request, h) {
const { hash } = request.params

if (hash.startsWith('_private')) {
Expand All @@ -473,9 +473,10 @@ route.GET('/file/{hash}', {

const blobOrString = await sbp('chelonia/db/get', `any:${hash}`)
if (!blobOrString) {
return Boom.notFound()
return notFoundNoCache(h)
}
return h.response(blobOrString).etag(hash)
return h.response(blobOrString).code(200).etag(hash)
.header('Cache-Control', 'public,max-age=31536000,immutable')
})

route.POST('/deleteFile/{hash}', {
Expand Down Expand Up @@ -675,7 +676,7 @@ route.GET('/kv/{contractID}/{key}', {

const result = await sbp('chelonia/db/get', `_private_kv_${contractID}_${key}`)
if (!result) {
return Boom.notFound()
return notFoundNoCache(h)
}

return h.response(result).etag(createCID(result))
Expand Down Expand Up @@ -804,7 +805,7 @@ route.GET('/zkpp/{name}/auth_hash', {
try {
const challenge = await getChallenge(req.params['name'], req.query['b'])

return challenge || Boom.notFound()
return challenge || notFoundNoCache(h)
} catch (e) {
e.ip = req.headers['x-real-ip'] || req.info.remoteAddress
console.error(e, 'Error at GET /zkpp/{name}/auth_hash: ' + e.message)
Expand Down
12 changes: 1 addition & 11 deletions test/cypress/integration/group-contributions.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,6 @@ function addNonMonetaryContribution (name) {
})
}

function assertNonMonetaryEditableValue (name) {
// Need to wait until the event is processed
cy.giEmptyInvocationQueue()

cy.getByDT('buttonEditNonMonetaryContribution').click()
cy.getByDT('inputNonMonetaryContribution').should('have.value', name)
cy.getByDT('buttonCancelNonMonetaryContribution').click()
}

function assertGraphicSummary (legendListItems) {
cy.getByDT('groupPledgeSummary', 'ul').within(([list]) => {
legendListItems.forEach((legendText, index) => {
Expand Down Expand Up @@ -373,8 +364,7 @@ describe('Contributions', () => {
cy.getByDT('buttonEditNonMonetaryContribution').click()
cy.getByDT('inputNonMonetaryContribution').clear()
cy.getByDT('inputNonMonetaryContribution').type('French classes{enter}')
assertNonMonetaryEditableValue('French classes')

cy.giEmptyInvocationQueue() // wait for edits to go through
cy.getByDT('givingList', 'ul')
.get('li.is-editable')
.should('have.length', 1)
Expand Down