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
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@ const corsMiddleware = require('restify-cors-middleware')

const cors = corsMiddleware({
preflightMaxAge: 5, //Optional
origins: ['http://api.myapp.com', 'http://web.myapp.com'],
allowHeaders: ['API-Token'],
exposeHeaders: ['API-Token-Expiry']
credentials: true, //Optional, default false
origins: ['http://api.myapp.com', 'http://web.myapp.com'], //Optional, default ['*']
allowHeaders: ['API-Token'], //Optional, default []
exposeHeaders: ['API-Token-Expiry'] //Optional, default []
})

server.pre(cors.preflight)
Expand Down
23 changes: 15 additions & 8 deletions src/origin-matcher.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,27 @@ exports.create = function (allowedOrigins) {
// does a given request Origin match the list?
return function (requestOrigin) {
if (requestOrigin) {
return matchers.some(matcher => matcher(requestOrigin))
} else {
return false
return matchers.some(function (matcher) {
return matcher(requestOrigin)
})
}

return false
}
}

function createMatcher (allowedOrigin) {
if (allowedOrigin.indexOf('*') === -1) {
// simple string comparison
return requestOrigin => requestOrigin === allowedOrigin
} else {
// need to build a regex
var regex = '^' + allowedOrigin.replace('.', '\\.').replace('*', '.*') + '$'
return requestOrigin => requestOrigin.match(regex)
return function (requestOrigin) {
return requestOrigin === allowedOrigin
}
}

// need to build a regex
var regex = '^' + allowedOrigin.replace('.', '\\.').replace('*', '.*') + '$'

return function (requestOrigin) {
return requestOrigin.match(regex)
}
}