payload 4.0.0-internal.e7d4ebc → 4.0.0-internal.ee5d8bd

package/dist/uploads/clientUploadReceipt.js

@@ -0,0 +1,76 @@
+import crypto from 'node:crypto';
+import { APIError } from '../errors/APIError.js';
+// Longer than the longest provider upload URL (GCS: five hours).
+const LIFETIME_MS = 6 * 60 * 60 * 1000;
+// Separates these signatures from any future receipt format.
+const DOMAIN = 'payload-client-upload-receipt-v1';
+export const createClientUploadReceipt = ({ _objectKey, allowOverwrite, collectionSlug, filename, filePrefix, req, storageFilePath })=>{
+    const data = {
+        ..._objectKey !== undefined && {
+            _objectKey
+        },
+        ...allowOverwrite && {
+            allowOverwrite: true
+        },
+        collectionSlug,
+        expiresAt: Date.now() + LIFETIME_MS,
+        filename,
+        filePrefix,
+        storageFilePath,
+        ...getUser(req)
+    };
+    const encodedReceipt = Buffer.from(JSON.stringify(data)).toString('base64url');
+    return `${encodedReceipt}.${sign({
+        encodedReceipt,
+        secret: req.payload.secret
+    })}`;
+};
+export const verifyClientUploadReceipt = ({ collectionSlug, filename, req, signedReceipt })=>{
+    if (typeof signedReceipt !== 'string') {
+        throwInvalidReference();
+    }
+    const [encodedReceipt, signature, extra] = signedReceipt.split('.');
+    const expected = encodedReceipt ? sign({
+        encodedReceipt,
+        secret: req.payload.secret
+    }) : '';
+    if (!encodedReceipt || !signature || extra || !equal({
+        actual: signature,
+        expected
+    })) {
+        throwInvalidReference();
+    }
+    let decodedReceipt;
+    try {
+        decodedReceipt = JSON.parse(Buffer.from(encodedReceipt, 'base64url').toString());
+    } catch  {
+        throwInvalidReference();
+    }
+    const user = getUser(req);
+    if (!isReceipt(decodedReceipt) || decodedReceipt.expiresAt <= Date.now() || decodedReceipt.userCollection !== user.userCollection || decodedReceipt.userID !== user.userID || collectionSlug !== undefined && decodedReceipt.collectionSlug !== collectionSlug || filename !== undefined && decodedReceipt.filename !== filename) {
+        throwInvalidReference();
+    }
+    return decodedReceipt;
+};
+function throwInvalidReference() {
+    throw new APIError('Invalid upload reference.', 400);
+}
+const getUser = (req)=>({
+        userCollection: req.user?.collection ?? null,
+        userID: req.user?.id ?? null
+    });
+const sign = ({ encodedReceipt, secret })=>crypto.createHmac('sha256', `${DOMAIN}:${secret}`).update(encodedReceipt).digest('base64url');
+const equal = ({ actual, expected })=>{
+    const actualBuffer = Buffer.from(actual);
+    const expectedBuffer = Buffer.from(expected);
+    return actualBuffer.length === expectedBuffer.length && crypto.timingSafeEqual(actualBuffer, expectedBuffer);
+};
+const isReceipt = (value)=>{
+    if (!value || typeof value !== 'object') {
+        return false;
+    }
+    const data = value;
+    return (data._objectKey === undefined || typeof data._objectKey === 'string') && (data.allowOverwrite === undefined || typeof data.allowOverwrite === 'boolean') && typeof data.collectionSlug === 'string' && typeof data.expiresAt === 'number' && Number.isFinite(data.expiresAt) && typeof data.storageFilePath === 'string' && typeof data.filePrefix === 'string' && typeof data.filename === 'string' && (data.userCollection === null || typeof data.userCollection === 'string') && (data.userID === null || typeof data.userID === 'string' || typeof data.userID === 'number' && Number.isFinite(data.userID));
+};
+
+//# sourceMappingURL=clientUploadReceipt.js.map

package/dist/uploads/clientUploadReceipt.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/uploads/clientUploadReceipt.ts"],"sourcesContent":["import crypto from 'node:crypto'\n\nimport type { PayloadRequest } from '../types/index.js'\n\nimport { APIError } from '../errors/APIError.js'\n\ntype ClientUploadReceipt = {\n  _objectKey?: string\n  allowOverwrite?: boolean\n  collectionSlug: string\n  expiresAt: number\n  filename: string\n  filePrefix: string\n  storageFilePath: string\n  userCollection: null | string\n  userID: null | number | string\n}\n\n// Longer than the longest provider upload URL (GCS: five hours).\nconst LIFETIME_MS = 6 * 60 * 60 * 1000\n// Separates these signatures from any future receipt format.\nconst DOMAIN = 'payload-client-upload-receipt-v1'\n\nexport const createClientUploadReceipt = ({\n  _objectKey,\n  allowOverwrite,\n  collectionSlug,\n  filename,\n  filePrefix,\n  req,\n  storageFilePath,\n}: {\n  _objectKey?: string\n  allowOverwrite?: boolean\n  collectionSlug: string\n  filename: string\n  filePrefix: string\n  req: PayloadRequest\n  storageFilePath: string\n}): `${string}.${string}` => {\n  const data: ClientUploadReceipt = {\n    ...(_objectKey !== undefined && { _objectKey }),\n    ...(allowOverwrite && { allowOverwrite: true }),\n    collectionSlug,\n    expiresAt: Date.now() + LIFETIME_MS,\n    filename,\n    filePrefix,\n    storageFilePath,\n    ...getUser(req),\n  }\n  const encodedReceipt = Buffer.from(JSON.stringify(data)).toString('base64url')\n\n  return `${encodedReceipt}.${sign({ encodedReceipt, secret: req.payload.secret })}`\n}\n\nexport const verifyClientUploadReceipt = ({\n  collectionSlug,\n  filename,\n  req,\n  signedReceipt,\n}: {\n  collectionSlug?: string\n  filename?: string\n  req: PayloadRequest\n  signedReceipt: unknown\n}): ClientUploadReceipt => {\n  if (typeof signedReceipt !== 'string') {\n    throwInvalidReference()\n  }\n  const [encodedReceipt, signature, extra] = signedReceipt.split('.')\n  const expected = encodedReceipt ? sign({ encodedReceipt, secret: req.payload.secret }) : ''\n\n  if (!encodedReceipt || !signature || extra || !equal({ actual: signature, expected })) {\n    throwInvalidReference()\n  }\n\n  let decodedReceipt: unknown\n  try {\n    decodedReceipt = JSON.parse(Buffer.from(encodedReceipt, 'base64url').toString())\n  } catch {\n    throwInvalidReference()\n  }\n\n  const user = getUser(req)\n  if (\n    !isReceipt(decodedReceipt) ||\n    decodedReceipt.expiresAt <= Date.now() ||\n    decodedReceipt.userCollection !== user.userCollection ||\n    decodedReceipt.userID !== user.userID ||\n    (collectionSlug !== undefined && decodedReceipt.collectionSlug !== collectionSlug) ||\n    (filename !== undefined && decodedReceipt.filename !== filename)\n  ) {\n    throwInvalidReference()\n  }\n\n  return decodedReceipt\n}\n\nfunction throwInvalidReference(): never {\n  throw new APIError('Invalid upload reference.', 400)\n}\n\nconst getUser = (req: PayloadRequest) => ({\n  userCollection: req.user?.collection ?? null,\n  userID: req.user?.id ?? null,\n})\n\nconst sign = ({ encodedReceipt, secret }: { encodedReceipt: string; secret: string }) =>\n  crypto.createHmac('sha256', `${DOMAIN}:${secret}`).update(encodedReceipt).digest('base64url')\n\nconst equal = ({ actual, expected }: { actual: string; expected: string }) => {\n  const actualBuffer = Buffer.from(actual)\n  const expectedBuffer = Buffer.from(expected)\n  return (\n    actualBuffer.length === expectedBuffer.length &&\n    crypto.timingSafeEqual(actualBuffer, expectedBuffer)\n  )\n}\n\nconst isReceipt = (value: unknown): value is ClientUploadReceipt => {\n  if (!value || typeof value !== 'object') {\n    return false\n  }\n  const data = value as Partial<ClientUploadReceipt>\n  return (\n    (data._objectKey === undefined || typeof data._objectKey === 'string') &&\n    (data.allowOverwrite === undefined || typeof data.allowOverwrite === 'boolean') &&\n    typeof data.collectionSlug === 'string' &&\n    typeof data.expiresAt === 'number' &&\n    Number.isFinite(data.expiresAt) &&\n    typeof data.storageFilePath === 'string' &&\n    typeof data.filePrefix === 'string' &&\n    typeof data.filename === 'string' &&\n    (data.userCollection === null || typeof data.userCollection === 'string') &&\n    (data.userID === null ||\n      typeof data.userID === 'string' ||\n      (typeof data.userID === 'number' && Number.isFinite(data.userID)))\n  )\n}\n"],"names":["crypto","APIError","LIFETIME_MS","DOMAIN","createClientUploadReceipt","_objectKey","allowOverwrite","collectionSlug","filename","filePrefix","req","storageFilePath","data","undefined","expiresAt","Date","now","getUser","encodedReceipt","Buffer","from","JSON","stringify","toString","sign","secret","payload","verifyClientUploadReceipt","signedReceipt","throwInvalidReference","signature","extra","split","expected","equal","actual","decodedReceipt","parse","user","isReceipt","userCollection","userID","collection","id","createHmac","update","digest","actualBuffer","expectedBuffer","length","timingSafeEqual","value","Number","isFinite"],"mappings":"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"}

package/dist/uploads/deleteAssociatedFiles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deleteAssociatedFiles.d.ts","sourceRoot":"","sources":["../../src/uploads/deleteAssociatedFiles.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAA;AAC/E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AACvD,OAAO,KAAK,EAAY,UAAU,EAAE,MAAM,YAAY,CAAA;AAKtD,KAAK,IAAI,GAAG;IACV,gBAAgB,EAAE,yBAAyB,CAAA;IAC3C,MAAM,EAAE,eAAe,CAAA;IACvB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC5B,KAAK,CAAC,EAAE,UAAU,EAAE,CAAA;IACpB,cAAc,EAAE,OAAO,CAAA;IACvB,GAAG,EAAE,cAAc,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,qBAAqB,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,IAAI,CAyC/D,CAAA"}
+{"version":3,"file":"deleteAssociatedFiles.d.ts","sourceRoot":"","sources":["../../src/uploads/deleteAssociatedFiles.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAA;AAC/E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AACvD,OAAO,KAAK,EAAY,UAAU,EAAE,MAAM,YAAY,CAAA;AAOtD,KAAK,IAAI,GAAG;IACV,gBAAgB,EAAE,yBAAyB,CAAA;IAC3C,MAAM,EAAE,eAAe,CAAA;IACvB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC5B,KAAK,CAAC,EAAE,UAAU,EAAE,CAAA;IACpB,cAAc,EAAE,OAAO,CAAA;IACvB,GAAG,EAAE,cAAc,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,qBAAqB,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,IAAI,CA8C/D,CAAA"}

package/dist/uploads/deleteAssociatedFiles.js

@@ -1,31 +1,50 @@
 import fs from 'fs/promises';
-import { ErrorDeletingFile } from '../errors/index.js';
+import path from 'path';
+import { APIError, ErrorDeletingFile } from '../errors/index.js';
+import { httpStatus } from '../utilities/httpStatus.js';
 import { fileExists } from './fileExists.js';
-export const deleteAssociatedFiles = async ({ collectionConfig, doc, files = [], overrideDelete, req })=>{
+import { withLegacyUploadFileData } from './fileVersioning/storedFiles.js';
+export const deleteAssociatedFiles = async ({ collectionConfig, config, doc, files = [], overrideDelete, req })=>{
     if (!collectionConfig.upload) {
         return;
     }
+    const stored = withLegacyUploadFileData({
+        collection: collectionConfig,
+        config,
+        doc
+    });
+    if (collectionConfig.versions || stored.original) {
+        return;
+    }
     if (overrideDelete || files.length > 0) {
         const { staticDir: staticPath } = collectionConfig.upload;
-        const fileToDelete = `${staticPath}/${doc.filename}`;
+        const fileToDelete = resolveFilePath({
+            filename: doc.filename,
+            staticPath
+        });
         try {
-            if (await fileExists(fileToDelete)) {
-                await fs.unlink(fileToDelete);
-            }
+            await deleteFile({
+                filePath: fileToDelete,
+                staticPath
+            });
         } catch (ignore) {
             throw new ErrorDeletingFile(req.t);
         }
-        if (doc.sizes) {
-            const sizes = Object.values(doc.sizes);
+        if (doc.variants) {
+            const sizes = Object.values(doc.variants);
             // Since forEach will not wait until unlink is finished it could
             // happen that two operations will try to delete the same file.
             // To avoid this it is recommended to use "sync" instead
             for (const size of sizes){
-                const sizeToDelete = `${staticPath}/${size.filename}`;
+                const sizeToDelete = resolveFilePath({
+                    filename: size.filename,
+                    staticPath
+                });
                 try {
-                    if (await fileExists(sizeToDelete)) {
-                        await fs.unlink(sizeToDelete);
-                    }
+                    await deleteFile({
+                        filePath: sizeToDelete,
+                        staticPath
+                    });
                 } catch (ignore) {
                     throw new ErrorDeletingFile(req.t);
                 }
@@ -33,5 +52,43 @@ export const deleteAssociatedFiles = async ({ collectionConfig, doc, files = [],
         }
     }
 };
+const resolveFilePath = ({ filename, staticPath })=>{
+    if (!filename || !staticPath) {
+        return;
+    }
+    const resolvedDir = path.resolve(staticPath);
+    const filePath = path.resolve(resolvedDir, filename);
+    if (!isWithinDirectory({
+        directory: resolvedDir,
+        target: filePath
+    })) {
+        throw new APIError('Invalid filename.', httpStatus.BAD_REQUEST);
+    }
+    return filePath;
+};
+const deleteFile = async ({ filePath, staticPath })=>{
+    if (!filePath || !staticPath) {
+        return;
+    }
+    if (!await fileExists(filePath)) {
+        return;
+    }
+    const [resolvedDir, resolvedParent] = await Promise.all([
+        fs.realpath(staticPath),
+        fs.realpath(path.dirname(filePath))
+    ]);
+    const resolvedTarget = path.join(resolvedParent, path.basename(filePath));
+    if (!isWithinDirectory({
+        directory: resolvedDir,
+        target: resolvedTarget
+    })) {
+        throw new APIError('Invalid filename.', httpStatus.BAD_REQUEST);
+    }
+    await fs.unlink(filePath);
+};
+const isWithinDirectory = ({ directory, target })=>{
+    const relativePath = path.relative(directory, target);
+    return relativePath === '' || relativePath !== '..' && !relativePath.startsWith(`..${path.sep}`) && !path.isAbsolute(relativePath);
+};
 
 //# sourceMappingURL=deleteAssociatedFiles.js.map

package/dist/uploads/deleteAssociatedFiles.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/uploads/deleteAssociatedFiles.ts"],"sourcesContent":["import fs from 'fs/promises'\n\nimport type { SanitizedCollectionConfig } from '../collections/config/types.js'\nimport type { SanitizedConfig } from '../config/types.js'\nimport type { PayloadRequest } from '../types/index.js'\nimport type { FileData, FileToSave } from './types.js'\n\nimport { ErrorDeletingFile } from '../errors/index.js'\nimport { fileExists } from './fileExists.js'\n\ntype Args = {\n  collectionConfig: SanitizedCollectionConfig\n  config: SanitizedConfig\n  doc: Record<string, unknown>\n  files?: FileToSave[]\n  overrideDelete: boolean\n  req: PayloadRequest\n}\n\nexport const deleteAssociatedFiles: (args: Args) => Promise<void> = async ({\n  collectionConfig,\n  doc,\n  files = [],\n  overrideDelete,\n  req,\n}) => {\n  if (!collectionConfig.upload) {\n    return\n  }\n  if (overrideDelete || files.length > 0) {\n    const { staticDir: staticPath } = collectionConfig.upload\n\n    const fileToDelete = `${staticPath}/${doc.filename as string}`\n\n    try {\n      if (await fileExists(fileToDelete)) {\n        await fs.unlink(fileToDelete)\n      }\n    } catch (ignore) {\n      throw new ErrorDeletingFile(req.t)\n    }\n\n    if (doc.sizes) {\n      const sizes: FileData[] = Object.values(doc.sizes)\n      // Since forEach will not wait until unlink is finished it could\n      // happen that two operations will try to delete the same file.\n      // To avoid this it is recommended to use \"sync\" instead\n\n      for (const size of sizes) {\n        const sizeToDelete = `${staticPath}/${size.filename}`\n        try {\n          if (await fileExists(sizeToDelete)) {\n            await fs.unlink(sizeToDelete)\n          }\n        } catch (ignore) {\n          throw new ErrorDeletingFile(req.t)\n        }\n      }\n    }\n  }\n}\n"],"names":["fs","ErrorDeletingFile","fileExists","deleteAssociatedFiles","collectionConfig","doc","files","overrideDelete","req","upload","length","staticDir","staticPath","fileToDelete","filename","unlink","ignore","t","sizes","Object","values","size","sizeToDelete"],"mappings":"AAAA,OAAOA,QAAQ,cAAa;AAO5B,SAASC,iBAAiB,QAAQ,qBAAoB;AACtD,SAASC,UAAU,QAAQ,kBAAiB;AAW5C,OAAO,MAAMC,wBAAuD,OAAO,EACzEC,gBAAgB,EAChBC,GAAG,EACHC,QAAQ,EAAE,EACVC,cAAc,EACdC,GAAG,EACJ;IACC,IAAI,CAACJ,iBAAiBK,MAAM,EAAE;QAC5B;IACF;IACA,IAAIF,kBAAkBD,MAAMI,MAAM,GAAG,GAAG;QACtC,MAAM,EAAEC,WAAWC,UAAU,EAAE,GAAGR,iBAAiBK,MAAM;QAEzD,MAAMI,eAAe,GAAGD,WAAW,CAAC,EAAEP,IAAIS,QAAQ,EAAY;QAE9D,IAAI;YACF,IAAI,MAAMZ,WAAWW,eAAe;gBAClC,MAAMb,GAAGe,MAAM,CAACF;YAClB;QACF,EAAE,OAAOG,QAAQ;YACf,MAAM,IAAIf,kBAAkBO,IAAIS,CAAC;QACnC;QAEA,IAAIZ,IAAIa,KAAK,EAAE;YACb,MAAMA,QAAoBC,OAAOC,MAAM,CAACf,IAAIa,KAAK;YACjD,gEAAgE;YAChE,+DAA+D;YAC/D,wDAAwD;YAExD,KAAK,MAAMG,QAAQH,MAAO;gBACxB,MAAMI,eAAe,GAAGV,WAAW,CAAC,EAAES,KAAKP,QAAQ,EAAE;gBACrD,IAAI;oBACF,IAAI,MAAMZ,WAAWoB,eAAe;wBAClC,MAAMtB,GAAGe,MAAM,CAACO;oBAClB;gBACF,EAAE,OAAON,QAAQ;oBACf,MAAM,IAAIf,kBAAkBO,IAAIS,CAAC;gBACnC;YACF;QACF;IACF;AACF,EAAC"}
+{"version":3,"sources":["../../src/uploads/deleteAssociatedFiles.ts"],"sourcesContent":["import fs from 'fs/promises'\nimport path from 'path'\n\nimport type { SanitizedCollectionConfig } from '../collections/config/types.js'\nimport type { SanitizedConfig } from '../config/types.js'\nimport type { PayloadRequest } from '../types/index.js'\nimport type { FileData, FileToSave } from './types.js'\n\nimport { APIError, ErrorDeletingFile } from '../errors/index.js'\nimport { httpStatus } from '../utilities/httpStatus.js'\nimport { fileExists } from './fileExists.js'\nimport { withLegacyUploadFileData } from './fileVersioning/storedFiles.js'\n\ntype Args = {\n  collectionConfig: SanitizedCollectionConfig\n  config: SanitizedConfig\n  doc: Record<string, unknown>\n  files?: FileToSave[]\n  overrideDelete: boolean\n  req: PayloadRequest\n}\n\nexport const deleteAssociatedFiles: (args: Args) => Promise<void> = async ({\n  collectionConfig,\n  config,\n  doc,\n  files = [],\n  overrideDelete,\n  req,\n}) => {\n  if (!collectionConfig.upload) {\n    return\n  }\n  const stored = withLegacyUploadFileData({ collection: collectionConfig, config, doc })\n\n  if (collectionConfig.versions || stored.original) {\n    return\n  }\n  if (overrideDelete || files.length > 0) {\n    const { staticDir: staticPath } = collectionConfig.upload\n\n    const fileToDelete = resolveFilePath({\n      filename: doc.filename as string,\n      staticPath,\n    })\n\n    try {\n      await deleteFile({ filePath: fileToDelete, staticPath })\n    } catch (ignore) {\n      throw new ErrorDeletingFile(req.t)\n    }\n\n    if (doc.variants) {\n      const sizes: FileData[] = Object.values(doc.variants)\n      // Since forEach will not wait until unlink is finished it could\n      // happen that two operations will try to delete the same file.\n      // To avoid this it is recommended to use \"sync\" instead\n\n      for (const size of sizes) {\n        const sizeToDelete = resolveFilePath({ filename: size.filename, staticPath })\n        try {\n          await deleteFile({ filePath: sizeToDelete, staticPath })\n        } catch (ignore) {\n          throw new ErrorDeletingFile(req.t)\n        }\n      }\n    }\n  }\n}\n\nconst resolveFilePath = ({\n  filename,\n  staticPath,\n}: {\n  filename?: null | string\n  staticPath?: string\n}) => {\n  if (!filename || !staticPath) {\n    return\n  }\n\n  const resolvedDir = path.resolve(staticPath)\n  const filePath = path.resolve(resolvedDir, filename)\n\n  if (!isWithinDirectory({ directory: resolvedDir, target: filePath })) {\n    throw new APIError('Invalid filename.', httpStatus.BAD_REQUEST)\n  }\n\n  return filePath\n}\n\nconst deleteFile = async ({ filePath, staticPath }: { filePath?: string; staticPath?: string }) => {\n  if (!filePath || !staticPath) {\n    return\n  }\n\n  if (!(await fileExists(filePath))) {\n    return\n  }\n\n  const [resolvedDir, resolvedParent] = await Promise.all([\n    fs.realpath(staticPath),\n    fs.realpath(path.dirname(filePath)),\n  ])\n  const resolvedTarget = path.join(resolvedParent, path.basename(filePath))\n\n  if (!isWithinDirectory({ directory: resolvedDir, target: resolvedTarget })) {\n    throw new APIError('Invalid filename.', httpStatus.BAD_REQUEST)\n  }\n\n  await fs.unlink(filePath)\n}\n\nconst isWithinDirectory = ({ directory, target }: { directory: string; target: string }) => {\n  const relativePath = path.relative(directory, target)\n\n  return (\n    relativePath === '' ||\n    (relativePath !== '..' &&\n      !relativePath.startsWith(`..${path.sep}`) &&\n      !path.isAbsolute(relativePath))\n  )\n}\n"],"names":["fs","path","APIError","ErrorDeletingFile","httpStatus","fileExists","withLegacyUploadFileData","deleteAssociatedFiles","collectionConfig","config","doc","files","overrideDelete","req","upload","stored","collection","versions","original","length","staticDir","staticPath","fileToDelete","resolveFilePath","filename","deleteFile","filePath","ignore","t","variants","sizes","Object","values","size","sizeToDelete","resolvedDir","resolve","isWithinDirectory","directory","target","BAD_REQUEST","resolvedParent","Promise","all","realpath","dirname","resolvedTarget","join","basename","unlink","relativePath","relative","startsWith","sep","isAbsolute"],"mappings":"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"}

package/dist/uploads/detectSvgFromXml.d.ts

@@ -1,5 +1,2 @@
-/**
- * Securely detect if an XML buffer contains a valid SVG document
- */
-export declare function detectSvgFromXml(buffer: Buffer): boolean;
+export declare const detectSvgFromXml: (buffer: Buffer) => boolean;
 //# sourceMappingURL=detectSvgFromXml.d.ts.map

package/dist/uploads/detectSvgFromXml.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"detectSvgFromXml.d.ts","sourceRoot":"","sources":["../../src/uploads/detectSvgFromXml.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CA6CxD"}
+{"version":3,"file":"detectSvgFromXml.d.ts","sourceRoot":"","sources":["../../src/uploads/detectSvgFromXml.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,gBAAgB,WAAY,MAAM,KAAG,OAAmC,CAAA"}

package/dist/uploads/detectSvgFromXml.js

@@ -1,43 +1,4 @@
-/**
- * Securely detect if an XML buffer contains a valid SVG document
- */ export function detectSvgFromXml(buffer) {
-    try {
-        // Limit buffer size to prevent processing large malicious files
-        const maxSize = 2048;
-        const content = buffer.toString('utf8', 0, Math.min(buffer.length, maxSize));
-        // Check for XML declaration and extract encoding if present
-        const xmlDeclMatch = content.match(/^<\?xml[^>]*encoding=["']([^"']+)["']/i);
-        const declaredEncoding = xmlDeclMatch?.[1]?.toLowerCase();
-        // Only support safe encodings
-        if (declaredEncoding && ![
-            'ascii',
-            'utf-8',
-            'utf8'
-        ].includes(declaredEncoding)) {
-            return false;
-        }
-        // Remove XML declarations, comments, and processing instructions
-        const cleanContent = content.replace(/<\?xml[^>]*\?>/gi, '').replace(/<!--[\s\S]*?-->/g, '').replace(/<\?[^>]*\?>/g, '').trim();
-        // Find the first actual element (root element)
-        const rootElementMatch = cleanContent.match(/^<(\w+)(?:\s|>)/);
-        if (!rootElementMatch || rootElementMatch[1] !== 'svg') {
-            return false;
-        }
-        // Validate SVG namespace - must be present for valid SVG
-        const svgNamespaceRegex = /xmlns=["']http:\/\/www\.w3\.org\/2000\/svg["']/;
-        if (!svgNamespaceRegex.test(content)) {
-            return false;
-        }
-        // Additional validation: ensure it's not malformed
-        const svgOpenTag = content.match(/<svg[\s>]/);
-        if (!svgOpenTag) {
-            return false;
-        }
-        return true;
-    } catch (_error) {
-        // If any error occurs during parsing, treat as not SVG
-        return false;
-    }
-}
+import { inspectSvg } from './validateSvg.js';
+export const detectSvgFromXml = (buffer)=>inspectSvg(buffer).isSvg;
 
 //# sourceMappingURL=detectSvgFromXml.js.map

package/dist/uploads/detectSvgFromXml.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/uploads/detectSvgFromXml.ts"],"sourcesContent":["/**\n * Securely detect if an XML buffer contains a valid SVG document\n */\nexport function detectSvgFromXml(buffer: Buffer): boolean {\n  try {\n    // Limit buffer size to prevent processing large malicious files\n    const maxSize = 2048\n    const content = buffer.toString('utf8', 0, Math.min(buffer.length, maxSize))\n\n    // Check for XML declaration and extract encoding if present\n    const xmlDeclMatch = content.match(/^<\\?xml[^>]*encoding=[\"']([^\"']+)[\"']/i)\n    const declaredEncoding = xmlDeclMatch?.[1]?.toLowerCase()\n\n    // Only support safe encodings\n    if (declaredEncoding && !['ascii', 'utf-8', 'utf8'].includes(declaredEncoding)) {\n      return false\n    }\n\n    // Remove XML declarations, comments, and processing instructions\n    const cleanContent = content\n      .replace(/<\\?xml[^>]*\\?>/gi, '')\n      .replace(/<!--[\\s\\S]*?-->/g, '')\n      .replace(/<\\?[^>]*\\?>/g, '')\n      .trim()\n\n    // Find the first actual element (root element)\n    const rootElementMatch = cleanContent.match(/^<(\\w+)(?:\\s|>)/)\n    if (!rootElementMatch || rootElementMatch[1] !== 'svg') {\n      return false\n    }\n\n    // Validate SVG namespace - must be present for valid SVG\n    const svgNamespaceRegex = /xmlns=[\"']http:\\/\\/www\\.w3\\.org\\/2000\\/svg[\"']/\n    if (!svgNamespaceRegex.test(content)) {\n      return false\n    }\n\n    // Additional validation: ensure it's not malformed\n    const svgOpenTag = content.match(/<svg[\\s>]/)\n    if (!svgOpenTag) {\n      return false\n    }\n\n    return true\n  } catch (_error) {\n    // If any error occurs during parsing, treat as not SVG\n    return false\n  }\n}\n"],"names":["detectSvgFromXml","buffer","maxSize","content","toString","Math","min","length","xmlDeclMatch","match","declaredEncoding","toLowerCase","includes","cleanContent","replace","trim","rootElementMatch","svgNamespaceRegex","test","svgOpenTag","_error"],"mappings":"AAAA;;CAEC,GACD,OAAO,SAASA,iBAAiBC,MAAc;IAC7C,IAAI;QACF,gEAAgE;QAChE,MAAMC,UAAU;QAChB,MAAMC,UAAUF,OAAOG,QAAQ,CAAC,QAAQ,GAAGC,KAAKC,GAAG,CAACL,OAAOM,MAAM,EAAEL;QAEnE,4DAA4D;QAC5D,MAAMM,eAAeL,QAAQM,KAAK,CAAC;QACnC,MAAMC,mBAAmBF,cAAc,CAAC,EAAE,EAAEG;QAE5C,8BAA8B;QAC9B,IAAID,oBAAoB,CAAC;YAAC;YAAS;YAAS;SAAO,CAACE,QAAQ,CAACF,mBAAmB;YAC9E,OAAO;QACT;QAEA,iEAAiE;QACjE,MAAMG,eAAeV,QAClBW,OAAO,CAAC,oBAAoB,IAC5BA,OAAO,CAAC,oBAAoB,IAC5BA,OAAO,CAAC,gBAAgB,IACxBC,IAAI;QAEP,+CAA+C;QAC/C,MAAMC,mBAAmBH,aAAaJ,KAAK,CAAC;QAC5C,IAAI,CAACO,oBAAoBA,gBAAgB,CAAC,EAAE,KAAK,OAAO;YACtD,OAAO;QACT;QAEA,yDAAyD;QACzD,MAAMC,oBAAoB;QAC1B,IAAI,CAACA,kBAAkBC,IAAI,CAACf,UAAU;YACpC,OAAO;QACT;QAEA,mDAAmD;QACnD,MAAMgB,aAAahB,QAAQM,KAAK,CAAC;QACjC,IAAI,CAACU,YAAY;YACf,OAAO;QACT;QAEA,OAAO;IACT,EAAE,OAAOC,QAAQ;QACf,uDAAuD;QACvD,OAAO;IACT;AACF"}
+{"version":3,"sources":["../../src/uploads/detectSvgFromXml.ts"],"sourcesContent":["import { inspectSvg } from './validateSvg.js'\n\nexport const detectSvgFromXml = (buffer: Buffer): boolean => inspectSvg(buffer).isSvg\n"],"names":["inspectSvg","detectSvgFromXml","buffer","isSvg"],"mappings":"AAAA,SAASA,UAAU,QAAQ,mBAAkB;AAE7C,OAAO,MAAMC,mBAAmB,CAACC,SAA4BF,WAAWE,QAAQC,KAAK,CAAA"}

package/dist/uploads/docWithFilenameExists.d.ts

@@ -2,10 +2,11 @@ import type { PayloadRequest } from '../types/index.js';
 type Args = {
     collectionSlug: string;
     filename: string;
+    matchAnyPrefix?: boolean;
     path: string;
     prefix?: string;
     req: PayloadRequest;
 };
-export declare const docWithFilenameExists: ({ collectionSlug, filename, prefix, req, }: Args) => Promise<boolean>;
+export declare const docWithFilenameExists: ({ collectionSlug, filename, matchAnyPrefix, prefix, req, }: Args) => Promise<boolean>;
 export {};
 //# sourceMappingURL=docWithFilenameExists.d.ts.map

package/dist/uploads/docWithFilenameExists.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"docWithFilenameExists.d.ts","sourceRoot":"","sources":["../../src/uploads/docWithFilenameExists.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAS,MAAM,mBAAmB,CAAA;AAE9D,KAAK,IAAI,GAAG;IACV,cAAc,EAAE,MAAM,CAAA;IACtB,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,GAAG,EAAE,cAAc,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,qBAAqB,+CAK/B,IAAI,KAAG,OAAO,CAAC,OAAO,CAkBxB,CAAA"}
+{"version":3,"file":"docWithFilenameExists.d.ts","sourceRoot":"","sources":["../../src/uploads/docWithFilenameExists.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAS,MAAM,mBAAmB,CAAA;AAI9D,KAAK,IAAI,GAAG;IACV,cAAc,EAAE,MAAM,CAAA;IACtB,QAAQ,EAAE,MAAM,CAAA;IAChB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,GAAG,EAAE,cAAc,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,qBAAqB,+DAM/B,IAAI,KAAG,OAAO,CAAC,OAAO,CAuBxB,CAAA"}

package/dist/uploads/docWithFilenameExists.js

@@ -1,14 +1,22 @@
-export const docWithFilenameExists = async ({ collectionSlug, filename, prefix, req })=>{
-    const where = {
-        filename: {
-            equals: filename
-        }
-    };
-    if (prefix) {
-        where.prefix = {
-            equals: prefix
-        };
-    }
+import { buildFilenameWhere } from './transformers/resolveUploadDocument.js';
+export const docWithFilenameExists = async ({ collectionSlug, filename, matchAnyPrefix = false, prefix, req })=>{
+    const collection = req.payload.collections[collectionSlug]?.config;
+    const upload = collection?.upload;
+    const hasPrefixField = (collection?.fields ?? []).some((field)=>'name' in field && field.name === 'prefix');
+    const filenameCondition = buildFilenameWhere({
+        filename,
+        variants: upload && typeof upload === 'object' ? upload.variants : undefined
+    });
+    const where = !matchAnyPrefix && typeof prefix === 'string' && hasPrefixField ? {
+        and: [
+            filenameCondition,
+            {
+                prefix: {
+                    equals: prefix
+                }
+            }
+        ]
+    } : filenameCondition;
     const doc = await req.payload.db.findOne({
         collection: collectionSlug,
         req,

package/dist/uploads/docWithFilenameExists.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/uploads/docWithFilenameExists.ts"],"sourcesContent":["import type { PayloadRequest, Where } from '../types/index.js'\n\ntype Args = {\n  collectionSlug: string\n  filename: string\n  path: string\n  prefix?: string\n  req: PayloadRequest\n}\n\nexport const docWithFilenameExists = async ({\n  collectionSlug,\n  filename,\n  prefix,\n  req,\n}: Args): Promise<boolean> => {\n  const where: Where = {\n    filename: {\n      equals: filename,\n    },\n  }\n\n  if (prefix) {\n    where.prefix = { equals: prefix }\n  }\n\n  const doc = await req.payload.db.findOne({\n    collection: collectionSlug,\n    req,\n    where,\n  })\n\n  return !!doc\n}\n"],"names":["docWithFilenameExists","collectionSlug","filename","prefix","req","where","equals","doc","payload","db","findOne","collection"],"mappings":"AAUA,OAAO,MAAMA,wBAAwB,OAAO,EAC1CC,cAAc,EACdC,QAAQ,EACRC,MAAM,EACNC,GAAG,EACE;IACL,MAAMC,QAAe;QACnBH,UAAU;YACRI,QAAQJ;QACV;IACF;IAEA,IAAIC,QAAQ;QACVE,MAAMF,MAAM,GAAG;YAAEG,QAAQH;QAAO;IAClC;IAEA,MAAMI,MAAM,MAAMH,IAAII,OAAO,CAACC,EAAE,CAACC,OAAO,CAAC;QACvCC,YAAYV;QACZG;QACAC;IACF;IAEA,OAAO,CAAC,CAACE;AACX,EAAC"}
+{"version":3,"sources":["../../src/uploads/docWithFilenameExists.ts"],"sourcesContent":["import type { PayloadRequest, Where } from '../types/index.js'\n\nimport { buildFilenameWhere } from './transformers/resolveUploadDocument.js'\n\ntype Args = {\n  collectionSlug: string\n  filename: string\n  matchAnyPrefix?: boolean\n  path: string\n  prefix?: string\n  req: PayloadRequest\n}\n\nexport const docWithFilenameExists = async ({\n  collectionSlug,\n  filename,\n  matchAnyPrefix = false,\n  prefix,\n  req,\n}: Args): Promise<boolean> => {\n  const collection = req.payload.collections[collectionSlug]?.config\n  const upload = collection?.upload\n  const hasPrefixField = (collection?.fields ?? []).some(\n    (field) => 'name' in field && field.name === 'prefix',\n  )\n  const filenameCondition = buildFilenameWhere({\n    filename,\n    variants: upload && typeof upload === 'object' ? upload.variants : undefined,\n  })\n\n  const where: Where =\n    !matchAnyPrefix && typeof prefix === 'string' && hasPrefixField\n      ? { and: [filenameCondition, { prefix: { equals: prefix } }] }\n      : filenameCondition\n\n  const doc = await req.payload.db.findOne({\n    collection: collectionSlug,\n    req,\n    where,\n  })\n\n  return !!doc\n}\n"],"names":["buildFilenameWhere","docWithFilenameExists","collectionSlug","filename","matchAnyPrefix","prefix","req","collection","payload","collections","config","upload","hasPrefixField","fields","some","field","name","filenameCondition","variants","undefined","where","and","equals","doc","db","findOne"],"mappings":"AAEA,SAASA,kBAAkB,QAAQ,0CAAyC;AAW5E,OAAO,MAAMC,wBAAwB,OAAO,EAC1CC,cAAc,EACdC,QAAQ,EACRC,iBAAiB,KAAK,EACtBC,MAAM,EACNC,GAAG,EACE;IACL,MAAMC,aAAaD,IAAIE,OAAO,CAACC,WAAW,CAACP,eAAe,EAAEQ;IAC5D,MAAMC,SAASJ,YAAYI;IAC3B,MAAMC,iBAAiB,AAACL,CAAAA,YAAYM,UAAU,EAAE,AAAD,EAAGC,IAAI,CACpD,CAACC,QAAU,UAAUA,SAASA,MAAMC,IAAI,KAAK;IAE/C,MAAMC,oBAAoBjB,mBAAmB;QAC3CG;QACAe,UAAUP,UAAU,OAAOA,WAAW,WAAWA,OAAOO,QAAQ,GAAGC;IACrE;IAEA,MAAMC,QACJ,CAAChB,kBAAkB,OAAOC,WAAW,YAAYO,iBAC7C;QAAES,KAAK;YAACJ;YAAmB;gBAAEZ,QAAQ;oBAAEiB,QAAQjB;gBAAO;YAAE;SAAE;IAAC,IAC3DY;IAEN,MAAMM,MAAM,MAAMjB,IAAIE,OAAO,CAACgB,EAAE,CAACC,OAAO,CAAC;QACvClB,YAAYL;QACZI;QACAc;IACF;IAEA,OAAO,CAAC,CAACG;AACX,EAAC"}

package/dist/uploads/downloadFileToBuffer.d.ts

@@ -0,0 +1,11 @@
+import type { PayloadRequest } from '../types/index.js';
+import type { File, FileData, UploadConfig } from './types.js';
+type Args = {
+    data: Pick<FileData, 'filename' | 'url'>;
+    req: PayloadRequest;
+    uploadConfig: UploadConfig;
+};
+/** Downloads a file into a Payload File buffer, including existing files being resized or copied. */
+export declare const downloadFileToBuffer: ({ data, req, uploadConfig }: Args) => Promise<File>;
+export {};
+//# sourceMappingURL=downloadFileToBuffer.d.ts.map

package/dist/uploads/downloadFileToBuffer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"downloadFileToBuffer.d.ts","sourceRoot":"","sources":["../../src/uploads/downloadFileToBuffer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AACvD,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAM9D,KAAK,IAAI,GAAG;IACV,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,UAAU,GAAG,KAAK,CAAC,CAAA;IACxC,GAAG,EAAE,cAAc,CAAA;IACnB,YAAY,EAAE,YAAY,CAAA;CAC3B,CAAA;AAeD,qGAAqG;AACrG,eAAO,MAAM,oBAAoB,gCAAuC,IAAI,KAAG,OAAO,CAAC,IAAI,CAuE1F,CAAA"}

package/dist/uploads/downloadFileToBuffer.js

@@ -0,0 +1,72 @@
+import { APIError } from '../errors/index.js';
+import { getRequestOrigin } from '../utilities/getRequestOrigin.js';
+import { fetchWithRedirects, parseFileURL } from './fetchWithRedirects.js';
+const hasProtocol = (url)=>/^[a-z][a-z\d+.-]*:/i.test(url);
+const getRequestBaseURL = (req)=>{
+    try {
+        const requestURL = parseFileURL(req.url);
+        const host = req.headers.get('host') || requestURL.host;
+        return parseFileURL(`${requestURL.protocol}//${host}`);
+    } catch  {
+        return undefined;
+    }
+};
+/** Downloads a file into a Payload File buffer, including existing files being resized or copied. */ export const downloadFileToBuffer = async ({ data, req, uploadConfig })=>{
+    const { filename, url } = data;
+    if (typeof url === 'string') {
+        let baseOrigin;
+        let parsedFileURL;
+        if (hasProtocol(url)) {
+            parsedFileURL = parseFileURL(url);
+        } else {
+            const requestOrigin = getRequestOrigin({
+                config: req.payload.config,
+                req
+            });
+            let requestBaseURL;
+            if (requestOrigin) {
+                requestBaseURL = parseFileURL(requestOrigin);
+                baseOrigin = requestBaseURL.origin;
+            } else {
+                requestBaseURL = getRequestBaseURL(req);
+            }
+            if (!requestBaseURL) {
+                throw new APIError('Unable to determine an HTTP(S) base URL for the external file.', 400);
+            }
+            parsedFileURL = parseFileURL(url, requestBaseURL);
+        }
+        const fileURL = parsedFileURL.toString();
+        const requestHeaders = Object.fromEntries(new Headers(req.headers));
+        const cookies = (req.headers.get('cookie') ?? '').split(';');
+        const getHeaders = (currentURL)=>{
+            const isSameOrigin = Boolean(baseOrigin && new URL(currentURL).origin === baseOrigin);
+            return uploadConfig.externalFileHeaderFilter ? uploadConfig.externalFileHeaderFilter({
+                ...requestHeaders
+            }, {
+                isSameOrigin,
+                url: currentURL
+            }) : {
+                cookie: cookies.filter((cookie)=>isSameOrigin || !cookie.trim().startsWith(req.payload.config.cookiePrefix)).join(';')
+            };
+        };
+        const { response, url: resolvedURL } = await fetchWithRedirects({
+            allowList: uploadConfig.pasteURL ? uploadConfig.pasteURL.allowList : undefined,
+            getHeaders,
+            skipSafeFetch: uploadConfig.skipSafeFetch,
+            url: fileURL
+        });
+        if (!response.ok) {
+            throw new APIError(`Failed to fetch file from ${resolvedURL}`, response.status);
+        }
+        const data = await response.arrayBuffer();
+        return {
+            name: filename,
+            data: Buffer.from(data),
+            mimetype: response.headers.get('content-type') || undefined,
+            size: Number(response.headers.get('content-length')) || 0
+        };
+    }
+    throw new APIError('Invalid file url', 400);
+};
+
+//# sourceMappingURL=downloadFileToBuffer.js.map

package/dist/uploads/downloadFileToBuffer.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/uploads/downloadFileToBuffer.ts"],"sourcesContent":["import type { PayloadRequest } from '../types/index.js'\nimport type { File, FileData, UploadConfig } from './types.js'\n\nimport { APIError } from '../errors/index.js'\nimport { getRequestOrigin } from '../utilities/getRequestOrigin.js'\nimport { fetchWithRedirects, parseFileURL } from './fetchWithRedirects.js'\n\ntype Args = {\n  data: Pick<FileData, 'filename' | 'url'>\n  req: PayloadRequest\n  uploadConfig: UploadConfig\n}\n\nconst hasProtocol = (url: string): boolean => /^[a-z][a-z\\d+.-]*:/i.test(url)\n\nconst getRequestBaseURL = (req: PayloadRequest): undefined | URL => {\n  try {\n    const requestURL = parseFileURL(req.url!)\n    const host = req.headers.get('host') || requestURL.host\n\n    return parseFileURL(`${requestURL.protocol}//${host}`)\n  } catch {\n    return undefined\n  }\n}\n\n/** Downloads a file into a Payload File buffer, including existing files being resized or copied. */\nexport const downloadFileToBuffer = async ({ data, req, uploadConfig }: Args): Promise<File> => {\n  const { filename, url } = data\n\n  if (typeof url === 'string') {\n    let baseOrigin: string | undefined\n    let parsedFileURL: URL\n\n    if (hasProtocol(url)) {\n      parsedFileURL = parseFileURL(url)\n    } else {\n      const requestOrigin = getRequestOrigin({ config: req.payload.config, req })\n      let requestBaseURL: undefined | URL\n\n      if (requestOrigin) {\n        requestBaseURL = parseFileURL(requestOrigin)\n        baseOrigin = requestBaseURL.origin\n      } else {\n        requestBaseURL = getRequestBaseURL(req)\n      }\n\n      if (!requestBaseURL) {\n        throw new APIError('Unable to determine an HTTP(S) base URL for the external file.', 400)\n      }\n\n      parsedFileURL = parseFileURL(url, requestBaseURL)\n    }\n\n    const fileURL = parsedFileURL.toString()\n    const requestHeaders = Object.fromEntries(new Headers(req.headers))\n    const cookies = (req.headers.get('cookie') ?? '').split(';')\n\n    const getHeaders = (currentURL: string): Record<string, string> => {\n      const isSameOrigin = Boolean(baseOrigin && new URL(currentURL).origin === baseOrigin)\n\n      return uploadConfig.externalFileHeaderFilter\n        ? uploadConfig.externalFileHeaderFilter(\n            { ...requestHeaders },\n            { isSameOrigin, url: currentURL },\n          )\n        : {\n            cookie: cookies\n              .filter(\n                (cookie) =>\n                  isSameOrigin || !cookie.trim().startsWith(req.payload.config.cookiePrefix),\n              )\n              .join(';'),\n          }\n    }\n\n    const { response, url: resolvedURL } = await fetchWithRedirects({\n      allowList: uploadConfig.pasteURL ? uploadConfig.pasteURL.allowList : undefined,\n      getHeaders,\n      skipSafeFetch: uploadConfig.skipSafeFetch,\n      url: fileURL,\n    })\n\n    if (!response.ok) {\n      throw new APIError(`Failed to fetch file from ${resolvedURL}`, response.status)\n    }\n\n    const data = await response.arrayBuffer()\n\n    return {\n      name: filename,\n      data: Buffer.from(data),\n      mimetype: response.headers.get('content-type') || undefined!,\n      size: Number(response.headers.get('content-length')) || 0,\n    }\n  }\n\n  throw new APIError('Invalid file url', 400)\n}\n"],"names":["APIError","getRequestOrigin","fetchWithRedirects","parseFileURL","hasProtocol","url","test","getRequestBaseURL","req","requestURL","host","headers","get","protocol","undefined","downloadFileToBuffer","data","uploadConfig","filename","baseOrigin","parsedFileURL","requestOrigin","config","payload","requestBaseURL","origin","fileURL","toString","requestHeaders","Object","fromEntries","Headers","cookies","split","getHeaders","currentURL","isSameOrigin","Boolean","URL","externalFileHeaderFilter","cookie","filter","trim","startsWith","cookiePrefix","join","response","resolvedURL","allowList","pasteURL","skipSafeFetch","ok","status","arrayBuffer","name","Buffer","from","mimetype","size","Number"],"mappings":"AAGA,SAASA,QAAQ,QAAQ,qBAAoB;AAC7C,SAASC,gBAAgB,QAAQ,mCAAkC;AACnE,SAASC,kBAAkB,EAAEC,YAAY,QAAQ,0BAAyB;AAQ1E,MAAMC,cAAc,CAACC,MAAyB,sBAAsBC,IAAI,CAACD;AAEzE,MAAME,oBAAoB,CAACC;IACzB,IAAI;QACF,MAAMC,aAAaN,aAAaK,IAAIH,GAAG;QACvC,MAAMK,OAAOF,IAAIG,OAAO,CAACC,GAAG,CAAC,WAAWH,WAAWC,IAAI;QAEvD,OAAOP,aAAa,GAAGM,WAAWI,QAAQ,CAAC,EAAE,EAAEH,MAAM;IACvD,EAAE,OAAM;QACN,OAAOI;IACT;AACF;AAEA,mGAAmG,GACnG,OAAO,MAAMC,uBAAuB,OAAO,EAAEC,IAAI,EAAER,GAAG,EAAES,YAAY,EAAQ;IAC1E,MAAM,EAAEC,QAAQ,EAAEb,GAAG,EAAE,GAAGW;IAE1B,IAAI,OAAOX,QAAQ,UAAU;QAC3B,IAAIc;QACJ,IAAIC;QAEJ,IAAIhB,YAAYC,MAAM;YACpBe,gBAAgBjB,aAAaE;QAC/B,OAAO;YACL,MAAMgB,gBAAgBpB,iBAAiB;gBAAEqB,QAAQd,IAAIe,OAAO,CAACD,MAAM;gBAAEd;YAAI;YACzE,IAAIgB;YAEJ,IAAIH,eAAe;gBACjBG,iBAAiBrB,aAAakB;gBAC9BF,aAAaK,eAAeC,MAAM;YACpC,OAAO;gBACLD,iBAAiBjB,kBAAkBC;YACrC;YAEA,IAAI,CAACgB,gBAAgB;gBACnB,MAAM,IAAIxB,SAAS,kEAAkE;YACvF;YAEAoB,gBAAgBjB,aAAaE,KAAKmB;QACpC;QAEA,MAAME,UAAUN,cAAcO,QAAQ;QACtC,MAAMC,iBAAiBC,OAAOC,WAAW,CAAC,IAAIC,QAAQvB,IAAIG,OAAO;QACjE,MAAMqB,UAAU,AAACxB,CAAAA,IAAIG,OAAO,CAACC,GAAG,CAAC,aAAa,EAAC,EAAGqB,KAAK,CAAC;QAExD,MAAMC,aAAa,CAACC;YAClB,MAAMC,eAAeC,QAAQlB,cAAc,IAAImB,IAAIH,YAAYV,MAAM,KAAKN;YAE1E,OAAOF,aAAasB,wBAAwB,GACxCtB,aAAasB,wBAAwB,CACnC;gBAAE,GAAGX,cAAc;YAAC,GACpB;gBAAEQ;gBAAc/B,KAAK8B;YAAW,KAElC;gBACEK,QAAQR,QACLS,MAAM,CACL,CAACD,SACCJ,gBAAgB,CAACI,OAAOE,IAAI,GAAGC,UAAU,CAACnC,IAAIe,OAAO,CAACD,MAAM,CAACsB,YAAY,GAE5EC,IAAI,CAAC;YACV;QACN;QAEA,MAAM,EAAEC,QAAQ,EAAEzC,KAAK0C,WAAW,EAAE,GAAG,MAAM7C,mBAAmB;YAC9D8C,WAAW/B,aAAagC,QAAQ,GAAGhC,aAAagC,QAAQ,CAACD,SAAS,GAAGlC;YACrEoB;YACAgB,eAAejC,aAAaiC,aAAa;YACzC7C,KAAKqB;QACP;QAEA,IAAI,CAACoB,SAASK,EAAE,EAAE;YAChB,MAAM,IAAInD,SAAS,CAAC,0BAA0B,EAAE+C,aAAa,EAAED,SAASM,MAAM;QAChF;QAEA,MAAMpC,OAAO,MAAM8B,SAASO,WAAW;QAEvC,OAAO;YACLC,MAAMpC;YACNF,MAAMuC,OAAOC,IAAI,CAACxC;YAClByC,UAAUX,SAASnC,OAAO,CAACC,GAAG,CAAC,mBAAmBE;YAClD4C,MAAMC,OAAOb,SAASnC,OAAO,CAACC,GAAG,CAAC,sBAAsB;QAC1D;IACF;IAEA,MAAM,IAAIZ,SAAS,oBAAoB;AACzC,EAAC"}

package/dist/uploads/endpoints/getFile.d.ts

@@ -1,3 +1,20 @@
+import type { Collection, TypeWithID } from '../../collections/config/types.js';
 import type { PayloadHandler } from '../../config/types.js';
+import type { PayloadRequest } from '../../types/index.js';
+import type { FileHandlerOperation } from '../types.js';
 export declare const getFileHandler: PayloadHandler;
+/**
+ * Shared by the ordinary `read` endpoint and, via `operation: 'transform'`, by
+ * `getSourceFileResponse` for internal source retrieval. `transform` ignores the
+ * `Range` header and skips `modifyResponseHeaders`/CORS wrapping, since those are
+ * applied once, later, to the transformer pipeline's final response.
+ */
+export declare function retrieveFileResponse({ collection, doc, filename, operation, prefix, req, }: {
+    collection: Collection;
+    doc?: TypeWithID;
+    filename: string;
+    operation?: FileHandlerOperation;
+    prefix?: string;
+    req: PayloadRequest;
+}): Promise<Response>;
 //# sourceMappingURL=getFile.d.ts.map

package/dist/uploads/endpoints/getFile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getFile.d.ts","sourceRoot":"","sources":["../../../src/uploads/endpoints/getFile.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAU3D,eAAO,MAAM,cAAc,EAAE,cA6J5B,CAAA"}
+{"version":3,"file":"getFile.d.ts","sourceRoot":"","sources":["../../../src/uploads/endpoints/getFile.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAA;AAC/E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAiBvD,eAAO,MAAM,cAAc,EAAE,cAmD5B,CAAA;AAED;;;;;GAKG;AACH,wBAAsB,oBAAoB,CAAC,EACzC,UAAU,EACV,GAAG,EACH,QAAQ,EACR,SAAkB,EAClB,MAAM,EACN,GAAG,GACJ,EAAE;IACD,UAAU,EAAE,UAAU,CAAA;IACtB,GAAG,CAAC,EAAE,UAAU,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,oBAAoB,CAAA;IAChC,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,GAAG,EAAE,cAAc,CAAA;CACpB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAiJpB"}