Skip to content

Commit

Permalink
fix #151 Wildcard route should not be blocked by Parametric with diff… (
Browse files Browse the repository at this point in the history
  • Loading branch information
dylannil authored and delvedor committed May 18, 2020
1 parent a5d041f commit b4cb4f5
Show file tree
Hide file tree
Showing 4 changed files with 77 additions and 3 deletions.
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const isRegexSafe = require('safe-regex2')
const Node = require('./node')
const NODE_TYPES = Node.prototype.types
const httpMethods = http.METHODS
const FULL_PATH_REGEXP = /^https?:\/\/.*\//
const FULL_PATH_REGEXP = /^https?:\/\/.*?\//

if (!isRegexSafe(FULL_PATH_REGEXP)) {
throw new Error('the FULL_PATH_REGEXP is not safe, update this module')
Expand Down
14 changes: 12 additions & 2 deletions node.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,12 @@ Node.prototype.findChild = function (path, method) {
}
}

child = this.children[':'] || this.children['*']
child = this.children[':']
if (child !== undefined && (child.numberOfChildren > 0 || child.handlers[method] !== null)) {
return child
}

child = this.children['*']
if (child !== undefined && (child.numberOfChildren > 0 || child.handlers[method] !== null)) {
return child
}
Expand All @@ -138,7 +143,12 @@ Node.prototype.findVersionChild = function (version, path, method) {
}
}

child = this.children[':'] || this.children['*']
child = this.children[':']
if (child !== undefined && (child.numberOfChildren > 0 || child.getVersionHandler(version, method) !== null)) {
return child
}

child = this.children['*']
if (child !== undefined && (child.numberOfChildren > 0 || child.getVersionHandler(version, method) !== null)) {
return child
}
Expand Down
9 changes: 9 additions & 0 deletions test/full-url.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,16 @@ findMyWay.on('GET', '/a', (req, res) => {
res.end('{"message":"hello world"}')
})

findMyWay.on('GET', '/a/:id', (req, res) => {
res.end('{"message":"hello world"}')
})

t.deepEqual(findMyWay.find('GET', 'http://localhost/a'), findMyWay.find('GET', '/a'))
t.deepEqual(findMyWay.find('GET', 'http://localhost:8080/a'), findMyWay.find('GET', '/a'))
t.deepEqual(findMyWay.find('GET', 'http://123.123.123.123/a'), findMyWay.find('GET', '/a'))
t.deepEqual(findMyWay.find('GET', 'https://localhost/a'), findMyWay.find('GET', '/a'))

t.deepEqual(findMyWay.find('GET', 'http://localhost/a/100'), findMyWay.find('GET', '/a/100'))
t.deepEqual(findMyWay.find('GET', 'http://localhost:8080/a/100'), findMyWay.find('GET', '/a/100'))
t.deepEqual(findMyWay.find('GET', 'http://123.123.123.123/a/100'), findMyWay.find('GET', '/a/100'))
t.deepEqual(findMyWay.find('GET', 'https://localhost/a/100'), findMyWay.find('GET', '/a/100'))
55 changes: 55 additions & 0 deletions test/issue-151.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
'use strict'

const t = require('tap')
const test = t.test
const FindMyWay = require('../')

test('Wildcard route should not be blocked by Parametric with different method / 1', t => {
t.plan(1)
const findMyWay = FindMyWay({
defaultRoute: (req, res) => {
t.fail('Should not be defaultRoute')
}
})

findMyWay.on('OPTIONS', '/*', (req, res, params) => {
t.fail('Should not be here')
})

findMyWay.on('OPTIONS', '/obj/*', (req, res, params) => {
t.strictEqual(req.method, 'OPTIONS')
})

findMyWay.on('GET', '/obj/:id', (req, res, params) => {
t.fail('Should not be GET')
})

findMyWay.lookup({ method: 'OPTIONS', url: '/obj/params', headers: {} }, null)
})

test('Wildcard route should not be blocked by Parametric with different method / 2', t => {
t.plan(1)
const findMyWay = FindMyWay({
defaultRoute: (req, res) => {
t.fail('Should not be defaultRoute')
}
})

findMyWay.on('OPTIONS', '/*', { version: '1.2.3' }, (req, res, params) => {
t.fail('Should not be here')
})

findMyWay.on('OPTIONS', '/obj/*', { version: '1.2.3' }, (req, res, params) => {
t.strictEqual(req.method, 'OPTIONS')
})

findMyWay.on('GET', '/obj/:id', { version: '1.2.3' }, (req, res, params) => {
t.fail('Should not be GET')
})

findMyWay.lookup({
method: 'OPTIONS',
url: '/obj/params',
headers: { 'accept-version': '1.2.3' }
}, null)
})

0 comments on commit b4cb4f5

Please sign in to comment.