@strapi/strapi 4.0.0-next.9 → 4.0.0

package/lib/middlewares/errors.js

@@ -0,0 +1,40 @@
+'use strict';
+
+const { HttpError, ApplicationError } = require('@strapi/utils').errors;
+const {
+  formatApplicationError,
+  formatHttpError,
+  formatInternalError,
+} = require('../services/errors');
+
+module.exports = (/* _, { strapi } */) => {
+  return async (ctx, next) => {
+    try {
+      await next();
+
+      if (!ctx.response._explicitStatus) {
+        return ctx.notFound();
+      }
+    } catch (error) {
+      if (error instanceof ApplicationError) {
+        const { status, body } = formatApplicationError(error);
+        ctx.status = status;
+        ctx.body = body;
+        return;
+      }
+
+      if (error instanceof HttpError) {
+        const { status, body } = formatHttpError(error);
+        ctx.status = status;
+        ctx.body = body;
+        return;
+      }
+
+      strapi.log.error(error);
+
+      const { status, body } = formatInternalError(error);
+      ctx.status = status;
+      ctx.body = body;
+    }
+  };
+};

package/lib/middlewares/favicon.js

@@ -0,0 +1,19 @@
+'use strict';
+
+const { resolve } = require('path');
+const { defaultsDeep } = require('lodash/fp');
+const favicon = require('koa-favicon');
+
+const defaults = {
+  path: 'favicon.ico',
+  maxAge: 86400000,
+};
+
+/**
+ * @type {import('./').MiddlewareFactory}
+ */
+module.exports = (config, { strapi }) => {
+  const { maxAge, path: faviconPath } = defaultsDeep(defaults, config);
+
+  return favicon(resolve(strapi.dirs.root, faviconPath), { maxAge });
+};

package/lib/middlewares/index.d.ts

@@ -0,0 +1,5 @@
+import { Strapi } from '../';
+import { Middleware } from 'koa';
+
+export type MiddlewareFactory = (config: any, ctx: { strapi: Strapi }) => Middleware | null;
+export type Middleware = Middleware;

package/lib/middlewares/index.js

@@ -1,119 +1,33 @@
 'use strict';
 
-const { uniq, difference, get, isUndefined, merge } = require('lodash');
-
-const requiredMiddlewares = [
-  'responses',
-  'router',
-  'logger',
-  'boom',
-  'cors',
-  'cron',
-  'xframe',
-  'xss',
-  'public',
-  'favicon',
-];
-
-module.exports = async function() {
-  /** Utils */
-  const middlewareConfig = this.config.middleware;
-
-  // check if a middleware exists
-  const middlewareExists = key => {
-    return !isUndefined(this.middleware[key]);
-  };
-
-  // check if a middleware is enabled
-  const middlewareEnabled = key => {
-    return (
-      requiredMiddlewares.includes(key) ||
-      get(middlewareConfig, ['settings', key, 'enabled'], false) === true
-    );
-  };
-
-  // list of enabled middlewares
-  const enabledMiddlewares = Object.keys(this.middleware).filter(middlewareEnabled);
-
-  // Method to initialize middlewares and emit an event.
-  const initialize = middlewareKey => {
-    if (this.middleware[middlewareKey].loaded === true) return;
-
-    const module = this.middleware[middlewareKey].load;
-
-    return new Promise((resolve, reject) => {
-      const timeout = setTimeout(
-        () => reject(`(middleware: ${middlewareKey}) is taking too long to load.`),
-        middlewareConfig.timeout || 1000
-      );
-      this.middleware[middlewareKey] = merge(this.middleware[middlewareKey], module);
-
-      Promise.resolve()
-        .then(() => module.initialize())
-        .then(() => {
-          clearTimeout(timeout);
-          this.middleware[middlewareKey].loaded = true;
-          resolve();
-        })
-        .catch(err => {
-          clearTimeout(timeout);
-
-          if (err) {
-            return reject(err);
-          }
-        });
-    });
-  };
-
-  /**
-   * Run init functions
-   */
-
-  // Run beforeInitialize of every middleware
-  await Promise.all(
-    enabledMiddlewares.map(key => {
-      const { beforeInitialize } = this.middleware[key].load;
-      if (typeof beforeInitialize === 'function') {
-        return beforeInitialize();
-      }
-    })
-  );
-
-  // run the initialization of an array of middlewares sequentially
-  const initMiddlewaresSeq = async middlewareArr => {
-    for (let key of uniq(middlewareArr)) {
-      await initialize(key);
-    }
-  };
-
-  const middlewaresBefore = get(middlewareConfig, 'load.before', [])
-    .filter(middlewareExists)
-    .filter(middlewareEnabled);
-
-  const middlewaresAfter = get(middlewareConfig, 'load.after', [])
-    .filter(middlewareExists)
-    .filter(middlewareEnabled);
-
-  const middlewaresOrder = get(middlewareConfig, 'load.order', [])
-    .filter(middlewareExists)
-    .filter(middlewareEnabled);
-
-  const unspecifiedMiddlewares = difference(
-    enabledMiddlewares,
-    middlewaresBefore,
-    middlewaresOrder,
-    middlewaresAfter
-  );
-
-  // before
-  await initMiddlewaresSeq(middlewaresBefore);
-
-  // ordered // rest of middlewares
-  await Promise.all([
-    initMiddlewaresSeq(middlewaresOrder),
-    Promise.all(unspecifiedMiddlewares.map(initialize)),
-  ]);
-
-  // after
-  await initMiddlewaresSeq(middlewaresAfter);
+const compression = require('./compression');
+const cors = require('./cors');
+const errors = require('./errors');
+const favicon = require('./favicon');
+const ip = require('./ip');
+const logger = require('./logger');
+const poweredBy = require('./powered-by');
+const body = require('./body');
+const query = require('./query');
+const responseTime = require('./response-time');
+const responses = require('./responses');
+const security = require('./security');
+// TODO: add back ?
+// session: require('./session'),
+const publicStatic = require('./public');
+
+module.exports = {
+  errors,
+  ip,
+  security,
+  cors,
+  responseTime,
+  poweredBy,
+  logger,
+  compression,
+  responses,
+  body,
+  query,
+  favicon,
+  public: publicStatic,
 };

package/lib/middlewares/ip.js

@@ -0,0 +1,8 @@
+'use strict';
+
+const ip = require('koa-ip');
+
+/**
+ * @type {import('./').MiddlewareFactory}
+ */
+module.exports = config => ip(config);

package/lib/middlewares/logger.js

@@ -0,0 +1,27 @@
+'use strict';
+const chalk = require('chalk');
+
+const codeToColor = code => {
+  return code >= 500
+    ? chalk.red(code)
+    : code >= 400
+    ? chalk.yellow(code)
+    : code >= 300
+    ? chalk.cyan(code)
+    : code >= 200
+    ? chalk.green(code)
+    : code;
+};
+
+/**
+ * @type {import('./').MiddlewareFactory}
+ */
+module.exports = (_, { strapi }) => {
+  return async (ctx, next) => {
+    const start = Date.now();
+    await next();
+    const delta = Math.ceil(Date.now() - start);
+
+    strapi.log.http(`${ctx.method} ${ctx.url} (${delta} ms) ${codeToColor(ctx.status)}`);
+  };
+};

package/lib/middlewares/powered-by.js

@@ -0,0 +1,20 @@
+'use strict';
+
+const { defaultsDeep } = require('lodash/fp');
+
+const defaults = {
+  poweredBy: 'Strapi <strapi.io>',
+};
+
+/**
+ * @type {import('./').MiddlewareFactory}
+ */
+module.exports = config => {
+  const { poweredBy } = defaultsDeep(defaults, config);
+
+  return async (ctx, next) => {
+    await next();
+
+    ctx.set('X-Powered-By', poweredBy);
+  };
+};

package/lib/middlewares/public/index.js

@@ -1,98 +1,123 @@
 'use strict';
 
-/**
- * Module dependencies
- */
-
-// Node.js core.
 const fs = require('fs');
 const path = require('path');
 const stream = require('stream');
 const _ = require('lodash');
+const { defaultsDeep } = require('lodash/fp');
 const koaStatic = require('koa-static');
 const utils = require('../../utils');
 const serveStatic = require('./serve-static');
 
+const defaults = {
+  maxAge: 60000,
+  defaultIndex: true,
+};
+
 /**
- * Public assets hook
+ * @type {import('../').MiddlewareFactory}
  */
+module.exports = (config, { strapi }) => {
+  const { defaultIndex, maxAge } = defaultsDeep(defaults, config);
 
-module.exports = strapi => {
-  return {
-    /**
-     * Initialize the hook
-     */
-
-    async initialize() {
-      const { defaultIndex, maxAge, path: publicPath } = strapi.config.middleware.settings.public;
-      const staticDir = path.resolve(strapi.dir, publicPath || strapi.config.paths.static);
+  if (defaultIndex === true) {
+    const index = fs.readFileSync(path.join(__dirname, 'index.html'), 'utf8');
 
-      if (defaultIndex === true) {
-        const index = fs.readFileSync(path.join(__dirname, 'index.html'), 'utf8');
+    const serveIndexPage = async (ctx, next) => {
+      // defer rendering of strapi index page
+      await next();
 
-        const serveIndexPage = async (ctx, next) => {
-          // defer rendering of strapi index page
-          await next();
-          if (ctx.body != null || ctx.status !== 404) return;
+      if (ctx.body != null || ctx.status !== 404) return;
 
-          ctx.url = 'index.html';
-          const isInitialized = await utils.isInitialized(strapi);
-          const data = {
-            serverTime: new Date().toUTCString(),
-            isInitialized,
-            ..._.pick(strapi, [
-              'config.info.version',
-              'config.info.name',
-              'config.admin.url',
-              'config.server.url',
-              'config.environment',
-              'config.serveAdminPanel',
-            ]),
-          };
-          const content = _.template(index)(data);
-          const body = stream.Readable({
-            read() {
-              this.push(Buffer.from(content));
-              this.push(null);
-            },
-          });
-          // Serve static.
-          ctx.type = 'html';
-          ctx.body = body;
-        };
-
-        strapi.router.get('/', serveIndexPage);
-        strapi.router.get('/index.html', serveIndexPage);
-        strapi.router.get(
-          '/assets/images/(.*)',
-          serveStatic(path.resolve(__dirname, 'assets/images'), { maxage: maxAge, defer: true })
-        );
-      }
+      ctx.url = 'index.html';
+      const isInitialized = await utils.isInitialized(strapi);
+      const data = {
+        serverTime: new Date().toUTCString(),
+        isInitialized,
+        ..._.pick(strapi, [
+          'config.info.version',
+          'config.info.name',
+          'config.admin.url',
+          'config.server.url',
+          'config.environment',
+          'config.serveAdminPanel',
+        ]),
+      };
+      const content = _.template(index)(data);
+      const body = stream.Readable({
+        read() {
+          this.push(Buffer.from(content));
+          this.push(null);
+        },
+      });
+      // Serve static.
+      ctx.type = 'html';
+      ctx.body = body;
+    };
 
-      // serve files in public folder unless a sub router renders something else
-      strapi.router.get(
-        '/(.*)',
-        koaStatic(staticDir, {
+    strapi.server.routes([
+      {
+        method: 'GET',
+        path: '/',
+        handler: serveIndexPage,
+        config: { auth: false },
+      },
+      {
+        method: 'GET',
+        path: '/index.html',
+        handler: serveIndexPage,
+        config: { auth: false },
+      },
+      {
+        method: 'GET',
+        path: '/assets/images/(.*)',
+        handler: serveStatic(path.resolve(__dirname, 'assets/images'), {
           maxage: maxAge,
           defer: true,
-        })
-      );
+        }),
+        config: { auth: false },
+      },
+      {
+        method: 'GET',
+        path: '/(.*)',
+        handler: koaStatic(strapi.dirs.public, {
+          maxage: maxAge,
+          defer: true,
+        }),
+        config: { auth: false },
+      },
+    ]);
+  }
 
-      if (!strapi.config.serveAdminPanel) return;
+  if (!strapi.config.serveAdminPanel) return async (ctx, next) => next();
 
-      const buildDir = path.resolve(strapi.dir, 'build');
-      const serveAdmin = ctx => {
-        ctx.type = 'html';
-        ctx.body = fs.createReadStream(path.join(buildDir + '/index.html'));
-      };
+  const buildDir = path.resolve(strapi.dirs.root, 'build');
+  const serveAdmin = async (ctx, next) => {
+    await next();
 
-      strapi.router.get(
-        `${strapi.config.admin.path}/*`,
-        serveStatic(buildDir, { maxage: maxAge, defer: false, index: 'index.html' })
-      );
+    if (ctx.method !== 'HEAD' && ctx.method !== 'GET') {
+      return;
+    }
 
-      strapi.router.get(`${strapi.config.admin.path}`, serveAdmin);
-      strapi.router.get(`${strapi.config.admin.path}/*`, serveAdmin);
-    },
+    if (ctx.body != null || ctx.status !== 404) {
+      return;
+    }
+
+    ctx.type = 'html';
+    ctx.body = fs.createReadStream(path.join(buildDir + '/index.html'));
   };
+
+  strapi.server.routes([
+    {
+      method: 'GET',
+      path: `${strapi.config.admin.path}/:path*`,
+      handler: [
+        serveAdmin,
+        serveStatic(buildDir, { maxage: maxAge, defer: false, index: 'index.html' }),
+      ],
+      config: { auth: false },
+    },
+  ]);
+
+  return null;
 };

package/lib/middlewares/query.js

@@ -0,0 +1,46 @@
+'use strict';
+
+const { defaultsDeep } = require('lodash/fp');
+const qs = require('qs');
+
+const defaults = {
+  strictNullHandling: true,
+  arrayLimit: 100,
+  depth: 20,
+};
+
+/**
+ * Body parser hook
+ */
+const addQsParser = (app, settings) => {
+  Object.defineProperty(app.request, 'query', {
+    configurable: false,
+    enumerable: true,
+    /*
+     * Get parsed query-string.
+     */
+    get() {
+      const qstr = this.querystring;
+      const cache = (this._querycache = this._querycache || {});
+      return cache[qstr] || (cache[qstr] = qs.parse(qstr, settings));
+    },
+
+    /*
+     * Set query-string as an object.
+     */
+    set(obj) {
+      this.querystring = qs.stringify(obj);
+    },
+  });
+
+  return app;
+};
+
+/**
+ * @type {import('./').MiddlewareFactory}
+ */
+module.exports = (config, { strapi }) => {
+  addQsParser(strapi.server.app, defaultsDeep(defaults, config));
+
+  return null;
+};

package/lib/middlewares/response-time.js

@@ -0,0 +1,15 @@
+'use strict';
+
+/**
+ * @type {import('./').MiddlewareFactory}
+ */
+module.exports = () => {
+  return async (ctx, next) => {
+    const start = Date.now();
+
+    await next();
+
+    const delta = Math.ceil(Date.now() - start);
+    ctx.set('X-Response-Time', delta + 'ms');
+  };
+};

package/lib/middlewares/responses.js

@@ -0,0 +1,19 @@
+'use strict';
+
+const { prop, isFunction } = require('lodash/fp');
+
+/**
+ * @type {import('./').MiddlewareFactory}
+ */
+module.exports = (config = {}) => {
+  return async (ctx, next) => {
+    await next();
+
+    const status = ctx.status;
+    const handler = prop(`handlers.${status}`, config);
+
+    if (isFunction(handler)) {
+      await handler(ctx);
+    }
+  };
+};

package/lib/middlewares/security.js

@@ -0,0 +1,51 @@
+'use strict';
+
+const { defaultsDeep, merge } = require('lodash/fp');
+const helmet = require('koa-helmet');
+
+const defaults = {
+  crossOriginEmbedderPolicy: false,
+  crossOriginOpenerPolicy: false,
+  crossOriginResourcePolicy: false,
+  originAgentCluster: false,
+  contentSecurityPolicy: {
+    useDefaults: true,
+    directives: {
+      'connect-src': ["'self'", 'https:'],
+      'img-src': ["'self'", 'data:', 'blob:'],
+      'media-src': ["'self'", 'data:', 'blob:'],
+      upgradeInsecureRequests: null,
+    },
+  },
+  xssFilter: false,
+  hsts: {
+    maxAge: 31536000,
+    includeSubDomains: true,
+  },
+  frameguard: {
+    action: 'sameorigin',
+  },
+};
+
+/**
+ * @type {import('./').MiddlewareFactory}
+ */
+module.exports = config => (ctx, next) => {
+  let helmetConfig = defaultsDeep(defaults, config);
+
+  if (
+    ctx.method === 'GET' &&
+    ['/graphql', '/documentation'].some(str => ctx.path.startsWith(str))
+  ) {
+    helmetConfig = merge(helmetConfig, {
+      contentSecurityPolicy: {
+        directives: {
+          'script-src': ["'self'", "'unsafe-inline'", 'cdn.jsdelivr.net'],
+          'img-src': ["'self'", 'data:', 'cdn.jsdelivr.net', 'strapi.io'],
+        },
+      },
+    });
+  }
+
+  return helmet(helmetConfig)(ctx, next);
+};

package/lib/middlewares/session/index.js

@@ -9,7 +9,7 @@ const session = require('koa-session');
  */
 module.exports = strapi => {
   const requireStore = store => {
-    return require(path.resolve(strapi.config.appPath, 'node_modules', 'koa-' + store));
+    return require(path.resolve(strapi.dirs.root, 'node_modules', 'koa-' + store));
   };
 
   const defineStore = session => {
@@ -93,7 +93,7 @@ module.exports = strapi => {
 
   return {
     initialize() {
-      strapi.app.keys = strapi.config.get('middleware.settings.session.secretKeys');
+      strapi.server.app.keys = strapi.config.get('middleware.settings.session.secretKeys');
 
       if (
         _.has(strapi.config.middleware.settings.session, 'client') &&
@@ -112,8 +112,8 @@ module.exports = strapi => {
             strapi.config.middleware.settings.session
           );
 
-          strapi.app.use(session(options, strapi.app));
-          strapi.app.use((ctx, next) => {
+          strapi.server.use(session(options, strapi.server.app));
+          strapi.server.use((ctx, next) => {
             ctx.state = ctx.state || {};
             ctx.state.session = ctx.session || {};
 
@@ -127,8 +127,8 @@ module.exports = strapi => {
       ) {
         const options = _.assign(strapi.config.middleware.settings.session);
 
-        strapi.app.use(session(options, strapi.app));
-        strapi.app.use((ctx, next) => {
+        strapi.server.use(session(options, strapi.server.app));
+        strapi.server.use((ctx, next) => {
           ctx.state = ctx.state || {};
           ctx.state.session = ctx.session || {};