netlify-cli 17.17.1 → 17.17.2

package/dist/lib/images/proxy.d.ts

@@ -13,17 +13,17 @@ interface QueryParams {
     fit?: string;
     position?: string;
 }
-export declare const parseAllDomains: (config: any) => {
+export declare const parseAllRemoteImages: (config: any) => {
     errors: ErrorObject[];
-    remoteDomains: string[];
+    remotePatterns: RegExp[];
 };
 interface ErrorObject {
     message: string;
 }
-export declare const handleImageDomainsErrors: (errors: ErrorObject[]) => Promise<void>;
-export declare const parseRemoteImageDomains: ({ config }: {
+export declare const handleRemoteImagesErrors: (errors: ErrorObject[]) => Promise<void>;
+export declare const parseRemoteImages: ({ config }: {
     config: any;
-}) => Promise<string[]>;
+}) => Promise<RegExp[]>;
 export declare const isImageRequest: (req: Request) => boolean;
 export declare const transformImageParams: (query: QueryParams) => string;
 export declare const initializeProxy: ({ config, settings, }: {

package/dist/lib/images/proxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../../src/lib/images/proxy.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAM9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAE5D,eAAO,MAAM,iBAAiB,qBAAqB,CAAA;AAEnD,UAAU,WAAW;IACnB,CAAC,CAAC,EAAE,MAAM,CAAA;IACV,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,CAAC,CAAC,EAAE,MAAM,CAAA;IACV,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,CAAC,CAAC,EAAE,MAAM,CAAA;IACV,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAaD,eAAO,MAAM,eAAe;YAAgC,WAAW,EAAE;mBAAiB,MAAM,EAAE;CA2BjG,CAAA;AAED,UAAU,WAAW;IACnB,OAAO,EAAE,MAAM,CAAA;CAChB;AAMD,eAAO,MAAM,wBAAwB,WAA2B,WAAW,EAAE,kBAO5E,CAAA;AAGD,eAAO,MAAM,uBAAuB;;uBASnC,CAAA;AAED,eAAO,MAAM,cAAc,QAAkB,OAAO,KAAG,OAEtD,CAAA;AAED,eAAO,MAAM,oBAAoB,UAAoB,WAAW,KAAG,MA4BlE,CAAA;AAED,eAAO,MAAM,eAAe;YAIlB,aAAa;cACX,cAAc;0DAgCzB,CAAA"}
+{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../../src/lib/images/proxy.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAM9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAE5D,eAAO,MAAM,iBAAiB,qBAAqB,CAAA;AAEnD,UAAU,WAAW;IACnB,CAAC,CAAC,EAAE,MAAM,CAAA;IACV,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,CAAC,CAAC,EAAE,MAAM,CAAA;IACV,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,CAAC,CAAC,EAAE,MAAM,CAAA;IACV,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAaD,eAAO,MAAM,oBAAoB;YAAgC,WAAW,EAAE;oBAAkB,MAAM,EAAE;CAqBvG,CAAA;AAED,UAAU,WAAW;IACnB,OAAO,EAAE,MAAM,CAAA;CAChB;AAMD,eAAO,MAAM,wBAAwB,WAA2B,WAAW,EAAE,kBAO5E,CAAA;AAGD,eAAO,MAAM,iBAAiB;;uBAS7B,CAAA;AAED,eAAO,MAAM,cAAc,QAAkB,OAAO,KAAG,OAEtD,CAAA;AAED,eAAO,MAAM,oBAAoB,UAAoB,WAAW,KAAG,MA4BlE,CAAA;AAED,eAAO,MAAM,eAAe;YAIlB,aAAa;cACX,cAAc;0DA4DzB,CAAA"}

package/dist/lib/images/proxy.js

@@ -4,52 +4,43 @@ import { log, NETLIFYDEVERR } from '../../utils/command-helpers.js';
 import { getProxyUrl } from '../../utils/proxy.js';
 export const IMAGE_URL_PATTERN = '/.netlify/images';
 // @ts-expect-error TS(7006) FIXME: Parameter 'config' implicitly has an 'any' type.
-export const parseAllDomains = function (config) {
-    const remoteDomains = [];
+export const parseAllRemoteImages = function (config) {
+    const remotePatterns = [];
     const errors = [];
-    const domains = config?.images?.remote_images;
-    if (!domains) {
-        return { errors, remoteDomains };
+    const remoteImages = config?.images?.remote_images;
+    if (!remoteImages) {
+        return { errors, remotePatterns };
     }
-    for (const patternString of domains) {
+    for (const patternString of remoteImages) {
         try {
-            const url = new URL(patternString);
-            if (url.hostname) {
-                remoteDomains.push(url.hostname);
-            }
-            else {
-                errors.push({ message: `The URL '${patternString}' does not have a valid hostname.` });
-            }
+            const urlRegex = new RegExp(patternString);
+            remotePatterns.push(urlRegex);
         }
         catch (error) {
-            if (error instanceof Error) {
-                errors.push({ message: `Invalid URL '${patternString}': ${error.message}` });
-            }
-            else {
-                errors.push({ message: `Invalid URL '${patternString}': An unknown error occurred` });
-            }
+            const message = error instanceof Error ? error.message : 'An unknown error occurred';
+            errors.push({ message });
         }
     }
-    return { errors, remoteDomains };
+    return { errors, remotePatterns };
 };
 const getErrorMessage = function ({ message }) {
     return message;
 };
-export const handleImageDomainsErrors = async function (errors) {
+export const handleRemoteImagesErrors = async function (errors) {
     if (errors.length === 0) {
         return;
     }
     const errorMessage = await errors.map(getErrorMessage).join('\n\n');
-    log(NETLIFYDEVERR, `Image domains syntax errors:\n${errorMessage}`);
+    log(NETLIFYDEVERR, `Remote images syntax errors:\n${errorMessage}`);
 };
 // @ts-expect-error TS(7031) FIXME: Binding element 'config' implicitly has an 'any' t... Remove this comment to see the full error message
-export const parseRemoteImageDomains = async function ({ config }) {
+export const parseRemoteImages = async function ({ config }) {
     if (!config) {
         return [];
     }
-    const { errors, remoteDomains } = await parseAllDomains(config);
-    await handleImageDomainsErrors(errors);
-    return remoteDomains;
+    const { errors, remotePatterns } = await parseAllRemoteImages(config);
+    await handleRemoteImagesErrors(errors);
+    return remotePatterns;
 };
 export const isImageRequest = function (req) {
     return req.url.startsWith(IMAGE_URL_PATTERN);
@@ -79,14 +70,17 @@ export const transformImageParams = function (query) {
         .join(',');
 };
 export const initializeProxy = async function ({ config, settings, }) {
-    const remoteDomains = await parseRemoteImageDomains({ config });
+    const remoteImages = await parseRemoteImages({ config });
     const devServerUrl = getProxyUrl(settings);
     const ipx = createIPX({
         storage: ipxFSStorage({ dir: config?.build?.publish ?? './public' }),
-        httpStorage: ipxHttpStorage({ domains: [...remoteDomains, devServerUrl] }),
+        httpStorage: ipxHttpStorage({
+            allowAllDomains: true,
+        }),
     });
     const handler = createIPXNodeServer(ipx);
     const app = express();
+    let lastTimeRemoteImagesConfigurationDetailsMessageWasLogged = 0;
     app.use(IMAGE_URL_PATTERN, async (req, res) => {
         const { url, ...query } = req.query;
         const sourceImagePath = url;
@@ -95,11 +89,30 @@ export const initializeProxy = async function ({ config, settings, }) {
             // Construct the full URL for relative paths to request from development server
             const sourceImagePathWithLeadingSlash = sourceImagePath.startsWith('/') ? sourceImagePath : `/${sourceImagePath}`;
             const fullImageUrl = `${devServerUrl}${encodeURIComponent(sourceImagePathWithLeadingSlash)}`;
-            console.log(`fullImageUrl: ${fullImageUrl}`);
             req.url = `/${modifiers}/${fullImageUrl}`;
         }
         else {
-            // If the image is remote, we can just pass the URL as is
+            // If the image is remote, we first check if it's allowed by any of patterns
+            if (!remoteImages.some((remoteImage) => remoteImage.test(sourceImagePath))) {
+                const remoteImageNotAllowedLogMessage = `Remote image "${sourceImagePath}" source for Image CDN is not allowed.`;
+                // Contextual information about the remote image configuration is throttled
+                // to avoid spamming the console as it's quite verbose
+                // Each not allowed remote image will still be logged, just without configuration details
+                if (Date.now() - lastTimeRemoteImagesConfigurationDetailsMessageWasLogged > 1000 * 30) {
+                    log(`${remoteImageNotAllowedLogMessage}\n\n${remoteImages.length === 0
+                        ? 'Currently no remote images are allowed.'
+                        : `Currently allowed remote images configuration details:\n${remoteImages
+                            .map((pattern) => ` - ${pattern}`)
+                            .join('\n')}`}\n\nRefer to https://ntl.fyi/remote-images for information about how to configure allowed remote images.`);
+                    lastTimeRemoteImagesConfigurationDetailsMessageWasLogged = Date.now();
+                }
+                else {
+                    log(remoteImageNotAllowedLogMessage);
+                }
+                res.status(400).end();
+                return;
+            }
+            // Construct the full URL for remote paths
             req.url = `/${modifiers}/${encodeURIComponent(sourceImagePath)}`;
         }
         handler(req, res);