Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Fix privacy filter on my own videos

Chocobozzz4d9bd5b86d3d
diff --git a/packages/tests/src/api/check-params/videos-common-filters.ts b/packages/tests/src/api/check-params/videos-common-filters.ts
index 7e134dd9ce..d03748471c 100644
--- a/packages/tests/src/api/check-params/videos-common-filters.ts
+++ b/packages/tests/src/api/check-params/videos-common-filters.ts
@@ -59,7 +59,8 @@ describe('Test video filters validators', function () {
& {
token?: string
expectedStatus: HttpStatusCodeType
- unauthenticatedUser?: boolean
+ unauthenticatedUser?: boolean // default false
+ skipMyVideos?: boolean // default false
filter?: string
}
) {
@@ -70,7 +71,7 @@ describe('Test video filters validators', function () {
'/api/v1/search/videos'
]
- if (options.unauthenticatedUser !== true) {
+ if (options.unauthenticatedUser !== true && options.skipMyVideos !== true) {
paths.push('/api/v1/users/me/videos')
}
@@ -129,9 +130,22 @@ describe('Test video filters validators', function () {
await testEndpoints({
privacyOneOf: [ VideoPrivacy.INTERNAL ],
token: userAccessToken,
+ skipMyVideos: true,
expectedStatus: HttpStatusCode.UNAUTHORIZED_401
})
})
+
+ it('Should succeed to use privacyOneOf to our own videos', async function () {
+ await makeGetRequest({
+ url: server.url,
+ path: '/api/v1/users/me/videos',
+ token: userAccessToken,
+ query: {
+ privacyOneOf: [ VideoPrivacy.INTERNAL ]
+ },
+ expectedStatus: HttpStatusCode.OK_200
+ })
+ })
})
describe('Auto tag', function () {
diff --git a/server/core/controllers/api/accounts.ts b/server/core/controllers/api/accounts.ts
index d40d3f854b..da98f58ef7 100644
--- a/server/core/controllers/api/accounts.ts
+++ b/server/core/controllers/api/accounts.ts
@@ -12,7 +12,7 @@ import {
apiRateLimiter,
asyncMiddleware,
authenticate,
- commonVideosFiltersValidator,
+ commonVideosFiltersValidatorFactory,
optionalAuthenticate,
paginationValidator,
setDefaultPagination,
@@ -71,7 +71,7 @@ accountsRouter.get(
setDefaultVideosSort,
setDefaultPagination,
optionalAuthenticate,
- commonVideosFiltersValidator,
+ commonVideosFiltersValidatorFactory(),
asyncMiddleware(listAccountVideos)
)
diff --git a/server/core/controllers/api/search/search-videos.ts b/server/core/controllers/api/search/search-videos.ts
index dc826ac53b..8ae2bd70c6 100644
--- a/server/core/controllers/api/search/search-videos.ts
+++ b/server/core/controllers/api/search/search-videos.ts
@@ -15,7 +15,7 @@ import { logger } from '../../../helpers/logger.js'
import { getFormattedObjects } from '../../../helpers/utils.js'
import {
asyncMiddleware,
- commonVideosFiltersValidator,
+ commonVideosFiltersValidatorFactory,
openapiOperationDoc,
optionalAuthenticate,
paginationValidator,
@@ -39,7 +39,7 @@ searchVideosRouter.get(
videosSearchSortValidator,
setDefaultSearchSort,
optionalAuthenticate,
- commonVideosFiltersValidator,
+ commonVideosFiltersValidatorFactory(),
videosSearchValidator,
asyncMiddleware(searchVideos)
)
diff --git a/server/core/controllers/api/users/me.ts b/server/core/controllers/api/users/me.ts
index d038c5ac67..5660e292df 100644
--- a/server/core/controllers/api/users/me.ts
+++ b/server/core/controllers/api/users/me.ts
@@ -37,7 +37,7 @@ import {
} from '../../../middlewares/index.js'
import { updateAvatarValidator } from '../../../middlewares/validators/actor-image.js'
import {
- commonVideosFiltersValidator,
+ commonVideosFiltersValidatorFactory,
deleteMeValidator,
listMyVideoImportsValidator,
listCommentsOnUserVideosValidator,
@@ -93,7 +93,7 @@ meRouter.get(
videosSortValidator,
setDefaultVideosSort,
setDefaultPagination,
- commonVideosFiltersValidator,
+ commonVideosFiltersValidatorFactory({ allowPrivacyFilterForAllUsers: true }),
asyncMiddleware(listMyVideosValidator),
asyncMiddleware(listMyVideos)
)
diff --git a/server/core/controllers/api/users/my-subscriptions.ts b/server/core/controllers/api/users/my-subscriptions.ts
index cea0658711..80a71a41a4 100644
--- a/server/core/controllers/api/users/my-subscriptions.ts
+++ b/server/core/controllers/api/users/my-subscriptions.ts
@@ -14,7 +14,7 @@ import {
asyncMiddleware,
asyncRetryTransactionMiddleware,
authenticate,
- commonVideosFiltersValidator,
+ commonVideosFiltersValidatorFactory,
paginationValidator,
setDefaultPagination,
setDefaultSort,
@@ -41,7 +41,7 @@ mySubscriptionsRouter.get(
videosSortValidator,
setDefaultVideosSort,
setDefaultPagination,
- commonVideosFiltersValidator,
+ commonVideosFiltersValidatorFactory(),
asyncMiddleware(getUserSubscriptionVideos)
)
diff --git a/server/core/controllers/api/video-channels/index.ts b/server/core/controllers/api/video-channels/index.ts
index 1a5b15ab4a..dc406c5e1d 100644
--- a/server/core/controllers/api/video-channels/index.ts
+++ b/server/core/controllers/api/video-channels/index.ts
@@ -29,7 +29,7 @@ import {
asyncMiddleware,
asyncRetryTransactionMiddleware,
authenticate,
- commonVideosFiltersValidator,
+ commonVideosFiltersValidatorFactory,
optionalAuthenticate,
paginationValidator,
setDefaultPagination,
@@ -140,7 +140,7 @@ videoChannelRouter.get(
setDefaultVideosSort,
setDefaultPagination,
optionalAuthenticate,
- commonVideosFiltersValidator,
+ commonVideosFiltersValidatorFactory(),
asyncMiddleware(listVideoChannelVideos)
)
diff --git a/server/core/controllers/api/videos/index.ts b/server/core/controllers/api/videos/index.ts
index 967937d283..140a70e45e 100644
--- a/server/core/controllers/api/videos/index.ts
+++ b/server/core/controllers/api/videos/index.ts
@@ -18,7 +18,7 @@ import {
asyncRetryTransactionMiddleware,
authenticate,
checkVideoFollowConstraints,
- commonVideosFiltersValidator,
+ commonVideosFiltersValidatorFactory,
optionalAuthenticate,
paginationValidator,
setDefaultPagination,
@@ -87,7 +87,7 @@ videosRouter.get(
setDefaultVideosSort,
setDefaultPagination,
optionalAuthenticate,
- commonVideosFiltersValidator,
+ commonVideosFiltersValidatorFactory(),
asyncMiddleware(listVideos)
)
diff --git a/server/core/controllers/feeds/video-feeds.ts b/server/core/controllers/feeds/video-feeds.ts
index ed215a68e5..cf59cf45c2 100644
--- a/server/core/controllers/feeds/video-feeds.ts
+++ b/server/core/controllers/feeds/video-feeds.ts
@@ -10,7 +10,7 @@ import { buildNSFWFilters } from '../../helpers/express-utils.js'
import { ROUTE_CACHE_LIFETIME, WEBSERVER } from '../../initializers/constants.js'
import {
asyncMiddleware,
- commonVideosFiltersValidator,
+ commonVideosFiltersValidatorFactory,
feedsAccountOrChannelFiltersValidator,
feedsFormatValidator,
setDefaultVideosSort,
@@ -42,7 +42,7 @@ videoFeedsRouter.get(
feedsFormatValidator,
setFeedFormatContentType,
cacheRouteMiddleware(ROUTE_CACHE_LIFETIME.FEEDS),
- commonVideosFiltersValidator,
+ commonVideosFiltersValidatorFactory(),
asyncMiddleware(feedsAccountOrChannelFiltersValidator),
asyncMiddleware(generateVideoFeed)
)
@@ -54,7 +54,7 @@ videoFeedsRouter.get(
feedsFormatValidator,
setFeedFormatContentType,
cacheRouteMiddleware(ROUTE_CACHE_LIFETIME.FEEDS),
- commonVideosFiltersValidator,
+ commonVideosFiltersValidatorFactory(),
asyncMiddleware(videoSubscriptionFeedsValidator),
asyncMiddleware(generateVideoFeedForSubscriptions)
)
diff --git a/server/core/middlewares/validators/videos/videos.ts b/server/core/middlewares/validators/videos/videos.ts
index c4ee185b89..31ee417ff8 100644
--- a/server/core/middlewares/validators/videos/videos.ts
+++ b/server/core/middlewares/validators/videos/videos.ts
@@ -485,126 +485,130 @@ export function getCommonVideoEditAttributes () {
] as (ValidationChain | ExpressPromiseHandler)[]
}
-export const commonVideosFiltersValidator = [
- query('categoryOneOf')
- .optional()
- .customSanitizer(arrayify)
- .custom(isNumberArray).withMessage('Should have a valid categoryOneOf array'),
- query('licenceOneOf')
- .optional()
- .customSanitizer(arrayify)
- .custom(isNumberArray).withMessage('Should have a valid licenceOneOf array'),
- query('languageOneOf')
- .optional()
- .customSanitizer(arrayify)
- .custom(isStringArray).withMessage('Should have a valid languageOneOf array'),
- query('privacyOneOf')
- .optional()
- .customSanitizer(arrayify)
- .custom(isNumberArray).withMessage('Should have a valid privacyOneOf array'),
- query('tagsOneOf')
- .optional()
- .customSanitizer(arrayify)
- .custom(isStringArray).withMessage('Should have a valid tagsOneOf array'),
- query('tagsAllOf')
- .optional()
- .customSanitizer(arrayify)
- .custom(isStringArray).withMessage('Should have a valid tagsAllOf array'),
- query('nsfw')
- .optional()
- .custom(isBooleanBothQueryValid),
- query('nsfwFlagsIncluded')
- .optional()
- .customSanitizer(toIntOrNull)
- .custom(isNSFWFlagsValid),
- query('nsfwFlagsExcluded')
- .optional()
- .customSanitizer(toIntOrNull)
- .custom(isNSFWFlagsValid),
- query('isLive')
- .optional()
- .customSanitizer(toBooleanOrNull)
- .custom(isBooleanValid).withMessage('Should have a valid isLive boolean'),
- query('includeScheduledLive')
- .optional()
- .customSanitizer(toBooleanOrNull)
- .custom(isBooleanValid).withMessage('Should have a valid includeScheduledLive boolean'),
- query('include')
- .optional()
- .custom(isVideoIncludeValid),
- query('isLocal')
- .optional()
- .customSanitizer(toBooleanOrNull)
- .custom(isBooleanValid).withMessage('Should have a valid isLocal boolean'),
- query('hasHLSFiles')
- .optional()
- .customSanitizer(toBooleanOrNull)
- .custom(isBooleanValid).withMessage('Should have a valid hasHLSFiles boolean'),
- query('hasWebVideoFiles')
- .optional()
- .customSanitizer(toBooleanOrNull)
- .custom(isBooleanValid).withMessage('Should have a valid hasWebVideoFiles boolean'),
- query('skipCount')
- .optional()
- .customSanitizer(toBooleanOrNull)
- .custom(isBooleanValid).withMessage('Should have a valid skipCount boolean'),
- query('search')
- .optional()
- .custom(exists),
- query('excludeAlreadyWatched')
- .optional()
- .customSanitizer(toBooleanOrNull)
- .isBoolean().withMessage('Should be a valid excludeAlreadyWatched boolean'),
- query('autoTagOneOf')
- .optional()
- .customSanitizer(arrayify)
- .custom(isStringArray).withMessage('Should have a valid autoTagOneOf array'),
- query('host')
- .optional()
- .custom(isHostValid),
+export const commonVideosFiltersValidatorFactory = (options: {
+ allowPrivacyFilterForAllUsers?: boolean
+} = {}) => {
+ return [
+ query('categoryOneOf')
+ .optional()
+ .customSanitizer(arrayify)
+ .custom(isNumberArray).withMessage('Should have a valid categoryOneOf array'),
+ query('licenceOneOf')
+ .optional()
+ .customSanitizer(arrayify)
+ .custom(isNumberArray).withMessage('Should have a valid licenceOneOf array'),
+ query('languageOneOf')
+ .optional()
+ .customSanitizer(arrayify)
+ .custom(isStringArray).withMessage('Should have a valid languageOneOf array'),
+ query('privacyOneOf')
+ .optional()
+ .customSanitizer(arrayify)
+ .custom(isNumberArray).withMessage('Should have a valid privacyOneOf array'),
+ query('tagsOneOf')
+ .optional()
+ .customSanitizer(arrayify)
+ .custom(isStringArray).withMessage('Should have a valid tagsOneOf array'),
+ query('tagsAllOf')
+ .optional()
+ .customSanitizer(arrayify)
+ .custom(isStringArray).withMessage('Should have a valid tagsAllOf array'),
+ query('nsfw')
+ .optional()
+ .custom(isBooleanBothQueryValid),
+ query('nsfwFlagsIncluded')
+ .optional()
+ .customSanitizer(toIntOrNull)
+ .custom(isNSFWFlagsValid),
+ query('nsfwFlagsExcluded')
+ .optional()
+ .customSanitizer(toIntOrNull)
+ .custom(isNSFWFlagsValid),
+ query('isLive')
+ .optional()
+ .customSanitizer(toBooleanOrNull)
+ .custom(isBooleanValid).withMessage('Should have a valid isLive boolean'),
+ query('includeScheduledLive')
+ .optional()
+ .customSanitizer(toBooleanOrNull)
+ .custom(isBooleanValid).withMessage('Should have a valid includeScheduledLive boolean'),
+ query('include')
+ .optional()
+ .custom(isVideoIncludeValid),
+ query('isLocal')
+ .optional()
+ .customSanitizer(toBooleanOrNull)
+ .custom(isBooleanValid).withMessage('Should have a valid isLocal boolean'),
+ query('hasHLSFiles')
+ .optional()
+ .customSanitizer(toBooleanOrNull)
+ .custom(isBooleanValid).withMessage('Should have a valid hasHLSFiles boolean'),
+ query('hasWebVideoFiles')
+ .optional()
+ .customSanitizer(toBooleanOrNull)
+ .custom(isBooleanValid).withMessage('Should have a valid hasWebVideoFiles boolean'),
+ query('skipCount')
+ .optional()
+ .customSanitizer(toBooleanOrNull)
+ .custom(isBooleanValid).withMessage('Should have a valid skipCount boolean'),
+ query('search')
+ .optional()
+ .custom(exists),
+ query('excludeAlreadyWatched')
+ .optional()
+ .customSanitizer(toBooleanOrNull)
+ .isBoolean().withMessage('Should be a valid excludeAlreadyWatched boolean'),
+ query('autoTagOneOf')
+ .optional()
+ .customSanitizer(arrayify)
+ .custom(isStringArray).withMessage('Should have a valid autoTagOneOf array'),
+ query('host')
+ .optional()
+ .custom(isHostValid),
- (req: express.Request, res: express.Response, next: express.NextFunction) => {
- if (areValidationErrors(req, res)) return
+ (req: express.Request, res: express.Response, next: express.NextFunction) => {
+ if (areValidationErrors(req, res)) return
- const query = req.query as VideosCommonQuery
+ const query = req.query as VideosCommonQuery
- if (((query.nsfwFlagsExcluded || 0) & (query.nsfwFlagsIncluded || 0)) !== 0) {
- return res.fail({
- status: HttpStatusCode.BAD_REQUEST_400,
- message: req.t('Cannot use same flags in nsfwFlagsIncluded and nsfwFlagsExcluded at the same time')
- })
- }
+ if (((query.nsfwFlagsExcluded || 0) & (query.nsfwFlagsIncluded || 0)) !== 0) {
+ return res.fail({
+ status: HttpStatusCode.BAD_REQUEST_400,
+ message: req.t('Cannot use same flags in nsfwFlagsIncluded and nsfwFlagsExcluded at the same time')
+ })
+ }
- const user = res.locals.oauth?.token.User
+ const user = res.locals.oauth?.token.User
- if ((!user || user.hasRight(UserRight.SEE_ALL_VIDEOS) !== true)) {
- if (query.include || query.privacyOneOf || query.autoTagOneOf) {
- return res.fail({
- status: HttpStatusCode.UNAUTHORIZED_401,
- message: req.t('You are not allowed to see all videos, specify a custom include or auto tags filter')
+ if ((!user || user.hasRight(UserRight.SEE_ALL_VIDEOS) !== true)) {
+ if (query.include || (options.allowPrivacyFilterForAllUsers !== true && query.privacyOneOf) || query.autoTagOneOf) {
+ return res.fail({
+ status: HttpStatusCode.UNAUTHORIZED_401,
+ message: req.t('You are not allowed to see all videos, specify a custom include or auto tags filter')
+ })
+ }
+ }
+
+ if (!user && exists(query.excludeAlreadyWatched)) {
+ res.fail({
+ status: HttpStatusCode.BAD_REQUEST_400,
+ message: req.t('Cannot use excludeAlreadyWatched parameter when auth token is not provided')
})
+ return false
}
- }
- if (!user && exists(query.excludeAlreadyWatched)) {
- res.fail({
- status: HttpStatusCode.BAD_REQUEST_400,
- message: req.t('Cannot use excludeAlreadyWatched parameter when auth token is not provided')
- })
- return false
- }
+ if (req.query.filter) {
+ res.fail({
+ status: HttpStatusCode.BAD_REQUEST_400,
+ message: req.t('"filter" query parameter is not supported anymore by PeerTube. Please use "isLocal" and "include" instead')
+ })
+ return false
+ }
- if (req.query.filter) {
- res.fail({
- status: HttpStatusCode.BAD_REQUEST_400,
- message: req.t('"filter" query parameter is not supported anymore by PeerTube. Please use "isLocal" and "include" instead')
- })
- return false
+ return next()
}
-
- return next()
- }
-]
+ ]
+}
export function areErrorsInNSFW (req: express.Request, res: express.Response) {
const body = req.body as VideoCreateUpdateCommon