@opengis/fastify-table 2.5.14 → 2.5.15

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AA8FA,iBAAe,MAAM,CAAC,OAAO,EAAE,GAAG,iBAkOjC;;AACD,wBAEG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AA8FA,iBAAe,MAAM,CAAC,OAAO,EAAE,GAAG,iBA2OjC;;AACD,wBAEG"}

package/dist/index.js

@@ -164,13 +164,21 @@ async function plugin(fastify) {
     if (config.dblist) {
         fastify.register(dblistRoutes, opt);
     }
-    fastify.addHook('preHandler', async (request, reply) => {
+    fastify.addHook("preValidation", async (request) => {
+        Object.keys(request.query || {})
+            .filter((key) => request.query[key] === "")
+            .forEach((key) => delete request.query[key]);
+        Object.keys(request.body || {})
+            .filter((key) => request.body[key] === "")
+            .forEach((key) => delete request.body[key]);
+    });
+    fastify.addHook("preHandler", async (request, reply) => {
         const q = request.query;
         if (q?.limit !== undefined) {
             const limit = Number(q.limit);
             if (!Number.isInteger(limit) || limit < 1 || limit > 1000) {
                 reply.code(400).send({
-                    error: 'Invalid limit (1-100)'
+                    error: "Invalid limit (1-100)",
                 });
             }
         }
@@ -178,7 +186,7 @@ async function plugin(fastify) {
             const offset = Number(q.offset);
             if (!Number.isInteger(offset) || offset < 0) {
                 reply.code(400).send({
-                    error: 'Invalid offset (>=0)'
+                    error: "Invalid offset (>=0)",
                 });
             }
         }
@@ -186,7 +194,7 @@ async function plugin(fastify) {
             const page = Number(q.page);
             if (!Number.isInteger(page) || page > 100000) {
                 reply.code(400).send({
-                    error: 'Invalid page (<=100000)'
+                    error: "Invalid page (<=100000)",
                 });
             }
         }

package/dist/server/plugins/file/uploadMultiPart.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uploadMultiPart.d.ts","sourceRoot":"","sources":["../../../../server/plugins/file/uploadMultiPart.ts"],"names":[],"mappings":"AA6BA,MAAM,WAAW,KAAK;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AA2CD,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,mBAkBvE;AAED,wBAAsB,gBAAgB,CACpC,EACE,IAAI,EAAE,QAAQ,EACd,MAA2C,EAC3C,MAAM,GACP,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EACpD,MAAM,MAAW,mBA+BlB;AAED,wBAAsB,eAAe,CACnC,GAAG,EAAE,GAAG,EACR,EACE,UAAU,EACV,GAAG,EACH,MAAM,EACN,gBAAwB,GACzB,GAAE;IACD,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CACvB,GACL,OAAO,CAAC,KAAK,CAAC,CAiHhB;AAED,eAAe,eAAe,CAAC"}
+{"version":3,"file":"uploadMultiPart.d.ts","sourceRoot":"","sources":["../../../../server/plugins/file/uploadMultiPart.ts"],"names":[],"mappings":"AA6BA,MAAM,WAAW,KAAK;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AA2CD,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,mBAkBvE;AAED,wBAAsB,gBAAgB,CACpC,EACE,IAAI,EAAE,QAAQ,EACd,MAA2C,EAC3C,MAAM,GACP,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EACpD,MAAM,MAAW,mBA+BlB;AAED,wBAAsB,eAAe,CACnC,GAAG,EAAE,GAAG,EACR,EACE,UAAU,EACV,GAAG,EACH,MAAM,EACN,gBAAwB,GACzB,GAAE;IACD,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CACvB,GACL,OAAO,CAAC,KAAK,CAAC,CAmHhB;AAED,eAAe,eAAe,CAAC"}

package/dist/server/plugins/file/uploadMultiPart.js

@@ -105,9 +105,7 @@ export async function uploadMultiPart(req, { extensions, raw, subdir, originalFi
         throw new BadRequestError("file buffer is empty");
     }
     const { ext: fileExtension } = (await fileTypeFromBuffer(fileBuffer)) || {};
-    if (fileExtension !== ext.substring(1)) {
-        throw new ConflictError("file type spoofing attempt detected");
-    }
+    const nameExt = ext.substring(1);
     // return buffer for custom upload
     if (raw) {
         return {
@@ -118,6 +116,9 @@ export async function uploadMultiPart(req, { extensions, raw, subdir, originalFi
             fields: value.fields,
         };
     }
+    if (fileExtension !== nameExt) {
+        throw new ConflictError("file type spoofing attempt detected");
+    }
     const dir = subdir != null ? subdir : req.params?.["*"] || "uploads";
     const yearMonthDay = subdir != null ? "" : new Date().toISOString().split("T")[0];
     const dbname = req.pg?.options?.database || req.pg?.database || config.pg?.database; // request / config params / default config params

package/dist/server/plugins/file/utils/allowedExtensions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"allowedExtensions.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/file/utils/allowedExtensions.ts"],"names":[],"mappings":"AAIA,QAAA,MAAM,GAAG,EAAE,MAAM,EAwBhB,CAAC;AAEF,QAAA,MAAM,MAAM,EAAE,MAAM,EAInB,CAAC;AAEF,QAAA,MAAM,MAAM,EAAE,MAAM,EAEnB,CAAC;AAEF,QAAA,MAAM,SAAS,EAAE,MAAM,EActB,CAAC;AAEF,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;;;;;;;AAE1C,wBAKE"}
+{"version":3,"file":"allowedExtensions.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/file/utils/allowedExtensions.ts"],"names":[],"mappings":"AAIA,QAAA,MAAM,GAAG,EAAE,MAAM,EAyBhB,CAAC;AAEF,QAAA,MAAM,MAAM,EAAE,MAAM,EAInB,CAAC;AAEF,QAAA,MAAM,MAAM,EAAE,MAAM,EAEnB,CAAC;AAEF,QAAA,MAAM,SAAS,EAAE,MAAM,EAetB,CAAC;AAEF,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;;;;;;;AAE1C,wBAKE"}

package/dist/server/plugins/file/utils/allowedExtensions.js

@@ -25,6 +25,7 @@ const all = envExtensions || [
     "mp4",
     "mov",
     "xml",
+    "p7s"
 ];
 const images = all.filter((ext) => ["jpg", "jpeg", "png", "tiff", "tif", "ico", "svg", "heic", "webp"].includes(ext));
 const videos = all.filter((ext) => ["mp4", "mov", "avi"].includes(ext));
@@ -40,6 +41,7 @@ const documents = all.filter((ext) => [
     "xml",
     "ppt",
     "pptx",
+    "p7s"
 ].includes(ext));
 export { all, images, videos, documents };
 export default {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "2.5.14",
+  "version": "2.5.15",
   "type": "module",
   "description": "core-plugins",
   "keywords": [