ActivityPub-federated video streaming platform using P2P directly in your web browser
Fix blocklist error 400 with many params
Chocobozzz8ba7dc85edd9
diff --git a/packages/tests/src/api/check-params/blocklist.ts b/packages/tests/src/api/check-params/blocklist.tsindex 3c6c362018..18eac39433 100644--- a/packages/tests/src/api/check-params/blocklist.ts+++ b/packages/tests/src/api/check-params/blocklist.ts@@ -545,6 +545,19 @@ describe('Test blocklist API validators', function () {},expectedStatus: HttpStatusCode.OK_200})++ let i = 0+ let j = 0++ await makeGetRequest({+ url: server.url,+ path,+ query: {+ hosts: new Array(101).map(() => i++ && 'example.com'),+ accounts: new Array(101).map(() => j++ && '[email protected]')+ },+ expectedStatus: HttpStatusCode.OK_200+ })})})diff --git a/server/core/middlewares/validators/blocklist.ts b/server/core/middlewares/validators/blocklist.tsindex 1c92255be0..5d30de9aa0 100644--- a/server/core/middlewares/validators/blocklist.ts+++ b/server/core/middlewares/validators/blocklist.ts@@ -1,9 +1,9 @@-import express from 'express'-import { body, param, query } from 'express-validator'+import { HttpStatusCode } from '@peertube/peertube-models'import { areValidActorHandles } from '@server/helpers/custom-validators/activitypub/actor.js'+import { toArray } from '@server/helpers/custom-validators/misc.js'import { getServerActor } from '@server/models/application/application.js'-import { arrayify } from '@peertube/peertube-core-utils'-import { HttpStatusCode } from '@peertube/peertube-models'+import express from 'express'+import { body, param, query } from 'express-validator'import { isEachUniqueHostValid, isHostValid } from '../../helpers/custom-validators/servers.js'import { WEBSERVER } from '../../initializers/constants.js'import { AccountBlocklistModel } from '../../models/account/account-blocklist.js'@@ -121,12 +121,12 @@ const unblockServerByServerValidator = [const blocklistStatusValidator = [query('hosts').optional()- .customSanitizer(arrayify)+ .customSanitizer(toArray).custom(isEachUniqueHostValid).withMessage('Should have a valid hosts array'),query('accounts').optional()- .customSanitizer(arrayify)+ .customSanitizer(toArray).custom(areValidActorHandles).withMessage('Should have a valid accounts array'),(req: express.Request, res: express.Response, next: express.NextFunction) => {@@ -139,13 +139,13 @@ const blocklistStatusValidator = [// ---------------------------------------------------------------------------export {- blockServerValidator,blockAccountValidator,+ blocklistStatusValidator,+ blockServerValidator,unblockAccountByAccountValidator,- unblockServerByAccountValidator,unblockAccountByServerValidator,- unblockServerByServerValidator,- blocklistStatusValidator+ unblockServerByAccountValidator,+ unblockServerByServerValidator}// ---------------------------------------------------------------------------diff --git a/server/core/middlewares/validators/logs.ts b/server/core/middlewares/validators/logs.tsindex c49baec3f9..ab94c1db6a 100644--- a/server/core/middlewares/validators/logs.ts+++ b/server/core/middlewares/validators/logs.ts@@ -1,10 +1,9 @@-import express from 'express'-import { body, query } from 'express-validator'+import { HttpStatusCode } from '@peertube/peertube-models'import { isUrlValid } from '@server/helpers/custom-validators/activitypub/misc.js'import { isStringArray } from '@server/helpers/custom-validators/search.js'import { CONFIG } from '@server/initializers/config.js'-import { arrayify } from '@peertube/peertube-core-utils'-import { HttpStatusCode } from '@peertube/peertube-models'+import express from 'express'+import { body, query } from 'express-validator'import {isValidClientLogLevel,isValidClientLogMessage,@@ -13,7 +12,7 @@ import {isValidClientLogUserAgent,isValidLogLevel} from '../../helpers/custom-validators/logs.js'-import { isDateValid } from '../../helpers/custom-validators/misc.js'+import { isDateValid, toArray } from '../../helpers/custom-validators/misc.js'import { areValidationErrors } from './shared/index.js'const createClientLogValidator = [@@ -57,7 +56,7 @@ const getLogsValidator = [.custom(isValidLogLevel),query('tagsOneOf').optional()- .customSanitizer(arrayify)+ .customSanitizer(toArray).custom(isStringArray).withMessage('Should have a valid tags one of array'),query('endDate').optional()@@ -87,7 +86,7 @@ const getAuditLogsValidator = [// ---------------------------------------------------------------------------export {- getLogsValidator,+ createClientLogValidator,getAuditLogsValidator,- createClientLogValidator+ getLogsValidator}diff --git a/server/core/middlewares/validators/runners/jobs.ts b/server/core/middlewares/validators/runners/jobs.tsindex 8d95e516ff..6414e34052 100644--- a/server/core/middlewares/validators/runners/jobs.ts+++ b/server/core/middlewares/validators/runners/jobs.ts@@ -1,4 +1,3 @@-import { arrayify } from '@peertube/peertube-core-utils'import {HttpStatusCode,RunnerJobState,@@ -7,7 +6,7 @@ import {RunnerJobUpdateBody,ServerErrorCode} from '@peertube/peertube-models'-import { exists, isUUIDValid } from '@server/helpers/custom-validators/misc.js'+import { exists, isUUIDValid, toArray } from '@server/helpers/custom-validators/misc.js'import {isRunnerJobAbortReasonValid,isRunnerJobArrayOfStateValid,@@ -125,7 +124,7 @@ export const listRunnerJobsValidator = [query('stateOneOf').optional()- .customSanitizer(arrayify)+ .customSanitizer(toArray).custom(isRunnerJobArrayOfStateValid),(req: express.Request, res: express.Response, next: express.NextFunction) => {diff --git a/server/core/middlewares/validators/users/user-notifications.ts b/server/core/middlewares/validators/users/user-notifications.tsindex 948d4606ef..6a3c082a2f 100644--- a/server/core/middlewares/validators/users/user-notifications.ts+++ b/server/core/middlewares/validators/users/user-notifications.ts@@ -1,8 +1,7 @@-import { arrayify } from '@peertube/peertube-core-utils'import { isNumberArray } from '@server/helpers/custom-validators/search.js'import express from 'express'import { body, query } from 'express-validator'-import { isNotEmptyIntArray, toBooleanOrNull } from '../../../helpers/custom-validators/misc.js'+import { isNotEmptyIntArray, toArray, toBooleanOrNull } from '../../../helpers/custom-validators/misc.js'import { isUserNotificationSettingValid } from '../../../helpers/custom-validators/user-notifications.js'import { areValidationErrors } from '../shared/index.js'@@ -14,7 +13,7 @@ export const listUserNotificationsValidator = [query('typeOneOf').optional()- .customSanitizer(arrayify)+ .customSanitizer(toArray).custom(isNumberArray).withMessage('Should have a valid typeOneOf array'),(req: express.Request, res: express.Response, next: express.NextFunction) => {diff --git a/server/core/middlewares/validators/users/user-subscriptions.ts b/server/core/middlewares/validators/users/user-subscriptions.tsindex 181935ea25..3951bcffa4 100644--- a/server/core/middlewares/validators/users/user-subscriptions.ts+++ b/server/core/middlewares/validators/users/user-subscriptions.ts@@ -1,7 +1,7 @@+import { FollowState, HttpStatusCode } from '@peertube/peertube-models'+import { toArray } from '@server/helpers/custom-validators/misc.js'import express from 'express'import { body, param, query } from 'express-validator'-import { arrayify } from '@peertube/peertube-core-utils'-import { FollowState, HttpStatusCode } from '@peertube/peertube-models'import { areValidActorHandles, isValidActorHandle } from '../../../helpers/custom-validators/activitypub/actor.js'import { WEBSERVER } from '../../../initializers/constants.js'import { ActorFollowModel } from '../../../models/actor/actor-follow.js'@@ -32,7 +32,7 @@ const userSubscriptionAddValidator = [const areSubscriptionsExistValidator = [query('uris')- .customSanitizer(arrayify)+ .customSanitizer(toArray).custom(areValidActorHandles).withMessage('Should have a valid array of URIs'),(req: express.Request, res: express.Response, next: express.NextFunction) => {@@ -70,10 +70,10 @@ const userSubscriptionDeleteValidator = [export {areSubscriptionsExistValidator,- userSubscriptionListValidator,userSubscriptionAddValidator,+ userSubscriptionDeleteValidator,userSubscriptionGetValidator,- userSubscriptionDeleteValidator+ userSubscriptionListValidator}// ---------------------------------------------------------------------------diff --git a/server/core/middlewares/validators/users/users.ts b/server/core/middlewares/validators/users/users.tsindex 46470117b5..8c721b6e11 100644--- a/server/core/middlewares/validators/users/users.ts+++ b/server/core/middlewares/validators/users/users.ts@@ -1,4 +1,4 @@-import { arrayify, forceNumber } from '@peertube/peertube-core-utils'+import { forceNumber } from '@peertube/peertube-core-utils'import { HttpStatusCode, ServerErrorCode, UserRole, UserUpdateMe } from '@peertube/peertube-models'import { isStringArray } from '@server/helpers/custom-validators/search.js'import { isNSFWFlagsValid } from '@server/helpers/custom-validators/videos.js'@@ -7,7 +7,7 @@ import { Hooks } from '@server/lib/plugins/hooks.js'import { MUser } from '@server/types/models/user/user.js'import express from 'express'import { body, param, query } from 'express-validator'-import { exists, isIdValid, toBooleanOrNull, toIntOrNull } from '../../../helpers/custom-validators/misc.js'+import { exists, isIdValid, toArray, toBooleanOrNull, toIntOrNull } from '../../../helpers/custom-validators/misc.js'import { isThemeNameValid } from '../../../helpers/custom-validators/plugins.js'import {isUserAdminFlagsValid,@@ -374,7 +374,7 @@ export const listMyVideosValidator = [query('channelNameOneOf').optional()- .customSanitizer(arrayify)+ .customSanitizer(toArray).custom(isStringArray).withMessage('Should have a valid channelNameOneOf array'),query('includeCollaborations')diff --git a/server/core/middlewares/validators/videos/video-comments.ts b/server/core/middlewares/validators/videos/video-comments.tsindex ed8dd9ed58..95bf166d11 100644--- a/server/core/middlewares/validators/videos/video-comments.ts+++ b/server/core/middlewares/validators/videos/video-comments.ts@@ -1,4 +1,3 @@-import { arrayify } from '@peertube/peertube-core-utils'import { HttpStatusCode, UserRight, VideoCommentPolicy } from '@peertube/peertube-models'import { isStringArray } from '@server/helpers/custom-validators/search.js'import { canVideoBeFederated } from '@server/lib/activitypub/videos/federate.js'@@ -11,6 +10,7 @@ import {isBooleanValid,isIdOrUUIDValid,isIdValid,+ toArray,toBooleanOrNull,toCompleteUUID,toIntOrNull@@ -387,7 +387,7 @@ function getCommonVideoCommentsValidators () {query('autoTagOneOf').optional()- .customSanitizer(arrayify)+ .customSanitizer(toArray).custom(isStringArray).withMessage('Should have a valid autoTagOneOf array')]}diff --git a/server/core/middlewares/validators/videos/video-playlists.ts b/server/core/middlewares/validators/videos/video-playlists.tsindex bf333c08db..47884229ea 100644--- a/server/core/middlewares/validators/videos/video-playlists.ts+++ b/server/core/middlewares/validators/videos/video-playlists.ts@@ -1,4 +1,4 @@-import { arrayify, forceNumber } from '@peertube/peertube-core-utils'+import { forceNumber } from '@peertube/peertube-core-utils'import {HttpStatusCode,UserRight,@@ -21,6 +21,7 @@ import {isIdOrUUIDValid,isIdValid,isUUIDValid,+ toArray,toBooleanOrNull,toCompleteUUID,toIntArray,@@ -236,7 +237,7 @@ export const videoPlaylistsAccountValidator = [query('channelNameOneOf').optional()- .customSanitizer(arrayify)+ .customSanitizer(toArray).custom(isStringArray).withMessage('Should have a valid channelNameOneOf array'),(req: express.Request, res: express.Response, next: express.NextFunction) => {diff --git a/server/core/middlewares/validators/videos/videos.ts b/server/core/middlewares/validators/videos/videos.tsindex 99c3b85933..df5b9f3541 100644--- a/server/core/middlewares/validators/videos/videos.ts+++ b/server/core/middlewares/validators/videos/videos.ts@@ -1,4 +1,3 @@-import { arrayify } from '@peertube/peertube-core-utils'import {HttpStatusCode,ServerErrorCode,@@ -24,6 +23,7 @@ import {isFileValid,isIdValid,isNotEmptyIntArray,+ toArray,toBooleanOrNull,toIntArray,toIntOrNull,@@ -503,27 +503,27 @@ export const commonVideosFiltersValidatorFactory = (options: {return [query('categoryOneOf').optional()- .customSanitizer(arrayify)+ .customSanitizer(toArray).custom(isNumberArray).withMessage('Should have a valid categoryOneOf array'),query('licenceOneOf').optional()- .customSanitizer(arrayify)+ .customSanitizer(toArray).custom(isNumberArray).withMessage('Should have a valid licenceOneOf array'),query('languageOneOf').optional()- .customSanitizer(arrayify)+ .customSanitizer(toArray).custom(isStringArray).withMessage('Should have a valid languageOneOf array'),query('privacyOneOf').optional()- .customSanitizer(arrayify)+ .customSanitizer(toArray).custom(isNumberArray).withMessage('Should have a valid privacyOneOf array'),query('tagsOneOf').optional()- .customSanitizer(arrayify)+ .customSanitizer(toArray).custom(isStringArray).withMessage('Should have a valid tagsOneOf array'),query('tagsAllOf').optional()- .customSanitizer(arrayify)+ .customSanitizer(toArray).custom(isStringArray).withMessage('Should have a valid tagsAllOf array'),query('nsfw').optional()@@ -572,7 +572,7 @@ export const commonVideosFiltersValidatorFactory = (options: {.isBoolean().withMessage('Should be a valid excludeAlreadyWatched boolean'),query('autoTagOneOf').optional()- .customSanitizer(arrayify)+ .customSanitizer(toArray).custom(isStringArray).withMessage('Should have a valid autoTagOneOf array'),query('host').optional()