Unverified Commit 6739ea39 authored by Piyush's avatar Piyush Committed by GitHub

Fix preview mode expiration duration (#12118)

parent a7bd2db9
...@@ -298,12 +298,14 @@ export function tryGetPreviewData( ...@@ -298,12 +298,14 @@ export function tryGetPreviewData(
const tokenPreviewData = cookies[COOKIE_NAME_PRERENDER_DATA] const tokenPreviewData = cookies[COOKIE_NAME_PRERENDER_DATA]
const jsonwebtoken = require('next/dist/compiled/jsonwebtoken') as typeof import('jsonwebtoken') const jsonwebtoken = require('next/dist/compiled/jsonwebtoken') as typeof import('jsonwebtoken')
let encryptedPreviewData: string let encryptedPreviewData: {
data: string
}
try { try {
encryptedPreviewData = jsonwebtoken.verify( encryptedPreviewData = jsonwebtoken.verify(
tokenPreviewData, tokenPreviewData,
options.previewModeSigningKey options.previewModeSigningKey
) as string ) as typeof encryptedPreviewData
} catch { } catch {
// TODO: warn // TODO: warn
clearPreviewData(res as NextApiResponse) clearPreviewData(res as NextApiResponse)
...@@ -312,7 +314,7 @@ export function tryGetPreviewData( ...@@ -312,7 +314,7 @@ export function tryGetPreviewData(
const decryptedPreviewData = decryptWithSecret( const decryptedPreviewData = decryptWithSecret(
Buffer.from(options.previewModeEncryptionKey), Buffer.from(options.previewModeEncryptionKey),
encryptedPreviewData encryptedPreviewData.data
) )
try { try {
...@@ -358,10 +360,12 @@ function setPreviewData<T>( ...@@ -358,10 +360,12 @@ function setPreviewData<T>(
const jsonwebtoken = require('next/dist/compiled/jsonwebtoken') as typeof import('jsonwebtoken') const jsonwebtoken = require('next/dist/compiled/jsonwebtoken') as typeof import('jsonwebtoken')
const payload = jsonwebtoken.sign( const payload = jsonwebtoken.sign(
encryptWithSecret( {
Buffer.from(options.previewModeEncryptionKey), data: encryptWithSecret(
JSON.stringify(data) Buffer.from(options.previewModeEncryptionKey),
), JSON.stringify(data)
),
},
options.previewModeSigningKey, options.previewModeSigningKey,
{ {
algorithm: 'HS256', algorithm: 'HS256',
......
...@@ -6,7 +6,14 @@ export default (req, res) => { ...@@ -6,7 +6,14 @@ export default (req, res) => {
return res.status(500).end('too big') return res.status(500).end('too big')
} }
} else { } else {
res.setPreviewData(req.query) res.setPreviewData(
req.query,
req.query.cookieMaxAge
? {
maxAge: req.query.cookieMaxAge,
}
: undefined
)
} }
res.status(200).end() res.status(200).end()
......
...@@ -93,6 +93,26 @@ function runTests(startServer = nextStart) { ...@@ -93,6 +93,26 @@ function runTests(startServer = nextStart) {
cookie.serialize('__next_preview_data', cookies[1].__next_preview_data) cookie.serialize('__next_preview_data', cookies[1].__next_preview_data)
}) })
it('should expire cookies with a maxAge', async () => {
const expiry = '60'
const res = await fetchViaHTTP(appPort, '/api/preview', {
cookieMaxAge: expiry,
})
expect(res.status).toBe(200)
const originalCookies = res.headers.get('set-cookie').split(',')
const cookies = originalCookies.map(cookie.parse)
expect(originalCookies.every(c => c.includes('; Secure;')))
expect(cookies.length).toBe(2)
expect(cookies[0]).toMatchObject({ Path: '/', SameSite: 'None' })
expect(cookies[0]).toHaveProperty('__prerender_bypass')
expect(cookies[0]['Max-Age']).toBe(expiry)
expect(cookies[1]).toMatchObject({ Path: '/', SameSite: 'None' })
expect(cookies[1]).toHaveProperty('__next_preview_data')
expect(cookies[1]['Max-Age']).toBe(expiry)
})
it('should not return fallback page on preview request', async () => { it('should not return fallback page on preview request', async () => {
const res = await fetchViaHTTP( const res = await fetchViaHTTP(
appPort, appPort,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment