fix: don't try to extract protocol

Author: cabljac

extensions/image-processing-api/POSTINSTALL.md

@@ -29,7 +29,7 @@ encodeURIComponent(JSON.stringify(operations));
 
 3. Call the deployed `process` Cloud Function:
 
-[https://${param:LOCATION}-${param:PROJECT_ID}.cloudfunctions.net/ext-${param:EXT_INSTANCE_ID}-handler/process?operations=%5B%7B%22operation%22%3A%22input%22%2C%22type%22%3A%22url%22%2C%22url%22%3A%22https%3A%2F%2Fimages.unsplash.com%2Fphoto-1663659552548-25d7771802c9%3Fixlib%3Drb-1.2.1%26ixid%3DMnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8%26auto%3Dformat%26fit%3Dcrop%26w%3D774%26q%3D80%22%7D%2C%7B%22operation%22%3A%22grayscale%22%7D%2C%7B%22operation%22%3A%22output%22%2C%22format%22%3A%22webp%22%7D%5D](https://${param:LOCATION}-${param:PROJECT_ID}.cloudfunctions.net/ext-image-processing-api-handler/process?operations=%5B%7B%22operation%22%3A%22input%22%2C%22type%22%3A%22url%22%2C%22url%22%3A%22https%3A%2F%2Fimages.unsplash.com%2Fphoto-1663659552548-25d7771802c9%3Fixlib%3Drb-1.2.1%26ixid%3DMnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8%26auto%3Dformat%26fit%3Dcrop%26w%3D774%26q%3D80%22%7D%2C%7B%22operation%22%3A%22grayscale%22%7D%2C%7B%22operation%22%3A%22output%22%2C%22format%22%3A%22webp%22%7D%5D)
+[https://${param:LOCATION}-${param:PROJECT_ID}.cloudfunctions.net/ext-${param:EXT_INSTANCE_ID}-handler/process?operations=%5B%7B%22operation%22%3A%22input%22%2C%22type%22%3A%22url%22%2C%22url%22%3A%22https%3A%2F%2Fimages.unsplash.com%2Fphoto-1663659552548-25d7771802c9%3Fixlib%3Drb-1.2.1%26ixid%3DMnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8%26auto%3Dformat%26fit%3Dcrop%26w%3D774%26q%3D80%22%7D%2C%7B%22operation%22%3A%22grayscale%22%7D%2C%7B%22operation%22%3A%22output%22%2C%22format%22%3A%22webp%22%7D%5D](https://${param:LOCATION}-${param:PROJECT_ID}.cloudfunctions.net/ext-${param:EXT_INSTANCE_ID}-handler/process?operations=%5B%7B%22operation%22%3A%22input%22%2C%22type%22%3A%22url%22%2C%22url%22%3A%22https%3A%2F%2Fimages.unsplash.com%2Fphoto-1663659552548-25d7771802c9%3Fixlib%3Drb-1.2.1%26ixid%3DMnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8%26auto%3Dformat%26fit%3Dcrop%26w%3D774%26q%3D80%22%7D%2C%7B%22operation%22%3A%22grayscale%22%7D%2C%7B%22operation%22%3A%22output%22%2C%22format%22%3A%22webp%22%7D%5D)
 
 The result will be a grayscaled version of the image, in WebP format.
 

extensions/image-processing-api/functions/package.json

@@ -10,7 +10,6 @@
     "emulator:local": "FIREBASE_STORAGE_EMULATOR_HOST='localhost:9199' firebase ext:dev:emulators:start --test-config=__tests__/test-firebase.json --test-params=__tests__/test-params.env --project=extensions-testing --import=./__tests__/data",
     "generate-readme": "firebase ext:info .. --markdown > ../README.md",
     "deploy": "firebase ext:install ../ --project=extensions-testing",
-    "postinstall": "npm run copy-types || exit 0",
     "test": "vitest run",
     "test:watch": "vitest",
     "test:ui": "vitest --ui",

extensions/image-processing-api/functions/src/index.ts

@@ -33,7 +33,7 @@ import {
   fileMetadataBufferKeys,
   omitKeys,
 } from './utils';
-import { Operation, ValidatedOperation } from './types';
+import { NotFoundError, Operation, ValidatedOperation } from './types';
 import { extensionConfiguration } from './config';
 import sharp from 'sharp';
 
@@ -173,23 +173,27 @@ app.get(
 // to be treated as an error handler.
 
 app.use(function handleError(
-  error: Error,
+  error: Error & { statusCode?: number },
   req: Request,
   res: Response,
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   next: express.NextFunction,
 ) {
-  if (error instanceof StructError || error instanceof AssertionError) {
+  if (error instanceof NotFoundError) {
+    functions.logger.warn(error.message, {
+      url: req.url,
+      query: req.query,
+    });
+    res.status(error.statusCode).send(error.message);
+  } else if (error instanceof StructError || error instanceof AssertionError) {
     functions.logger.warn(error.message, {
       url: req.url,
       query: req.query,
     });
     res.status(400).send(error.message);
   } else {
     functions.logger.error(
-      'An error occurred processing a request, please report this issue to the GitHub ' +
-        'repository for this extension and include this log entry with your report (omit any ' +
-        'sensitive data).',
+      'An error occurred processing a request, please report this issue to the GitHub repository for this extension and include this log entry with your report (omit any sensitive data).',
       {
         url: req.url,
         query: req.query,

extensions/image-processing-api/functions/src/operations/input.ts

@@ -18,7 +18,12 @@ import * as superstruct from 'superstruct';
 import express from 'express';
 
 import * as utils from '../utils';
-import { Operation, OperationAction, OperationBuilder } from '../types';
+import {
+  NotFoundError,
+  Operation,
+  OperationAction,
+  OperationBuilder,
+} from '../types';
 import { AssertionError } from 'assert';
 import { fetchImageBufferFromUrl } from '../utils';
 import { extensionConfiguration } from '../config';
@@ -197,42 +202,25 @@ async function fetchPathUrl(
       message: 'Request object is required for path type inputs.',
     });
   }
+  // const forwardedProto = req.headers['x-forwarded-proto'] || req.protocol;
+  const forwardedHost = req.headers['x-forwarded-host'] || req.headers['host'];
 
-  // Extract hostname from request
-  const origin = (req.headers.origin as string) || '';
-  const referer = (req.headers.referer as string) || '';
-  const host = req.headers.host || '';
-
-  let baseUrl = '';
-
-  // Try to get the base URL from various sources
-  if (origin) {
-    baseUrl = origin;
-  } else if (referer) {
-    try {
-      const url = new URL(referer);
-      baseUrl = `${url.protocol}//${url.host}`;
-    } catch (e) {
-      // Invalid URL format in referer
-    }
-  } else if (host) {
-    const protocol = req.secure ? 'https:' : 'http:';
-    baseUrl = `${protocol}//${host}`;
+  if (!forwardedHost) {
+    throw new NotFoundError('Request host is not defined.');
   }
 
-  if (!baseUrl) {
-    throw new AssertionError({
-      message: `Could not determine request hostname for path URL.`,
-    });
+  const fullUrl = `https://${forwardedHost}${options.path}`;
+  let imageBuffer: Buffer;
+  try {
+    imageBuffer = await fetchImageBufferFromUrl(fullUrl);
+  } catch (error) {
+    throw new NotFoundError(`Image not found at ${fullUrl}`);
   }
 
-  // Construct the full URL
-  const fullUrl = `${baseUrl}${options.path}`;
-
   return [
     {
       method: 'constructor',
-      arguments: [await fetchImageBufferFromUrl(fullUrl)],
+      arguments: [imageBuffer],
     },
   ];
 }

extensions/image-processing-api/functions/src/types.ts

@@ -67,3 +67,26 @@ export interface OperationAction {
   method: string;
   arguments: unknown[];
 }
+
+/**
+ * Custom error class for operation related errors.
+ */
+export class OperationError extends Error {
+  public statusCode: number;
+
+  constructor(message: string, statusCode = 400) {
+    super(message);
+    this.name = 'OperationError';
+    this.statusCode = statusCode;
+  }
+}
+
+/**
+ * NotFoundError extends OperationError with a default status code of 404.
+ */
+export class NotFoundError extends OperationError {
+  constructor(message = 'Not Found') {
+    super(message, 404);
+    this.name = 'NotFoundError';
+  }
+}

extensions/image-processing-api/functions/tsconfig.json

@@ -2,7 +2,7 @@
   "compilerOptions": {
     "target": "ES2020",
     "lib": ["ES2020"],
-    "types": ["node", "jest"],
+    "types": ["node"],
     "allowJs": true,
     "skipLibCheck": true,
     "strict": false,
@@ -13,7 +13,7 @@
     "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "outDir": "lib"
+    "outDir": "./lib"
   },
   "exclude": ["node_modules", "__tests__"],
   "include": ["src"]