yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-09 01:07:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix retours PR

Browse Source
This commit is contained in:
Jim Laurie 2017-09-29 17:06:01 +02:00
parent 5b575ffac5
commit b58d11d18a
10 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/strapi/lib/core/configurations.js
View File

@ -277,17 +277,13 @@ const enableHookNestedDependencies = function (name, flattenHooksConfig) {
if (isEmpty(get(flattenHooksConfig, name, true))) {
// Check if database connector is used
let isUsed = false;
forEach(get(strapi, 'api', {}), api => {
if (!api.models) return;
forEach(api.models, model => {
if (get(strapi.connection, model.connection, {}).connector === name) isUsed = true;
});
});
const modelUsed = Object.keys(this.api || {})
.filter(x => isObject(this.api[x].models)) // Filter API with models
.map(x => this.api[x].models) // Keep models
.filter(model => get(this.connection, model.connection, {}).connector === name) || 0; // Filter model with the right connector
flattenHooksConfig[name] = {
enabled: isUsed
enabled: modelUsed.length > 0 // Will return false if there is no model, else true.
};
// Enabled dependencies.

2
packages/strapi/lib/middlewares/cors/index.js
View File

@ -47,7 +47,7 @@ module.exports = strapi => {
initialize: function(cb) {
strapi.app.use(
async (ctx, next) => {
if (ctx.admin) return next();
if (ctx.request.admin) return next();
await strapi.koaMiddlewares.kcors({
origin: strapi.config.middleware.settings.cors.origin,

2
packages/strapi/lib/middlewares/csp/index.js
View File

@ -27,7 +27,7 @@ module.exports = strapi => {
initialize: function(cb) {
strapi.app.use(
async (ctx, next) => {
if (ctx.admin) return next();
if (ctx.request.admin) return next();
strapi.koaMiddlewares.convert(
strapi.koaMiddlewares.lusca.csp(strapi.config.middleware.settings.csp)

2
packages/strapi/lib/middlewares/csrf/index.js
View File

@ -29,7 +29,7 @@ module.exports = strapi => {
initialize: function(cb) {
strapi.app.use(
async (ctx, next) => {
if (ctx.admin) return next();
if (ctx.request.admin) return next();
await strapi.koaMiddlewares.convert(
strapi.koaMiddlewares.lusca.csrf({

2
packages/strapi/lib/middlewares/hsts/index.js
View File

@ -29,7 +29,7 @@ module.exports = strapi => {
initialize: function(cb) {
strapi.app.use(
async (ctx, next) => {
if (ctx.admin) return next();
if (ctx.request.admin) return next();
strapi.koaMiddlewares.convert(
strapi.koaMiddlewares.lusca.hsts({

14
packages/strapi/lib/middlewares/index.js
View File

@ -3,17 +3,19 @@
const glob = require('glob');
const path = require('path');
const { parallel } = require('async');
const { after, includes, indexOf, drop, dropRight, uniq, defaultsDeep, get, set, isEmpty, isUndefined, union, keys } = require('lodash');
const { after, includes, indexOf, drop, dropRight, uniq, defaultsDeep, get, set, isEmpty, isUndefined, union } = require('lodash');
module.exports = function() {
// Set if is admin destination for middleware application.
// TODO: Use dynamic config for admin url.
strapi.app.use(async (ctx, next) => {
const accepted = keys(strapi.plugins).map(url => `^\/${url}`);
accepted.push('^\/admin');
const isMatch = accepted.some(rx => new RegExp(rx).test(ctx.request.url));
set(ctx, 'admin', isMatch);
return next();
const accepted = Object.keys(strapi.plugins).map(url => `^\/${url}`).concat(['^\/admin']);
strapi.app.use(async (ctx, next) => {
ctx.request.admin = accepted.some(rx => new RegExp(rx).test(ctx.request.url));
return next();
});
});
// Method to initialize middlewares and emit an event.

2
packages/strapi/lib/middlewares/p3p/index.js
View File

@ -28,7 +28,7 @@ module.exports = strapi => {
initialize: function(cb) {
strapi.app.use(
async (ctx, next) => {
if (ctx.admin) return next();
if (ctx.request.admin) return next();
strapi.koaMiddlewares.convert(
strapi.koaMiddlewares.lusca.p3p({

2
packages/strapi/lib/middlewares/xframe/index.js
View File

@ -28,7 +28,7 @@ module.exports = strapi => {
initialize: function(cb) {
strapi.app.use(
async (ctx, next) => {
if (ctx.admin) return next();
if (ctx.request.admin) return next();
strapi.koaMiddlewares.convert(
strapi.koaMiddlewares.lusca.xframe({

2
packages/strapi/lib/middlewares/xss/index.js
View File

@ -28,7 +28,7 @@ module.exports = strapi => {
initialize: function(cb) {
strapi.app.use(
async (ctx, next) => {
if (ctx.admin) return next();
if (ctx.request.admin) return next();
strapi.koaMiddlewares.convert(
strapi.koaMiddlewares.lusca.xssProtection({