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

Jump to bottom

feat: Throw errors for URL paths without leading slashes, which will never match #1744

Merged
merged 6 commits into from Oct 22, 2019
Merged

feat: Throw errors for URL paths without leading slashes, which will never match #1744

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ced9e2c
This closes #1730 enforces the standard of passing a valid path as th…
Oct 14, 2019
f051290
backwards
Oct 14, 2019
683ddce
removed regex in favor of a more readable solution using method start…
Oct 17, 2019
ddfef78
code comment, condition position, unit test description update
Oct 20, 2019
1ef6820
fix: #1744 test description updates for clearer understanding what is…
Oct 21, 2019
8bf52c4
Merge branch 'master' into empty-string-1730
paulmelnikow Oct 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 9 additions & 3 deletions lib/interceptor.js
View file
Open in desktop
Expand Up @@ -31,8 +31,14 @@ module.exports = class Interceptor {
constructor(scope, uri, method, requestBody, interceptorOptions) {
const uriIsStr = typeof uri === 'string'
// Check for leading slash. Uri can be either a string or a regexp, but
// we only need to check strings.
if (uriIsStr && /^[^/*]/.test(uri)) {
// When enabled filteringScope ignores the passed URL entirely so we skip validation.

if (
!scope.scopeOptions.filteringScope &&
uriIsStr &&
!uri.startsWith('/') &&
!uri.startsWith('*')
) {
throw Error(
`Non-wildcard URL path strings must begin with a slash (otherwise they won't match anything) (got: ${uri})`
)
Expand Down Expand Up @@ -224,7 +230,7 @@ module.exports = class Interceptor {
}

const method = (options.method || 'GET').toUpperCase()
let { path = '' } = options
let { path = '/' } = options
TLPcoder marked this conversation as resolved.
Show resolved Hide resolved
let matches
let matchKey
const { proto } = options
Expand Down
26 changes: 24 additions & 2 deletions tests/test_intercept.js
View file
Open in desktop
Expand Up @@ -1300,7 +1300,7 @@ test('match domain and path using regexp', t => {
// https://github.com/nock/nock/issues/1003
test('correctly parse request without specified path', t => {
const scope1 = nock('https://example.test')
.get('')
.get('/')
.reply(200)

https
Expand All @@ -1317,7 +1317,7 @@ test('correctly parse request without specified path', t => {

test('data is sent with flushHeaders', t => {
const scope1 = nock('https://example.test')
.get('')
.get('/')
.reply(200, 'this is data')

https
Expand All @@ -1334,6 +1334,28 @@ test('data is sent with flushHeaders', t => {
.flushHeaders()
})

// https://github.com/nock/nock/issues/1730
test('incorrect URL structure is passed to http verb method', t => {
paulmelnikow marked this conversation as resolved.
Show resolved Hide resolved
t.throws(() => nock('http://example.test').get(''), {
message:
"Non-wildcard URL path strings must begin with a slash (otherwise they won't match anything) (got: )",
})

t.end()
})

test('wildcard param URL should not throw error', t => {
nock('http://example.test').get('*')

t.end()
})

test('incorrect URL structure is passed but filteringScope option present should not throw error', t => {
paulmelnikow marked this conversation as resolved.
Show resolved Hide resolved
nock('http://example.test', { filteringScope: () => {} }).get('')

t.end()
})

test('no new keys were added to the global namespace', t => {
const leaks = Object.keys(global).filter(
key => !acceptableGlobalKeys.has(key)
Expand Down