yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-14 19:19:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update visitors

Browse Source
This commit is contained in:
Convly 2023-08-24 15:16:56 +02:00
parent 8ceaa69cc0
commit 6b58fd8b1c
7 changed files with 43 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/core/utils/src/sanitize/sanitizers.ts
View File

@ -113,6 +113,12 @@ const defaultSanitizeSort = curry((schema: Model, sort: unknown) => {
// Remove keys for empty non-scalar values
traverseQuerySort(
({ key, attribute, value }, { remove }) => {
// ID is not an attribute per se, so we need to make
// an extra check to ensure we're not removing it
if (key === 'id') {
return;
}
if (!isScalarAttribute(attribute) && isEmpty(value)) {
remove(key);
}
@ -135,6 +141,7 @@ const defaultSanitizeFields = curry((schema: Model, fields: unknown) => {
if (key === 'id') {
return;
}
if (isNil(attribute) || !isScalarAttribute(attribute)) {
remove(key);
}

10
packages/core/utils/src/sanitize/visitors/remove-disallowed-fields.ts
View File

@ -1,4 +1,4 @@
import { isArray, isNil, toPath } from 'lodash/fp';
import { isArray, isNil, isString, toPath } from 'lodash/fp';
import type { Visitor } from '../../traverse/factory';
export default (allowedFields: string[] | null = null): Visitor =>
@ -8,9 +8,11 @@ export default (allowedFields: string[] | null = null): Visitor =>
return;
}
// Ignore invalid formats
if (!isArray(allowedFields)) {
return;
// Throw on invalid formats
if (!(isArray(allowedFields) && allowedFields.every(isString))) {
throw new TypeError(
`Expected array of strings for allowedFields but got "${typeof allowedFields}"`
);
}
if (isNil(path)) {

10
packages/core/utils/src/sanitize/visitors/remove-restricted-fields.ts
View File

@ -1,4 +1,4 @@
import { isArray } from 'lodash/fp';
import { isArray, isString } from 'lodash/fp';
import type { Visitor } from '../../traverse/factory';
export default (restrictedFields: string[] | null = null): Visitor =>
@ -9,9 +9,11 @@ export default (restrictedFields: string[] | null = null): Visitor =>
return;
}
// Ignore invalid formats
if (!isArray(restrictedFields)) {
return;
// Throw on invalid formats
if (!(isArray(restrictedFields) && restrictedFields.every(isString))) {
throw new TypeError(
`Expected array of strings for restrictedFields but got "${typeof restrictedFields}"`
);
}
// Remove if an exact match was found

16
packages/core/utils/src/validate/validators.ts
View File

@ -29,9 +29,15 @@ const defaultValidateFilters = curry((schema: Model, filters: unknown) => {
// keys that are not attributes or valid operators
traverseQueryFilters(
({ key, attribute }) => {
// ID is not an attribute per se, so we need to make
// an extra check to ensure we're not removing it
if (key === 'id') {
return;
}
const isAttribute = !!attribute;
if (!isAttribute && !isOperator(key) && key !== 'id') {
if (!isAttribute && !isOperator(key)) {
throwInvalidParam({ key });
}
},
@ -61,6 +67,7 @@ const defaultValidateSort = curry((schema: Model, sort: unknown) => {
if (!schema) {
throw new Error('Missing schema in defaultValidateSort');
}
return pipeAsync(
// non attribute keys
traverseQuerySort(
@ -88,6 +95,12 @@ const defaultValidateSort = curry((schema: Model, sort: unknown) => {
// keys for empty non-scalar values
traverseQuerySort(
({ key, attribute, value }) => {
// ID is not an attribute per se, so we need to make
// an extra check to ensure we're not removing it
if (key === 'id') {
return;
}
if (!isScalarAttribute(attribute) && isEmpty(value)) {
throwInvalidParam({ key });
}
@ -108,6 +121,7 @@ const defaultValidateFields = curry((schema: Model, fields: unknown) => {
if (key === 'id') {
return;
}
if (isNil(attribute) || !isScalarAttribute(attribute)) {
throwInvalidParam({ key });
}

10
packages/core/utils/src/validate/visitors/throw-disallowed-fields.ts
View File

@ -1,4 +1,4 @@
import { isArray, isNil, toPath } from 'lodash/fp';
import { isArray, isNil, isString, toPath } from 'lodash/fp';
import type { Visitor } from '../../traverse/factory';
import { throwInvalidParam } from '../utils';
@ -9,9 +9,11 @@ export default (allowedFields: string[] | null = null): Visitor =>
return;
}
// Ignore invalid formats
if (!isArray(allowedFields)) {
return;
// Throw on invalid formats
if (!(isArray(allowedFields) && allowedFields.every(isString))) {
throw new TypeError(
`Expected array of strings for allowedFields but got "${typeof allowedFields}"`
);
}
if (isNil(path)) {

2
packages/core/utils/src/validate/visitors/throw-restricted-fields.ts
View File

@ -1,4 +1,4 @@
import { isArray } from 'lodash/fp';
import { isArray, isString } from 'lodash/fp';
import type { Visitor } from '../../traverse/factory';
import { throwInvalidParam } from '../utils';

13
packages/core/utils/src/validate/visitors/throw-restricted-relations.ts
View File

@ -20,23 +20,14 @@ export default (auth: unknown): Visitor =>
}
const handleMorphRelation = async () => {
const newMorphValue: Record<string, unknown>[] = [];
for (const element of (data as Record<string, MorphArray>)[key]) {
const scopes = ACTIONS_TO_VERIFY.map((action) => `${element.__type}.${action}`);
const isAllowed = await hasAccessToSomeScopes(scopes, auth);
if (isAllowed) {
newMorphValue.push(element);
if (!isAllowed) {
throwInvalidParam({ key });
}
}
// If the new value is empty
if (newMorphValue.length === 0) {
throwInvalidParam({ key });
} else {
set(key, newMorphValue);
}
};
const handleRegularRelation = async () => {