Skip to content

Add CORS headers to response from cache #499

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

Merged
eduardoboucas merged 1 commit into from
Aug 21, 2019
Merged

Add CORS headers to response from cache #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions dadi/lib/cache/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,10 @@ Cache.prototype.init = function () {
return next()
}

// Add standard cache response headers and configured CORS headers.
const configuredHeaders = config.get('headers').cors || {}
const headers = {
...configuredHeaders,
'X-Cache-Lookup': 'HIT',
'X-Cache': 'HIT',
'Content-Type': contentType,
Expand All @@ -243,6 +246,10 @@ Cache.prototype.init = function () {
'public, max-age=86400'
}

if (headers['Access-Control-Allow-Origin'] && headers['Access-Control-Allow-Origin'] !== '*') {
headers['Vary'] = 'Origin'
}

// Add compression headers
if (shouldCompress) headers['Content-Encoding'] = shouldCompress

Expand Down
117 changes: 117 additions & 0 deletions test/acceptance/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,123 @@ describe('Application', () => {
})
})

describe('CORS', () => {
it('should return CORS headers when not found in cache', done => {
const clientHost = `http://${config.get('server.host')}:${config.get(
'server.port'
)}`
const apiHost = `http://${config.get('api').host}:${
config.get('api').port
}`

const client = request(clientHost)
const endpoint1 =
'/1.0/library/categories?count=20&page=1&filter=%7B%22name%22:%22Crime%22%7D&fields=%7B%22name%22:1%7D&sort=%7B%22name%22:1%7D'
const scope2 = nock(apiHost)
.get(endpoint1)
.reply(200, JSON.stringify({ results: [{ name: 'Crime' }] }))

// create page 1
const page1 = page('page1', TestHelper.getPageSchema())
page1.datasources = ['categories']
page1.template = 'test.js'
page1.routes[0].path = '/categories/:category'
page1.events = []

const pages = []
pages.push(page1)

const headers = {
cors: {
'Access-Control-Allow-Origin': '*'
}
}

TestHelper.enableApiConfig().then(() => {
TestHelper.updateConfig({ headers })
.then(() => {
TestHelper.startServer(pages).then(() => {
client.get('/categories/Crime').end((err, res) => {
if (err) return done(err)
should.exist(res.headers['access-control-allow-origin'])
res.headers['access-control-allow-origin'].should.eql('*')
res.text.should.eql('<h3>Crime</h3>')

done()
})
})
})
.catch(err => {
console.log('err :', err)
})
})
})

it('should return CORS headers when found in cache', done => {
const clientHost = `http://${config.get('server.host')}:${config.get(
'server.port'
)}`
const apiHost = `http://${config.get('api').host}:${
config.get('api').port
}`

const client = request(clientHost)
const endpoint1 =
'/1.0/library/categories?count=20&page=1&filter=%7B%22name%22:%22Crime%22%7D&fields=%7B%22name%22:1%7D&sort=%7B%22name%22:1%7D'
const scope2 = nock(apiHost)
.get(endpoint1)
.reply(200, JSON.stringify({ results: [{ name: 'Crime' }] }))

// create page 1
const page1 = page('page1', TestHelper.getPageSchema())
page1.datasources = ['categories']
page1.template = 'test.js'
page1.routes[0].path = '/categories/:category'
page1.events = []

const pages = []
pages.push(page1)

const headers = {
cors: {
'Access-Control-Allow-Origin': '*'
}
}

TestHelper.enableApiConfig().then(() => {
TestHelper.updateConfig({ headers })
.then(() => {
TestHelper.startServer(pages).then(() => {
client.get('/categories/Crime').end((err, res) => {
if (err) return done(err)
should.exist(res.headers['x-cache'])
res.headers['x-cache'].should.eql('MISS')

should.exist(res.headers['access-control-allow-origin'])
res.headers['access-control-allow-origin'].should.eql('*')
res.text.should.eql('<h3>Crime</h3>')

client.get('/categories/Crime').end((err, res) => {
if (err) return done(err)
should.exist(res.headers['x-cache'])
res.headers['x-cache'].should.eql('HIT')

should.exist(res.headers['access-control-allow-origin'])
res.headers['access-control-allow-origin'].should.eql('*')
res.text.should.eql('<h3>Crime</h3>')

done()
})
})
})
})
.catch(err => {
console.log('err :', err)
})
})
})
})

describe('Status Endpoint', () => {
describe('GET', () => {
it('should return 405 error', done => {
Expand Down