@nestjs/platform-fastify 11.1.13 → 11.1.14

package/adapters/fastify-adapter.d.ts

@@ -121,5 +121,8 @@ export declare class FastifyAdapter<TServer extends RawServerBase = RawServerDef
     private registerMiddie;
     private getRequestOriginalUrl;
     private injectRouteOptions;
+    private sanitizeUrl;
+    private removeDuplicateSlashes;
+    private trimLastSlash;
 }
 export {};

package/adapters/fastify-adapter.js

@@ -399,7 +399,7 @@ class FastifyAdapter extends http_adapter_1.AbstractHttpAdapter {
                     let pathname = queryParamsIndex >= 0
                         ? req.originalUrl.slice(0, queryParamsIndex)
                         : req.originalUrl;
-                    pathname = (0, url_sanitizer_1.safeDecodeURI)(pathname).path;
+                    pathname = this.sanitizeUrl(pathname);
                     if (!re.exec(pathname + '/') && normalizedPath) {
                         return next();
                     }
@@ -501,5 +501,35 @@ class FastifyAdapter extends http_adapter_1.AbstractHttpAdapter {
         }
         return this.instance.route(routeToInject);
     }
+    sanitizeUrl(url) {
+        const initialConfig = this.instance.initialConfig;
+        const routerOptions = initialConfig.routerOptions;
+        if (routerOptions.ignoreDuplicateSlashes ||
+            initialConfig.ignoreDuplicateSlashes) {
+            url = this.removeDuplicateSlashes(url);
+        }
+        if (routerOptions.ignoreTrailingSlash ||
+            initialConfig.ignoreTrailingSlash) {
+            url = this.trimLastSlash(url);
+        }
+        if (routerOptions.caseSensitive === false ||
+            initialConfig.caseSensitive === false) {
+            url = url.toLowerCase();
+        }
+        return (0, url_sanitizer_1.safeDecodeURI)(url, routerOptions.useSemicolonDelimiter ||
+            initialConfig.useSemicolonDelimiter).path;
+    }
+    removeDuplicateSlashes(path) {
+        const REMOVE_DUPLICATE_SLASHES_REGEXP = /\/\/+/g;
+        return path.indexOf('//') !== -1
+            ? path.replace(REMOVE_DUPLICATE_SLASHES_REGEXP, '/')
+            : path;
+    }
+    trimLastSlash(path) {
+        if (path.length > 1 && path.charCodeAt(path.length - 1) === 47) {
+            return path.slice(0, -1);
+        }
+        return path;
+    }
 }
 exports.FastifyAdapter = FastifyAdapter;

package/adapters/middie/fastify-middie.js

@@ -5,17 +5,20 @@ const fastify_plugin_1 = require("fastify-plugin");
 const url_sanitizer_1 = require("find-my-way/lib/url-sanitizer");
 const path_to_regexp_1 = require("path-to-regexp");
 const reusify = require("reusify");
+function bindLast(fn, last) {
+    return (...args) => fn(...args, last);
+}
 /**
  * A clone of `@fastify/middie` engine https://github.com/fastify/middie
  * with an extra vulnerability fix. Path is now decoded before matching to
  * avoid bypassing middleware with encoded characters.
  */
-function middie(complete) {
+function middie(complete, initialConfig) {
     const middlewares = [];
     const pool = reusify(Holder);
     return {
         use,
-        run,
+        run: bindLast(run, initialConfig),
     };
     function use(url, f) {
         if (f === undefined) {
@@ -39,7 +42,7 @@ function middie(complete) {
         }
         return this;
     }
-    function run(req, res, ctx) {
+    function run(req, res, ctx, initialConfig) {
         if (!middlewares.length) {
             complete(null, req, res, ctx);
             return;
@@ -50,6 +53,7 @@ function middie(complete) {
         holder.res = res;
         holder.url = sanitizeUrl(req.url);
         holder.context = ctx;
+        holder.initialConfig = initialConfig;
         holder.done();
     }
     function Holder() {
@@ -57,6 +61,7 @@ function middie(complete) {
         this.res = null;
         this.url = null;
         this.context = null;
+        this.initialConfig = null;
         this.i = 0;
         const that = this;
         this.done = function (err) {
@@ -78,7 +83,21 @@ function middie(complete) {
                 const { fn, regexp } = middlewares[i];
                 if (regexp) {
                     // Decode URL before matching to avoid bypassing middleware
-                    const decodedUrl = (0, url_sanitizer_1.safeDecodeURI)(url).path;
+                    let sanitizedUrl = url;
+                    if (that.initialConfig.ignoreDuplicateSlashes ||
+                        that.initialConfig.routerOptions?.ignoreDuplicateSlashes) {
+                        sanitizedUrl = removeDuplicateSlashes(sanitizedUrl);
+                    }
+                    if (that.initialConfig.ignoreTrailingSlash ||
+                        that.initialConfig.routerOptions?.ignoreTrailingSlash) {
+                        sanitizedUrl = trimLastSlash(sanitizedUrl);
+                    }
+                    if (that.initialConfig.caseSensitive === false ||
+                        that.initialConfig.routerOptions?.caseSensitive === false) {
+                        sanitizedUrl = sanitizedUrl.toLowerCase();
+                    }
+                    const decodedUrl = (0, url_sanitizer_1.safeDecodeURI)(sanitizedUrl, that.initialConfig?.routerOptions?.useSemicolonDelimiter ||
+                        that.initialConfig?.useSemicolonDelimiter).path;
                     const result = regexp.exec(decodedUrl);
                     if (result) {
                         req.url = req.url.replace(result[0], '');
@@ -99,11 +118,24 @@ function middie(complete) {
             that.req = null;
             that.res = null;
             that.context = null;
+            that.initialConfig = null;
             that.i = 0;
             pool.release(that);
         }
     }
 }
+function removeDuplicateSlashes(path) {
+    const REMOVE_DUPLICATE_SLASHES_REGEXP = /\/\/+/g;
+    return path.indexOf('//') !== -1
+        ? path.replace(REMOVE_DUPLICATE_SLASHES_REGEXP, '/')
+        : path;
+}
+function trimLastSlash(path) {
+    if (path.length > 1 && path.charCodeAt(path.length - 1) === 47) {
+        return path.slice(0, -1);
+    }
+    return path;
+}
 function sanitizeUrl(url) {
     for (let i = 0, len = url.length; i < len; i++) {
         const charCode = url.charCodeAt(i);
@@ -144,7 +176,7 @@ function fastifyMiddie(fastify, options, next) {
     fastify.decorate('use', use);
     fastify[kMiddlewares] = [];
     fastify[kMiddieHasMiddlewares] = false;
-    fastify[kMiddie] = middie(onMiddieEnd);
+    fastify[kMiddie] = middie(onMiddieEnd, fastify.initialConfig);
     const hook = options.hook || 'onRequest';
     if (!supportedHooks.includes(hook)) {
         next(new Error(`The hook "${hook}" is not supported by fastify-middie`));
@@ -198,7 +230,7 @@ function fastifyMiddie(fastify, options, next) {
     function onRegister(instance) {
         const middlewares = instance[kMiddlewares].slice();
         instance[kMiddlewares] = [];
-        instance[kMiddie] = middie(onMiddieEnd);
+        instance[kMiddie] = middie(onMiddieEnd, instance.initialConfig);
         instance[kMiddieHasMiddlewares] = false;
         instance.decorate('use', use);
         for (const middleware of middlewares) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/platform-fastify",
-  "version": "11.1.13",
+  "version": "11.1.14",
   "description": "Nest - modern, fast, powerful node.js web framework (@platform-fastify)",
   "author": "Kamil Mysliwiec",
   "license": "MIT",
@@ -43,5 +43,5 @@
       "optional": true
     }
   },
-  "gitHead": "e3a958ac3efebe7995e6d487e00bbc6fd6267fd5"
+  "gitHead": "5d31df7eb62d89952d827eadc19123fb441f541e"
 }

package/interfaces/external/point-of-view-options.interface.d.ts

@@ -1,28 +0,0 @@
-/**
- * @see https://github.com/fastify/point-of-view/blob/master/index.d.ts
- */
-export interface PointOfViewOptions {
-    engine: {
-        ejs?: any;
-        eta?: any;
-        nunjucks?: any;
-        pug?: any;
-        handlebars?: any;
-        mustache?: any;
-        'art-template'?: any;
-        twig?: any;
-        liquid?: any;
-        dot?: any;
-    };
-    templates?: string;
-    includeViewExtension?: boolean;
-    options?: object;
-    charset?: string;
-    maxCache?: number;
-    production?: boolean;
-    defaultContext?: object;
-    layout?: string;
-    root?: string;
-    viewExt?: string;
-    propertyName?: string;
-}

package/interfaces/external/point-of-view-options.interface.js

@@ -1,5 +0,0 @@
-"use strict";
-/**
- * @see https://github.com/fastify/point-of-view/blob/master/index.d.ts
- */
-Object.defineProperty(exports, "__esModule", { value: true });