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

Merge pull request #14198 from strapi/hotfix/graphql-should-exist

Browse Source 
Loading a plugin should always verify its presence
This commit is contained in:
Alexandre BODIN 2022-08-24 15:52:59 +02:00 committed by GitHub
commit 33d0b0c606
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/core/strapi/lib/middlewares/body.js
View File

@ -27,12 +27,15 @@ function getFiles(ctx) {
module.exports = (config, { strapi }) => { module.exports = (config, { strapi }) => {
const bodyConfig = defaultsDeep(defaults, config); const bodyConfig = defaultsDeep(defaults, config);
let gqlEndpoint;
if (strapi.plugin('graphql')) {
const { config: gqlConfig } = strapi.plugin('graphql'); const { config: gqlConfig } = strapi.plugin('graphql');
const gqlEndpoint = gqlConfig('endpoint'); gqlEndpoint = gqlConfig('endpoint');
}
return async (ctx, next) => { return async (ctx, next) => {
// TODO: find a better way later // TODO: find a better way later
if (ctx.url === gqlEndpoint) { if (gqlEndpoint && ctx.url === gqlEndpoint) {
await next(); await next();
} else { } else {
try { try {

13
packages/core/strapi/lib/middlewares/security.js
View File

@ -35,13 +35,14 @@ module.exports =
(config, { strapi }) => (config, { strapi }) =>
(ctx, next) => { (ctx, next) => {
let helmetConfig = defaultsDeep(defaults, config); let helmetConfig = defaultsDeep(defaults, config);
const { config: gqlConfig } = strapi.plugin('graphql'); const specialPaths = ['/documentation'];
const gqlEndpoint = gqlConfig('endpoint');
if ( if (strapi.plugin('graphql')) {
ctx.method === 'GET' && const { config: gqlConfig } = strapi.plugin('graphql');
[gqlEndpoint, '/documentation'].some((str) => ctx.path.startsWith(str)) specialPaths.push(gqlConfig('endpoint'));
) { }
if (ctx.method === 'GET' && specialPaths.some((str) => ctx.path.startsWith(str))) {
helmetConfig = merge(helmetConfig, { helmetConfig = merge(helmetConfig, {
contentSecurityPolicy: { contentSecurityPolicy: {
directives: { directives: {