@websolutespa/bom-mixer-image 1.8.3 → 1.8.4

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @websolutespa/bom-mixer-image
 
+## 1.8.4
+
+### Patch Changes
+
+- Fixing: handling latin1 src
+
 ## 1.8.3
 
 ### Patch Changes

package/dist/index.js

@@ -100,10 +100,7 @@ function imageHandler({
           response.setHeader("Cache-Control", `public, max-age=${IMAGE_MAX_AGE}`);
           return response.send(cachedImage);
         }
-        const { headers } = request;
-        const referer = headers.referer;
-        const publicUrl = process.env.NEXT_PUBLIC_URL || "";
-        if (referer && publicUrl !== "https://" && referer.indexOf(publicUrl) !== 0) {
+        if (isInvalidReferer(request)) {
           return response.status(401).send("you are not authorized to perform this action");
         }
         if (imageOptions.url.indexOf("http") === -1 && isVercel()) {
@@ -135,6 +132,15 @@ function imageHandler({
     }
   });
 }
+function isInvalidReferer(request) {
+  const { headers } = request;
+  const referer = headers.referer;
+  const publicUrl = process.env.NEXT_PUBLIC_URL || "";
+  if (IMAGE_STRATEGY !== import_bom_core.ImageStrategy.Token && referer && publicUrl !== "https://" && referer.indexOf(publicUrl) !== 0) {
+    return true;
+  }
+  return false;
+}
 function getImageOptions(request, options) {
   const { slugs, origin = "", search = "", w, h, x, y, q } = request.query;
   if (!Array.isArray(slugs) || slugs.length === 0) {
@@ -183,9 +189,10 @@ function getEncryptedImageOptions(request, options) {
     throw "missing t parameter";
   }
   const imageResize = (0, import_bom_core.decryptImageResize)(t);
-  const url = origin + "/" + slugs.join("/") + search;
+  imageResize.src = decodeURIComponent(imageResize.src);
+  const url = decodeURIComponent(origin + "/" + slugs.join("/") + search);
   if (imageResize.src !== url) {
-    throw "invalid src parameter";
+    throw `invalid src parameter ${imageResize.src} ${url}`;
   }
   return {
     ...imageResize,
@@ -245,10 +252,10 @@ async function resizeImage(originalImage, imageOptions) {
     return defaultResizeOptions();
   }
 }
-function getOriginalImage(url, domains, headers, skipUrlValidity = false) {
+function getOriginalImage(url, domains, headers) {
   return new Promise((resolve, reject) => {
     if (url.indexOf("http") === 0) {
-      if (!skipUrlValidity && !checkUrlValidity(url, domains)) {
+      if (isInvalidDomain(url, domains)) {
         return reject({ status: 401, message: "invalid origin" });
       }
       fetch(url, {
@@ -311,9 +318,12 @@ function urlToCachedName(options) {
   const cachedName = options.h ? path.join(cacheDir, `${parsedName.name}_w_${options.w}_h_${options.h || 0}_x_${options.x || IMAGE_FOCAL_X}_y_${options.y || IMAGE_FOCAL_Y}_q_${options.q}${parsedName.ext}`) : path.join(cacheDir, `${parsedName.name}_w_${options.w}_q_${options.q}${parsedName.ext}`);
   return cachedName;
 }
-function checkUrlValidity(src, domains) {
+function isInvalidDomain(src, domains) {
+  if (IMAGE_STRATEGY === import_bom_core.ImageStrategy.Token) {
+    return false;
+  }
   const url = new URL(src);
-  return domains.includes(url.hostname);
+  return !domains.includes(url.hostname);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/index.mjs

@@ -64,10 +64,7 @@ function imageHandler({
           response.setHeader("Cache-Control", `public, max-age=${IMAGE_MAX_AGE}`);
           return response.send(cachedImage);
         }
-        const { headers } = request;
-        const referer = headers.referer;
-        const publicUrl = process.env.NEXT_PUBLIC_URL || "";
-        if (referer && publicUrl !== "https://" && referer.indexOf(publicUrl) !== 0) {
+        if (isInvalidReferer(request)) {
           return response.status(401).send("you are not authorized to perform this action");
         }
         if (imageOptions.url.indexOf("http") === -1 && isVercel()) {
@@ -99,6 +96,15 @@ function imageHandler({
     }
   });
 }
+function isInvalidReferer(request) {
+  const { headers } = request;
+  const referer = headers.referer;
+  const publicUrl = process.env.NEXT_PUBLIC_URL || "";
+  if (IMAGE_STRATEGY !== ImageStrategy.Token && referer && publicUrl !== "https://" && referer.indexOf(publicUrl) !== 0) {
+    return true;
+  }
+  return false;
+}
 function getImageOptions(request, options) {
   const { slugs, origin = "", search = "", w, h, x, y, q } = request.query;
   if (!Array.isArray(slugs) || slugs.length === 0) {
@@ -147,9 +153,10 @@ function getEncryptedImageOptions(request, options) {
     throw "missing t parameter";
   }
   const imageResize = decryptImageResize(t);
-  const url = origin + "/" + slugs.join("/") + search;
+  imageResize.src = decodeURIComponent(imageResize.src);
+  const url = decodeURIComponent(origin + "/" + slugs.join("/") + search);
   if (imageResize.src !== url) {
-    throw "invalid src parameter";
+    throw `invalid src parameter ${imageResize.src} ${url}`;
   }
   return {
     ...imageResize,
@@ -209,10 +216,10 @@ async function resizeImage(originalImage, imageOptions) {
     return defaultResizeOptions();
   }
 }
-function getOriginalImage(url, domains, headers, skipUrlValidity = false) {
+function getOriginalImage(url, domains, headers) {
   return new Promise((resolve, reject) => {
     if (url.indexOf("http") === 0) {
-      if (!skipUrlValidity && !checkUrlValidity(url, domains)) {
+      if (isInvalidDomain(url, domains)) {
         return reject({ status: 401, message: "invalid origin" });
       }
       fetch(url, {
@@ -275,9 +282,12 @@ function urlToCachedName(options) {
   const cachedName = options.h ? path.join(cacheDir, `${parsedName.name}_w_${options.w}_h_${options.h || 0}_x_${options.x || IMAGE_FOCAL_X}_y_${options.y || IMAGE_FOCAL_Y}_q_${options.q}${parsedName.ext}`) : path.join(cacheDir, `${parsedName.name}_w_${options.w}_q_${options.q}${parsedName.ext}`);
   return cachedName;
 }
-function checkUrlValidity(src, domains) {
+function isInvalidDomain(src, domains) {
+  if (IMAGE_STRATEGY === ImageStrategy.Token) {
+    return false;
+  }
   const url = new URL(src);
-  return domains.includes(url.hostname);
+  return !domains.includes(url.hostname);
 }
 export {
   imageHandler

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@websolutespa/bom-mixer-image",
-  "version": "1.8.3",
+  "version": "1.8.4",
   "description": "Mixer Image module of the BOM Repository",
   "keywords": [
     "bom",

package/src/image/image.handler.ts

@@ -72,15 +72,7 @@ export function imageHandler({
           return response.send(cachedImage);
         }
         // Check referrer
-        const { headers } = request;
-        const referer = headers.referer;
-        const publicUrl = process.env.NEXT_PUBLIC_URL || '';
-        // console.log('referef', referer, 'publicUrl', publicUrl);
-        if (
-          referer &&
-          publicUrl !== 'https://' &&
-          referer.indexOf(publicUrl) !== 0
-        ) {
+        if (isInvalidReferer(request)) {
           return response.status(401).send('you are not authorized to perform this action');
         }
         // Temporarily fix Vercel local image issue
@@ -129,6 +121,22 @@ export function imageHandler({
   });
 }
 
+function isInvalidReferer(request: NextApiRequest): boolean {
+  const { headers } = request;
+  const referer = headers.referer;
+  const publicUrl = process.env.NEXT_PUBLIC_URL || '';
+  // console.log('referef', referer, 'publicUrl', publicUrl, 'IMAGE_STRATEGY', IMAGE_STRATEGY, ImageStrategy.Token);
+  if (
+    IMAGE_STRATEGY !== ImageStrategy.Token &&
+    referer &&
+    publicUrl !== 'https://' &&
+    referer.indexOf(publicUrl) !== 0
+  ) {
+    return true;
+  }
+  return false;
+}
+
 function getImageOptions(request: NextApiRequest, options: IImageHandlerOptions): IImageOptions {
   // Destructuring 'slugs', 'origin', 'search', 'w', 'h', 'x', 'y', 'q' from the request query
   const { slugs, origin = '', search = '', w, h, x, y, q } = request.query;
@@ -211,11 +219,12 @@ function getEncryptedImageOptions(request: NextApiRequest, options: IImageHandle
     throw 'invalid q parameter';
   }
   */
+  imageResize.src = decodeURIComponent(imageResize.src);
   // Generating url
-  const url = origin + '/' + slugs.join('/') + search;
+  const url = decodeURIComponent(origin + '/' + slugs.join('/') + search);
   //
   if (imageResize.src !== url) {
-    throw 'invalid src parameter';
+    throw `invalid src parameter ${imageResize.src} ${url}`;
   }
   //
   return {
@@ -285,16 +294,12 @@ async function resizeImage(originalImage: sharp.Sharp, imageOptions: IImageOptio
 }
 
 // Defining the 'getOriginalImage' function
-function getOriginalImage(url: string, domains: string[], headers: IncomingHttpHeaders, skipUrlValidity: boolean = false): Promise<Buffer> {
+function getOriginalImage(url: string, domains: string[], headers: IncomingHttpHeaders): Promise<Buffer> {
   // Returning a new promise
   return new Promise((resolve, reject) => {
     // Checking if 'url' starts with 'http'
     if (url.indexOf('http') === 0) {
-      if (
-        !skipUrlValidity &&
-        !checkUrlValidity(url, domains)
-      ) {
-        // console.error('imageHandler.getOriginalImage.error invalid origin');
+      if (isInvalidDomain(url, domains)) {
         return reject({ status: 401, message: 'invalid origin' });
       }
       // Fetching the image from the URL
@@ -330,21 +335,6 @@ function getOriginalImage(url: string, domains: string[], headers: IncomingHttpH
         // Resolving the promise with the image data
         return resolve(data);
       });
-      /*
-      // Check if the file exists
-      if (fs.existsSync(filePath)) {
-        fs.readFile(filePath, (error, data) => {
-          if (error) {
-            return reject(error);
-          }
-          // Resolving the promise with the image data
-          return resolve(data);
-        });
-      } else {
-        const origin = getOrigin(headers);
-        return getOriginalImage(`${origin}${url}`, domains, headers, true);
-      }
-      */
     }
   });
 }
@@ -407,7 +397,10 @@ function urlToCachedName(options: IImageOptions): string {
   return cachedName;
 }
 
-function checkUrlValidity(src: string, domains: string[]): boolean {
+function isInvalidDomain(src: string, domains: string[]): boolean {
+  if (IMAGE_STRATEGY === ImageStrategy.Token) {
+    return false;
+  }
   const url = new URL(src);
-  return domains.includes(url.hostname);
+  return !domains.includes(url.hostname);
 }