ActivityPub-federated video streaming platform using P2P directly in your web browser
Fix private video deletion with abuse
Chocobozzz8453f0587ecf
diff --git a/packages/tests/src/api/moderation/abuses.ts b/packages/tests/src/api/moderation/abuses.tsindex 4f27fdbc57..37a1fe7e0b 100644--- a/packages/tests/src/api/moderation/abuses.ts+++ b/packages/tests/src/api/moderation/abuses.ts@@ -1,7 +1,7 @@/* oxlint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */import { expect } from 'chai'-import { AbuseMessage, AbusePredefinedReasonsString, AbuseState, AdminAbuse, UserAbuse } from '@peertube/peertube-models'+import { AbuseMessage, AbusePredefinedReasonsString, AbuseState, AdminAbuse, UserAbuse, VideoPrivacy } from '@peertube/peertube-models'import {AbusesCommand,cleanupTests,@@ -877,6 +877,30 @@ describe('Test abuses', function () {})})+ // We had a bug where hooks and DB cascade removal hooks threw an exception+ describe('User with abuses removal', function () {+ let userToken: string++ before(async function () {+ userToken = await servers[0].users.generateUserAndToken('user_42000')+ const { id } = await servers[0].videos.quickUpload({ token: userToken, name: 'video to be reported', privacy: VideoPrivacy.PRIVATE })++ await commands[0].report({ videoId: id, reason: 'video report' })+ })++ it('Should remove all users on the platform, except root', async function () {+ const { data: users } = await servers[0].users.list()+ for (const user of users) {+ if (user.username !== 'root') {+ await servers[0].users.remove({ userId: user.id })+ }+ }++ const { data } = await servers[0].users.list()+ expect(data).to.have.lengthOf(1)+ })+ })+after(async function () {await cleanupTests(servers)})diff --git a/server/core/models/video/video.ts b/server/core/models/video/video.tsindex d287d57a4b..a373d17f91 100644--- a/server/core/models/video/video.ts+++ b/server/core/models/video/video.ts@@ -85,17 +85,18 @@ import { logger, loggerTagsFactory } from '../../helpers/logger.js'import { CONFIG } from '../../initializers/config.js'import { ACTIVITY_PUB, CONSTRAINTS_FIELDS, WEBSERVER } from '../../initializers/constants.js'import { sendDeleteVideo } from '../../lib/activitypub/send/index.js'-import {+import type {MAccountId,MChannel,- MChannelAccountDefault,MChannelId,MStoryboard,MStreamingPlaylist,MStreamingPlaylistFilesVideo,MUserAccountId,+ MVideo,MVideoAP,MVideoAPLight,+ MVideoAccountLight,MVideoAccountLightBlacklistAllFiles,MVideoCaptionLanguageUrl,MVideoDetails,@@ -112,9 +113,7 @@ import {MVideoWithAllFiles,MVideoWithBlacklist,MVideoWithFile,- MVideoWithRights,- type MVideo,- type MVideoAccountLight+ MVideoWithRights} from '../../types/models/index.js'import { MThumbnail } from '../../types/models/video/thumbnail.js'import { MVideoFile, MVideoFileStreamingPlaylistVideo } from '../../types/models/video/video-file.js'@@ -844,8 +843,22 @@ export class VideoModel extends SequelizeModel<VideoModel> {InternalEventEmitter.Instance.emit('video-deleted', { video })}+ // ---------------------------------------------------------------------------+@BeforeDestroy- static stopLiveIfNeeded (instance: VideoModel) {+ static async beforeDestroyHook (instance: VideoModel, options: { transaction: Transaction }) {+ const videoFull = await this.loadFull(instance.id, options.transaction)++ this.stopLiveIfNeeded(videoFull)+ this.invalidateCache(videoFull)++ await this.sendDelete(videoFull, options.transaction)+ await this.removeFiles(videoFull, options.transaction)+ await this.saveEssentialDataToAbuses(videoFull, options.transaction)+ await this.removeFiles(videoFull, options.transaction)+ }++ static stopLiveIfNeeded (instance: MVideo) {if (!instance.isLive) returnlogger.info('Stopping live of video %s after video deletion.', instance.uuid)@@ -853,39 +866,25 @@ export class VideoModel extends SequelizeModel<VideoModel> {LiveManager.Instance.stopSessionOfVideo({ videoUUID: instance.uuid, error: null })}- @BeforeDestroy- static invalidateCache (instance: VideoModel) {+ static invalidateCache (instance: MVideo) {ModelCache.Instance.invalidateCache('video', instance.id)}- @BeforeDestroy- static async sendDelete (instance: MVideoAccountLight, options: { transaction: Transaction }) {+ static async sendDelete (instance: MVideoFull, transaction: Transaction) {if (!instance.isLocal()) return undefinedif (!isPrivacyForFederation(instance.privacy)) return undefined- // Lazy load channels- if (!instance.VideoChannel?.Account?.Actor) {- instance.VideoChannel = await instance.$get('VideoChannel', {- include: [- ActorModel,- AccountModel- ],- transaction: options.transaction- }) as MChannelAccountDefault- }-- return sendDeleteVideo({ video: instance, transaction: options.transaction })+ return sendDeleteVideo({ video: instance, transaction })}- @BeforeDestroy- static async removeFiles (instance: VideoModel, options) {+ static async removeFiles (instance: MVideoWithAllFiles, transaction: Transaction) {const tasks: Promise<any>[] = []logger.info('Removing files of video ' + instance.url)if (instance.isLocal()) {if (!Array.isArray(instance.VideoFiles)) {- instance.VideoFiles = await instance.$get('VideoFiles', { transaction: options.transaction })+ instance.VideoFiles = await instance.$get('VideoFiles', { transaction })}// Remove physical files and torrents@@ -895,7 +894,7 @@ export class VideoModel extends SequelizeModel<VideoModel> {// Remove playlists fileif (!Array.isArray(instance.VideoStreamingPlaylists)) {- instance.VideoStreamingPlaylists = await instance.$get('VideoStreamingPlaylists', { transaction: options.transaction })+ instance.VideoStreamingPlaylists = await instance.$get('VideoStreamingPlaylists', { transaction })}for (const p of instance.VideoStreamingPlaylists) {@@ -904,7 +903,7 @@ export class VideoModel extends SequelizeModel<VideoModel> {}// Remove source files- const promiseRemoveSources = VideoSourceModel.listAll(instance.id, options.transaction)+ const promiseRemoveSources = VideoSourceModel.listAll(instance.id, transaction).then(sources => Promise.all(sources.map(s => instance.removeOriginalFile(s))))tasks.push(promiseRemoveSources)@@ -918,24 +917,20 @@ export class VideoModel extends SequelizeModel<VideoModel> {return undefined}- @BeforeDestroy- static async saveEssentialDataToAbuses (instance: VideoModel, options) {+ static async saveEssentialDataToAbuses (instance: MVideoFull & MVideoFormattableDetails, transaction: Transaction) {const tasks: Promise<any>[] = []- if (!Array.isArray(instance.VideoAbuses)) {- instance.VideoAbuses = await instance.$get('VideoAbuses', { transaction: options.transaction })-- if (instance.VideoAbuses.length === 0) return undefined- }+ const videoAbuses = await instance.$get('VideoAbuses', { transaction })+ if (videoAbuses.length === 0) return undefined- logger.info('Saving video abuses details of video %s.', instance.url)+ logger.info('Saving video abuses details of video %s.', instance.url, { instance })- if (!instance.Trackers) instance.Trackers = await instance.$get('Trackers', { transaction: options.transaction })+ if (!instance.Trackers) instance.Trackers = await instance.$get('Trackers', { transaction })const details = instance.toFormattedDetailsJSON()- for (const abuse of instance.VideoAbuses) {+ for (const abuse of videoAbuses) {abuse.deletedVideo = details- tasks.push(abuse.save({ transaction: options.transaction }))+ tasks.push(abuse.save({ transaction }))}await Promise.all(tasks)