Skip to content

Commit

Permalink
chore(dev): update TM agent and tests (#1742)
Browse files Browse the repository at this point in the history
  • Loading branch information
@calavera
calavera authored Jan 15, 2021
1 parent 814eb13 commit 9d7f83a
Show file tree
Hide file tree
Showing 5 changed files with 56 additions and 65 deletions.
30 changes: 15 additions & 15 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"@netlify/build": "^8.0.5",
"@netlify/config": "^3.0.1",
"@netlify/plugin-edge-handlers": "^1.10.0",
"@netlify/traffic-mesh-agent": "^0.27.0",
"@netlify/traffic-mesh-agent": "^0.27.8",
"@netlify/zip-it-and-ship-it": "^2.0.0",
"@oclif/command": "^1.6.1",
"@oclif/config": "^1.15.1",
Expand Down
2 changes: 2 additions & 0 deletions src/commands/dev/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@ const startProxyServer = async ({ flags, settings, site, log, exit, addonsUrls }
log,
debug: flags.debug,
locationDb: flags.locationDb,
jwtRolesPath: settings.jwtRolePath,
jwtSecret: settings.jwtSecret,
})
if (!url) {
log(NETLIFYDEVERR, `Unable to start forward proxy on port '${settings.port}'`)
Expand Down
20 changes: 19 additions & 1 deletion src/utils/traffic-mesh.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,17 @@ const { NETLIFYDEVLOG, NETLIFYDEVERR, NETLIFYDEVWARN } = require('./logo')

const EDGE_HANDLERS_BUNDLER_CLI_PATH = path.resolve(require.resolve('@netlify/plugin-edge-handlers'), '..', 'cli.js')

const startForwardProxy = async ({ port, frameworkPort, functionsPort, publishDir, log, debug, locationDb }) => {
const startForwardProxy = async ({
port,
frameworkPort,
functionsPort,
publishDir,
log,
debug,
locationDb,
jwtRolesPath,
jwtSecret,
}) => {
const args = [
'start',
'local',
Expand Down Expand Up @@ -44,6 +54,14 @@ const startForwardProxy = async ({ port, frameworkPort, functionsPort, publishDi
args.push('--geo', locationDb)
}

if (jwtRolesPath) {
args.push('--jwt-roles-path', jwtRolesPath)
}

if (jwtSecret) {
args.push('--signature-secret', jwtSecret)
}

const { subprocess } = runProcess({ log, args })
const { forwarder, firstBundleReady } = forwardMessagesToLog({ log, subprocess })

Expand Down
67 changes: 19 additions & 48 deletions tests/command.dev.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,22 +66,25 @@ const setupRoleBasedRedirectsSite = (builder) => {
}

const validateRoleBasedRedirectsSite = async ({ builder, args, t, jwtSecret, jwtRolePath }) => {
const adminToken = getToken({ jwtSecret, jwtRolePath, roles: ['admin'] })
const editorToken = getToken({ jwtSecret, jwtRolePath, roles: ['editor'] })

await withDevServer({ cwd: builder.directory, args }, async (server) => {
const unauthenticatedResponse = await gotCatch404(`${server.url}/admin`)
t.is(unauthenticatedResponse.statusCode, 404)
t.is(unauthenticatedResponse.body, 'Not Found')

const authenticatedResponse = await got(`${server.url}/admin/foo`, {
headers: {
cookie: `nf_jwt=${getToken({ jwtSecret, jwtRolePath, roles: ['admin'] })}`,
cookie: `nf_jwt=${adminToken}`,
},
})
t.is(authenticatedResponse.statusCode, 200)
t.is(authenticatedResponse.body, 'Not Found')

const wrongRoleResponse = await gotCatch404(`${server.url}/admin/foo`, {
headers: {
cookie: `nf_jwt=${getToken({ jwtSecret, jwtRolePath, roles: ['editor'] })}`,
cookie: `nf_jwt=${editorToken}`,
},
})
t.is(wrongRoleResponse.statusCode, 404)
Expand All @@ -107,7 +110,7 @@ testMatrix.forEach(({ args }) => {
})

test(testName('should return user defined headers when / is accessed', args), async (t) => {
await withSiteBuilder('site-with-index-file', async (builder) => {
await withSiteBuilder('site-with-headers-on-root', async (builder) => {
builder.withContentFile({
path: 'index.html',
content: '<h1>⊂◉‿◉つ</h1>',
Expand All @@ -127,7 +130,7 @@ testMatrix.forEach(({ args }) => {
})

test(testName('should return user defined headers when non-root path is accessed', args), async (t) => {
await withSiteBuilder('site-with-index-file', async (builder) => {
await withSiteBuilder('site-with-headers-on-non-root', async (builder) => {
builder.withContentFile({
path: 'foo/index.html',
content: '<h1>⊂◉‿◉つ</h1>',
Expand Down Expand Up @@ -345,15 +348,7 @@ testMatrix.forEach(({ args }) => {
await withDevServer({ cwd: builder.directory, args }, async (server) => {
const response = await got(`${server.url}/api/echo?ding=dong`).json()
t.is(response.body, undefined)
t.deepEqual(response.headers, {
accept: 'application/json',
'accept-encoding': 'gzip, deflate, br',
'client-ip': '127.0.0.1',
connection: 'close',
host: `${server.host}:${server.port}`,
'user-agent': 'got (https://github.com/sindresorhus/got)',
'x-forwarded-for': '::ffff:127.0.0.1',
})
t.is(response.headers.host, `${server.host}:${server.port}`)
t.is(response.httpMethod, 'GET')
t.is(response.isBase64Encoded, false)
t.is(response.path, '/api/echo')
Expand Down Expand Up @@ -392,17 +387,9 @@ testMatrix.forEach(({ args }) => {
.json()

t.is(response.body, 'some=thing')
t.deepEqual(response.headers, {
accept: 'application/json',
'accept-encoding': 'gzip, deflate, br',
'client-ip': '127.0.0.1',
connection: 'close',
host: `${server.host}:${server.port}`,
'content-type': 'application/x-www-form-urlencoded',
'content-length': '10',
'user-agent': 'got (https://github.com/sindresorhus/got)',
'x-forwarded-for': '::ffff:127.0.0.1',
})
t.is(response.headers.host, `${server.host}:${server.port}`)
t.is(response.headers['content-type'], 'application/x-www-form-urlencoded')
t.is(response.headers['content-length'], '10')
t.is(response.httpMethod, 'POST')
t.is(response.isBase64Encoded, false)
t.is(response.path, '/api/echo')
Expand Down Expand Up @@ -475,17 +462,9 @@ testMatrix.forEach(({ args }) => {
})
.json()

t.deepEqual(response.headers, {
accept: 'application/json',
'accept-encoding': 'gzip, deflate, br',
'client-ip': '127.0.0.1',
connection: 'close',
host: `${server.host}:${server.port}`,
'content-length': '164',
'content-type': `multipart/form-data; boundary=${expectedBoundary}`,
'user-agent': 'got (https://github.com/sindresorhus/got)',
'x-forwarded-for': '::ffff:127.0.0.1',
})
t.is(response.headers.host, `${server.host}:${server.port}`)
t.is(response.headers['content-type'], `multipart/form-data; boundary=${expectedBoundary}`)
t.is(response.headers['content-length'], '164')
t.is(response.httpMethod, 'POST')
t.is(response.isBase64Encoded, false)
t.is(response.path, '/api/echo')
Expand All @@ -496,7 +475,7 @@ testMatrix.forEach(({ args }) => {
})

test(testName('should return 404 when redirecting to a non existing function', args), async (t) => {
await withSiteBuilder('site-with-multi-part-function', async (builder) => {
await withSiteBuilder('site-with-missing-function', async (builder) => {
builder.withNetlifyToml({
config: {
build: { functions: 'functions' },
Expand Down Expand Up @@ -579,17 +558,9 @@ testMatrix.forEach(({ args }) => {

const body = JSON.parse(response.body)

t.deepEqual(response.headers, {
accept: 'application/json',
'accept-encoding': 'gzip, deflate, br',
'client-ip': '127.0.0.1',
connection: 'close',
host: `${server.host}:${server.port}`,
'content-length': '276',
'content-type': 'application/json',
'user-agent': 'got (https://github.com/sindresorhus/got)',
'x-forwarded-for': '::ffff:127.0.0.1',
})
t.is(response.headers.host, `${server.host}:${server.port}`)
t.is(response.headers['content-length'], '276')
t.is(response.headers['content-type'], 'application/json')
t.is(response.httpMethod, 'POST')
t.is(response.isBase64Encoded, false)
t.is(response.path, '/')
Expand Down Expand Up @@ -1030,7 +1001,7 @@ testMatrix.forEach(({ args }) => {
})

test(testName('should not shadow an existing file that has unsafe URL characters', args), async (t) => {
await withSiteBuilder('site-with-same-name-for-file-and-folder', async (builder) => {
await withSiteBuilder('site-with-unsafe-url-file-names', async (builder) => {
builder
.withContentFile({
path: 'public/index.html',
Expand Down

0 comments on commit 9d7f83a

Please sign in to comment.