netlify-cli 12.8.0 → 12.9.0

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "netlify-cli",
-  "version": "12.8.0",
+  "version": "12.9.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "netlify-cli",
-      "version": "12.8.0",
+      "version": "12.9.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -82,7 +82,7 @@
         "netlify-headers-parser": "^7.1.1",
         "netlify-onegraph-internal": "0.10.1",
         "netlify-redirect-parser": "^14.1.1",
-        "netlify-redirector": "^0.3.1",
+        "netlify-redirector": "^0.4.0",
         "node-fetch": "^2.6.0",
         "node-version-alias": "^1.0.1",
         "ora": "^5.0.0",
@@ -17610,9 +17610,9 @@
       }
     },
     "node_modules/netlify-redirector": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/netlify-redirector/-/netlify-redirector-0.3.1.tgz",
-      "integrity": "sha512-+8x07Ukx8vgKkGqTDq1GrkuCRR0DqheZ9fF5PXk6VbIChp9Qi8+psmwBV3hjocoyUvUGH7CIHLUk05aVwLN3wA=="
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/netlify-redirector/-/netlify-redirector-0.4.0.tgz",
+      "integrity": "sha512-ssD+V9o2DD9VnilOYC+34i07IrlY8XDsh5mN+qLYA4MxCpdALKXFICcz1KzsHZabuIS5XsF1VP/HzDyx5ubJ2g=="
     },
     "node_modules/netlify/node_modules/node-fetch": {
       "version": "3.3.0",
@@ -37423,9 +37423,9 @@
       }
     },
     "netlify-redirector": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/netlify-redirector/-/netlify-redirector-0.3.1.tgz",
-      "integrity": "sha512-+8x07Ukx8vgKkGqTDq1GrkuCRR0DqheZ9fF5PXk6VbIChp9Qi8+psmwBV3hjocoyUvUGH7CIHLUk05aVwLN3wA=="
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/netlify-redirector/-/netlify-redirector-0.4.0.tgz",
+      "integrity": "sha512-ssD+V9o2DD9VnilOYC+34i07IrlY8XDsh5mN+qLYA4MxCpdALKXFICcz1KzsHZabuIS5XsF1VP/HzDyx5ubJ2g=="
     },
     "next-tick": {
       "version": "1.1.0",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "12.8.0",
+  "version": "12.9.0",
   "author": "Netlify Inc.",
   "type": "module",
   "engines": {
@@ -147,7 +147,7 @@
     "netlify-headers-parser": "^7.1.1",
     "netlify-onegraph-internal": "0.10.1",
     "netlify-redirect-parser": "^14.1.1",
-    "netlify-redirector": "^0.3.1",
+    "netlify-redirector": "^0.4.0",
     "node-fetch": "^2.6.0",
     "node-version-alias": "^1.0.1",
     "ora": "^5.0.0",

package/src/lib/functions/server.mjs

@@ -168,7 +168,7 @@ export const createHandler = function (options) {
         return
       }
 
-      handleSynchronousFunction(error, result, request, response)
+      handleSynchronousFunction({ error, functionName: func.name, result, request, response })
     }
   }
 }

package/src/lib/functions/synchronous.mjs

@@ -1,7 +1,7 @@
 // @ts-check
 import { Buffer } from 'buffer'
 
-import { NETLIFYDEVERR } from '../../utils/command-helpers.mjs'
+import { chalk, log, NETLIFYDEVERR } from '../../utils/command-helpers.mjs'
 import renderErrorTemplate from '../render-error-template.mjs'
 
 import { detectAwsSdkError } from './utils.mjs'
@@ -16,20 +16,35 @@ const addHeaders = (headers, response) => {
   })
 }
 
-export const handleSynchronousFunction = function (err, result, request, response) {
-  if (err) {
-    return handleErr(err, request, response)
+export const handleSynchronousFunction = function ({
+  error: invocationError,
+  functionName,
+  request,
+  response,
+  result,
+}) {
+  if (invocationError) {
+    return handleErr(invocationError, request, response)
   }
 
   const { error } = validateLambdaResponse(result)
   if (error) {
-    console.log(`${NETLIFYDEVERR} ${error}`)
+    log(`${NETLIFYDEVERR} ${error}`)
     return handleErr(error, request, response)
   }
 
   response.statusCode = result.statusCode
-  addHeaders(result.headers, response)
-  addHeaders(result.multiValueHeaders, response)
+
+  try {
+    addHeaders(result.headers, response)
+    addHeaders(result.multiValueHeaders, response)
+  } catch (headersError) {
+    formatError(headersError)
+
+    log(`${NETLIFYDEVERR} Failed to set header in function ${chalk.yellow(functionName)}: ${headersError.message}`)
+
+    return handleErr(headersError, request, response)
+  }
 
   if (result.body) {
     response.write(result.isBase64Encoded ? Buffer.from(result.body, 'base64') : result.body)
@@ -37,6 +52,12 @@ export const handleSynchronousFunction = function (err, result, request, respons
   response.end()
 }
 
+const formatError = (err) => {
+  err.errorType = err.code
+  err.errorMessage = err.message
+  err.stackTrace = err.trace
+}
+
 const formatLambdaLocalError = (err, acceptsHtml) =>
   acceptsHtml
     ? JSON.stringify({

package/src/utils/proxy.mjs

@@ -33,6 +33,7 @@ import { NETLIFYDEVLOG, NETLIFYDEVWARN } from './command-helpers.mjs'
 import createStreamPromise from './create-stream-promise.mjs'
 import { headersForPath, parseHeaders } from './headers.mjs'
 import { createRewriter, onChanges } from './rules-proxy.mjs'
+import { signRedirect } from './sign-redirect.mjs'
 
 const decompress = util.promisify(zlib.gunzip)
 const shouldGenerateETag = Symbol('Internal: response should generate ETag')
@@ -143,7 +144,7 @@ const alternativePathsFor = function (url) {
   return paths
 }
 
-const serveRedirect = async function ({ match, options, proxy, req, res }) {
+const serveRedirect = async function ({ match, options, proxy, req, res, siteInfo }) {
   if (!match) return proxy.web(req, res, options)
 
   options = options || req.proxyOptions || {}
@@ -155,6 +156,15 @@ const serveRedirect = async function ({ match, options, proxy, req, res }) {
     })
   }
 
+  if (match.signingSecret) {
+    req.headers['x-nf-sign'] = signRedirect({
+      deployContext: 'dev',
+      secret: match.signingSecret,
+      siteID: siteInfo.id,
+      siteURL: siteInfo.url,
+    })
+  }
+
   if (isFunction(options.functionsPort, req.url)) {
     return proxy.web(req, res, { target: options.functionsServer })
   }
@@ -306,7 +316,7 @@ const reqToURL = function (req, pathname) {
 
 const MILLISEC_TO_SEC = 1e3
 
-const initializeProxy = async function ({ configPath, distDir, host, port, projectDir }) {
+const initializeProxy = async function ({ configPath, distDir, host, port, projectDir, siteInfo }) {
   const proxy = httpProxy.createProxyServer({
     selfHandleResponse: true,
     target: {
@@ -370,13 +380,20 @@ const initializeProxy = async function ({ configPath, distDir, host, port, proje
         return proxy.web(req, res, req.proxyOptions)
       }
       if (req.proxyOptions && req.proxyOptions.match) {
-        return serveRedirect({ req, res, proxy: handlers, match: req.proxyOptions.match, options: req.proxyOptions })
+        return serveRedirect({
+          req,
+          res,
+          proxy: handlers,
+          match: req.proxyOptions.match,
+          options: req.proxyOptions,
+          siteInfo,
+        })
       }
     }
 
     if (req.proxyOptions.staticFile && isRedirect({ status: proxyRes.statusCode }) && proxyRes.headers.location) {
       req.url = proxyRes.headers.location
-      return serveRedirect({ req, res, proxy: handlers, match: null, options: req.proxyOptions })
+      return serveRedirect({ req, res, proxy: handlers, match: null, options: req.proxyOptions, siteInfo })
     }
 
     const responseData = []
@@ -472,7 +489,11 @@ const initializeProxy = async function ({ configPath, distDir, host, port, proje
   return handlers
 }
 
-const onRequest = async ({ addonsUrls, edgeFunctionsProxy, functionsServer, proxy, rewriter, settings }, req, res) => {
+const onRequest = async (
+  { addonsUrls, edgeFunctionsProxy, functionsServer, proxy, rewriter, settings, siteInfo },
+  req,
+  res,
+) => {
   req.originalBody = ['GET', 'OPTIONS', 'HEAD'].includes(req.method)
     ? null
     : await createStreamPromise(req, BYTES_LIMIT)
@@ -509,7 +530,7 @@ const onRequest = async ({ addonsUrls, edgeFunctionsProxy, functionsServer, prox
     // We don't want to generate an ETag for 3xx redirects.
     req[shouldGenerateETag] = ({ statusCode }) => statusCode < 300 || statusCode >= 400
 
-    return serveRedirect({ req, res, proxy, match, options })
+    return serveRedirect({ req, res, proxy, match, options, siteInfo })
   }
 
   // The request will be served by the framework server, which means we want to
@@ -570,6 +591,7 @@ export const startProxy = async function ({
     distDir: settings.dist,
     projectDir,
     configPath,
+    siteInfo,
   })
 
   const rewriter = await createRewriter({
@@ -588,6 +610,7 @@ export const startProxy = async function ({
     addonsUrls,
     functionsServer,
     edgeFunctionsProxy,
+    siteInfo,
   })
   const primaryServer = settings.https
     ? https.createServer({ cert: settings.https.cert, key: settings.https.key }, onRequestWithOptions)

package/src/utils/redirects.mjs

@@ -36,6 +36,7 @@ const normalizeRedirect = function ({
   conditions: { country, language, role, ...conditions },
   from,
   query,
+  signed,
   ...redirect
 }) {
   return {
@@ -48,5 +49,10 @@ const normalizeRedirect = function ({
       ...(country && { Country: country }),
       ...(language && { Language: language }),
     },
+    ...(signed && {
+      sign: {
+        jwt_secret: signed,
+      },
+    }),
   }
 }

package/src/utils/sign-redirect.mjs

@@ -0,0 +1,16 @@
+import jwt from 'jsonwebtoken'
+
+// https://docs.netlify.com/routing/redirects/rewrites-proxies/#signed-proxy-redirects
+export const signRedirect = ({ deployContext, secret, siteID, siteURL }) => {
+  const claims = {
+    deploy_context: deployContext,
+    netlify_id: siteID,
+    site_url: siteURL,
+  }
+  const options = {
+    expiresIn: '5 minutes',
+    issuer: 'netlify',
+  }
+
+  return jwt.sign(claims, secret, options)
+}