diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2020-05-14 11:10:26 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-14 11:10:26 +0200 |
commit | 2158ac90341dc3fcae958540de65032da25c8d6e (patch) | |
tree | a780923d701f3daa130996768e38c1e1b6a0646c | |
parent | 7405b6ba897dbce1b4fd50c92174f1df5ac15adc (diff) | |
download | PeerTube-2158ac90341dc3fcae958540de65032da25c8d6e.tar.gz PeerTube-2158ac90341dc3fcae958540de65032da25c8d6e.tar.zst PeerTube-2158ac90341dc3fcae958540de65032da25c8d6e.zip |
Add server plugin filter hooks for import with torrent and url (#2621)
* Add server plugin filter hooks for import with torrent and url
* WIP: pre and post-import filter hooks
* Rebased
* Cleanup filters to accept imports
Co-authored-by: Chocobozzz <me@florianbigard.com>
-rw-r--r-- | server/initializers/constants.ts | 3 | ||||
-rw-r--r-- | server/lib/job-queue/handlers/video-import.ts | 76 | ||||
-rw-r--r-- | server/lib/moderation.ts | 24 | ||||
-rw-r--r-- | server/middlewares/validators/videos/video-imports.ts | 43 | ||||
-rw-r--r-- | server/tests/fixtures/peertube-plugin-test/main.js | 42 | ||||
-rw-r--r-- | server/tests/plugins/filter-hooks.ts | 88 | ||||
-rw-r--r-- | shared/extra-utils/videos/video-imports.ts | 4 | ||||
-rw-r--r-- | shared/models/plugins/server-hook.model.ts | 6 | ||||
-rw-r--r-- | shared/models/server/job.model.ts | 7 | ||||
-rw-r--r-- | shared/models/videos/import/video-import-state.enum.ts | 3 |
10 files changed, 257 insertions, 39 deletions
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index e5cac64d4..676d9804b 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts | |||
@@ -372,7 +372,8 @@ const VIDEO_STATES = { | |||
372 | const VIDEO_IMPORT_STATES = { | 372 | const VIDEO_IMPORT_STATES = { |
373 | [VideoImportState.FAILED]: 'Failed', | 373 | [VideoImportState.FAILED]: 'Failed', |
374 | [VideoImportState.PENDING]: 'Pending', | 374 | [VideoImportState.PENDING]: 'Pending', |
375 | [VideoImportState.SUCCESS]: 'Success' | 375 | [VideoImportState.SUCCESS]: 'Success', |
376 | [VideoImportState.REJECTED]: 'Rejected' | ||
376 | } | 377 | } |
377 | 378 | ||
378 | const VIDEO_ABUSE_STATES = { | 379 | const VIDEO_ABUSE_STATES = { |
diff --git a/server/lib/job-queue/handlers/video-import.ts b/server/lib/job-queue/handlers/video-import.ts index ad549c6fc..a197ef629 100644 --- a/server/lib/job-queue/handlers/video-import.ts +++ b/server/lib/job-queue/handlers/video-import.ts | |||
@@ -1,27 +1,36 @@ | |||
1 | import * as Bull from 'bull' | 1 | import * as Bull from 'bull' |
2 | import { logger } from '../../../helpers/logger' | 2 | import { move, remove, stat } from 'fs-extra' |
3 | import { downloadYoutubeDLVideo } from '../../../helpers/youtube-dl' | 3 | import { extname } from 'path' |
4 | import { VideoImportModel } from '../../../models/video/video-import' | 4 | import { addOptimizeOrMergeAudioJob } from '@server/helpers/video' |
5 | import { isPostImportVideoAccepted } from '@server/lib/moderation' | ||
6 | import { Hooks } from '@server/lib/plugins/hooks' | ||
7 | import { getVideoFilePath } from '@server/lib/video-paths' | ||
8 | import { MVideoImportDefault, MVideoImportDefaultFiles, MVideoImportVideo } from '@server/typings/models/video/video-import' | ||
9 | import { | ||
10 | VideoImportPayload, | ||
11 | VideoImportTorrentPayload, | ||
12 | VideoImportTorrentPayloadType, | ||
13 | VideoImportYoutubeDLPayload, | ||
14 | VideoImportYoutubeDLPayloadType, | ||
15 | VideoState | ||
16 | } from '../../../../shared' | ||
5 | import { VideoImportState } from '../../../../shared/models/videos' | 17 | import { VideoImportState } from '../../../../shared/models/videos' |
18 | import { ThumbnailType } from '../../../../shared/models/videos/thumbnail.type' | ||
6 | import { getDurationFromVideoFile, getVideoFileFPS, getVideoFileResolution } from '../../../helpers/ffmpeg-utils' | 19 | import { getDurationFromVideoFile, getVideoFileFPS, getVideoFileResolution } from '../../../helpers/ffmpeg-utils' |
7 | import { extname } from 'path' | 20 | import { logger } from '../../../helpers/logger' |
8 | import { VideoFileModel } from '../../../models/video/video-file' | ||
9 | import { VIDEO_IMPORT_TIMEOUT } from '../../../initializers/constants' | ||
10 | import { VideoImportPayload, VideoImportTorrentPayload, VideoImportYoutubeDLPayload, VideoState } from '../../../../shared' | ||
11 | import { federateVideoIfNeeded } from '../../activitypub/videos' | ||
12 | import { VideoModel } from '../../../models/video/video' | ||
13 | import { createTorrentAndSetInfoHash, downloadWebTorrentVideo } from '../../../helpers/webtorrent' | ||
14 | import { getSecureTorrentName } from '../../../helpers/utils' | 21 | import { getSecureTorrentName } from '../../../helpers/utils' |
15 | import { move, remove, stat } from 'fs-extra' | 22 | import { createTorrentAndSetInfoHash, downloadWebTorrentVideo } from '../../../helpers/webtorrent' |
16 | import { Notifier } from '../../notifier' | 23 | import { downloadYoutubeDLVideo } from '../../../helpers/youtube-dl' |
17 | import { CONFIG } from '../../../initializers/config' | 24 | import { CONFIG } from '../../../initializers/config' |
25 | import { VIDEO_IMPORT_TIMEOUT } from '../../../initializers/constants' | ||
18 | import { sequelizeTypescript } from '../../../initializers/database' | 26 | import { sequelizeTypescript } from '../../../initializers/database' |
19 | import { generateVideoMiniature } from '../../thumbnail' | 27 | import { VideoModel } from '../../../models/video/video' |
20 | import { ThumbnailType } from '../../../../shared/models/videos/thumbnail.type' | 28 | import { VideoFileModel } from '../../../models/video/video-file' |
29 | import { VideoImportModel } from '../../../models/video/video-import' | ||
21 | import { MThumbnail } from '../../../typings/models/video/thumbnail' | 30 | import { MThumbnail } from '../../../typings/models/video/thumbnail' |
22 | import { MVideoImportDefault, MVideoImportDefaultFiles, MVideoImportVideo } from '@server/typings/models/video/video-import' | 31 | import { federateVideoIfNeeded } from '../../activitypub/videos' |
23 | import { getVideoFilePath } from '@server/lib/video-paths' | 32 | import { Notifier } from '../../notifier' |
24 | import { addOptimizeOrMergeAudioJob } from '@server/helpers/video' | 33 | import { generateVideoMiniature } from '../../thumbnail' |
25 | 34 | ||
26 | async function processVideoImport (job: Bull.Job) { | 35 | async function processVideoImport (job: Bull.Job) { |
27 | const payload = job.data as VideoImportPayload | 36 | const payload = job.data as VideoImportPayload |
@@ -44,6 +53,7 @@ async function processTorrentImport (job: Bull.Job, payload: VideoImportTorrentP | |||
44 | const videoImport = await getVideoImportOrDie(payload.videoImportId) | 53 | const videoImport = await getVideoImportOrDie(payload.videoImportId) |
45 | 54 | ||
46 | const options = { | 55 | const options = { |
56 | type: payload.type, | ||
47 | videoImportId: payload.videoImportId, | 57 | videoImportId: payload.videoImportId, |
48 | 58 | ||
49 | generateThumbnail: true, | 59 | generateThumbnail: true, |
@@ -61,6 +71,7 @@ async function processYoutubeDLImport (job: Bull.Job, payload: VideoImportYoutub | |||
61 | 71 | ||
62 | const videoImport = await getVideoImportOrDie(payload.videoImportId) | 72 | const videoImport = await getVideoImportOrDie(payload.videoImportId) |
63 | const options = { | 73 | const options = { |
74 | type: payload.type, | ||
64 | videoImportId: videoImport.id, | 75 | videoImportId: videoImport.id, |
65 | 76 | ||
66 | generateThumbnail: payload.generateThumbnail, | 77 | generateThumbnail: payload.generateThumbnail, |
@@ -80,6 +91,7 @@ async function getVideoImportOrDie (videoImportId: number) { | |||
80 | } | 91 | } |
81 | 92 | ||
82 | type ProcessFileOptions = { | 93 | type ProcessFileOptions = { |
94 | type: VideoImportYoutubeDLPayloadType | VideoImportTorrentPayloadType | ||
83 | videoImportId: number | 95 | videoImportId: number |
84 | 96 | ||
85 | generateThumbnail: boolean | 97 | generateThumbnail: boolean |
@@ -105,7 +117,7 @@ async function processFile (downloader: () => Promise<string>, videoImport: MVid | |||
105 | const fps = await getVideoFileFPS(tempVideoPath) | 117 | const fps = await getVideoFileFPS(tempVideoPath) |
106 | const duration = await getDurationFromVideoFile(tempVideoPath) | 118 | const duration = await getDurationFromVideoFile(tempVideoPath) |
107 | 119 | ||
108 | // Create video file object in database | 120 | // Prepare video file object for creation in database |
109 | const videoFileData = { | 121 | const videoFileData = { |
110 | extname: extname(tempVideoPath), | 122 | extname: extname(tempVideoPath), |
111 | resolution: videoFileResolution, | 123 | resolution: videoFileResolution, |
@@ -115,6 +127,30 @@ async function processFile (downloader: () => Promise<string>, videoImport: MVid | |||
115 | } | 127 | } |
116 | videoFile = new VideoFileModel(videoFileData) | 128 | videoFile = new VideoFileModel(videoFileData) |
117 | 129 | ||
130 | const hookName = options.type === 'youtube-dl' | ||
131 | ? 'filter:api.video.post-import-url.accept.result' | ||
132 | : 'filter:api.video.post-import-torrent.accept.result' | ||
133 | |||
134 | // Check we accept this video | ||
135 | const acceptParameters = { | ||
136 | videoImport, | ||
137 | video: videoImport.Video, | ||
138 | videoFilePath: tempVideoPath, | ||
139 | videoFile, | ||
140 | user: videoImport.User | ||
141 | } | ||
142 | const acceptedResult = await Hooks.wrapFun(isPostImportVideoAccepted, acceptParameters, hookName) | ||
143 | |||
144 | if (acceptedResult.accepted !== true) { | ||
145 | logger.info('Refused imported video.', { acceptedResult, acceptParameters }) | ||
146 | |||
147 | videoImport.state = VideoImportState.REJECTED | ||
148 | await videoImport.save() | ||
149 | |||
150 | throw new Error(acceptedResult.errorMessage) | ||
151 | } | ||
152 | |||
153 | // Video is accepted, resuming preparation | ||
118 | const videoWithFiles = Object.assign(videoImport.Video, { VideoFiles: [ videoFile ], VideoStreamingPlaylists: [] }) | 154 | const videoWithFiles = Object.assign(videoImport.Video, { VideoFiles: [ videoFile ], VideoStreamingPlaylists: [] }) |
119 | // To clean files if the import fails | 155 | // To clean files if the import fails |
120 | const videoImportWithFiles: MVideoImportDefaultFiles = Object.assign(videoImport, { Video: videoWithFiles }) | 156 | const videoImportWithFiles: MVideoImportDefaultFiles = Object.assign(videoImport, { Video: videoWithFiles }) |
@@ -194,7 +230,9 @@ async function processFile (downloader: () => Promise<string>, videoImport: MVid | |||
194 | } | 230 | } |
195 | 231 | ||
196 | videoImport.error = err.message | 232 | videoImport.error = err.message |
197 | videoImport.state = VideoImportState.FAILED | 233 | if (videoImport.state !== VideoImportState.REJECTED) { |
234 | videoImport.state = VideoImportState.FAILED | ||
235 | } | ||
198 | await videoImport.save() | 236 | await videoImport.save() |
199 | 237 | ||
200 | Notifier.Instance.notifyOnFinishedVideoImport(videoImport, false) | 238 | Notifier.Instance.notifyOnFinishedVideoImport(videoImport, false) |
diff --git a/server/lib/moderation.ts b/server/lib/moderation.ts index 55f7a985d..4afebb32a 100644 --- a/server/lib/moderation.ts +++ b/server/lib/moderation.ts | |||
@@ -1,12 +1,15 @@ | |||
1 | import { VideoModel } from '../models/video/video' | 1 | import { VideoModel } from '../models/video/video' |
2 | import { VideoCommentModel } from '../models/video/video-comment' | 2 | import { VideoCommentModel } from '../models/video/video-comment' |
3 | import { VideoCommentCreate } from '../../shared/models/videos/video-comment.model' | 3 | import { VideoCommentCreate } from '../../shared/models/videos/video-comment.model' |
4 | import { VideoCreate } from '../../shared/models/videos' | 4 | import { VideoCreate, VideoImportCreate } from '../../shared/models/videos' |
5 | import { UserModel } from '../models/account/user' | 5 | import { UserModel } from '../models/account/user' |
6 | import { VideoTorrentObject } from '../../shared/models/activitypub/objects' | 6 | import { VideoTorrentObject } from '../../shared/models/activitypub/objects' |
7 | import { ActivityCreate } from '../../shared/models/activitypub' | 7 | import { ActivityCreate } from '../../shared/models/activitypub' |
8 | import { ActorModel } from '../models/activitypub/actor' | 8 | import { ActorModel } from '../models/activitypub/actor' |
9 | import { VideoCommentObject } from '../../shared/models/activitypub/objects/video-comment-object' | 9 | import { VideoCommentObject } from '../../shared/models/activitypub/objects/video-comment-object' |
10 | import { VideoFileModel } from '@server/models/video/video-file' | ||
11 | import { PathLike } from 'fs-extra' | ||
12 | import { MUser } from '@server/typings/models' | ||
10 | 13 | ||
11 | export type AcceptResult = { | 14 | export type AcceptResult = { |
12 | accepted: boolean | 15 | accepted: boolean |
@@ -55,10 +58,27 @@ function isRemoteVideoCommentAccepted (_object: { | |||
55 | return { accepted: true } | 58 | return { accepted: true } |
56 | } | 59 | } |
57 | 60 | ||
61 | function isPreImportVideoAccepted (object: { | ||
62 | videoImportBody: VideoImportCreate | ||
63 | user: MUser | ||
64 | }): AcceptResult { | ||
65 | return { accepted: true } | ||
66 | } | ||
67 | |||
68 | function isPostImportVideoAccepted (object: { | ||
69 | videoFilePath: PathLike | ||
70 | videoFile: VideoFileModel | ||
71 | user: MUser | ||
72 | }): AcceptResult { | ||
73 | return { accepted: true } | ||
74 | } | ||
75 | |||
58 | export { | 76 | export { |
59 | isLocalVideoAccepted, | 77 | isLocalVideoAccepted, |
60 | isLocalVideoThreadAccepted, | 78 | isLocalVideoThreadAccepted, |
61 | isRemoteVideoAccepted, | 79 | isRemoteVideoAccepted, |
62 | isRemoteVideoCommentAccepted, | 80 | isRemoteVideoCommentAccepted, |
63 | isLocalVideoCommentReplyAccepted | 81 | isLocalVideoCommentReplyAccepted, |
82 | isPreImportVideoAccepted, | ||
83 | isPostImportVideoAccepted | ||
64 | } | 84 | } |
diff --git a/server/middlewares/validators/videos/video-imports.ts b/server/middlewares/validators/videos/video-imports.ts index 5dc5db533..e3d900a9e 100644 --- a/server/middlewares/validators/videos/video-imports.ts +++ b/server/middlewares/validators/videos/video-imports.ts | |||
@@ -1,15 +1,18 @@ | |||
1 | import * as express from 'express' | 1 | import * as express from 'express' |
2 | import { body } from 'express-validator' | 2 | import { body } from 'express-validator' |
3 | import { isPreImportVideoAccepted } from '@server/lib/moderation' | ||
4 | import { Hooks } from '@server/lib/plugins/hooks' | ||
5 | import { VideoImportCreate } from '@shared/models/videos/import/video-import-create.model' | ||
3 | import { isIdValid, toIntOrNull } from '../../../helpers/custom-validators/misc' | 6 | import { isIdValid, toIntOrNull } from '../../../helpers/custom-validators/misc' |
4 | import { logger } from '../../../helpers/logger' | ||
5 | import { areValidationErrors } from '../utils' | ||
6 | import { getCommonVideoEditAttributes } from './videos' | ||
7 | import { isVideoImportTargetUrlValid, isVideoImportTorrentFile } from '../../../helpers/custom-validators/video-imports' | 7 | import { isVideoImportTargetUrlValid, isVideoImportTorrentFile } from '../../../helpers/custom-validators/video-imports' |
8 | import { cleanUpReqFiles } from '../../../helpers/express-utils' | ||
9 | import { isVideoMagnetUriValid, isVideoNameValid } from '../../../helpers/custom-validators/videos' | 8 | import { isVideoMagnetUriValid, isVideoNameValid } from '../../../helpers/custom-validators/videos' |
9 | import { cleanUpReqFiles } from '../../../helpers/express-utils' | ||
10 | import { logger } from '../../../helpers/logger' | ||
11 | import { doesVideoChannelOfAccountExist } from '../../../helpers/middlewares' | ||
10 | import { CONFIG } from '../../../initializers/config' | 12 | import { CONFIG } from '../../../initializers/config' |
11 | import { CONSTRAINTS_FIELDS } from '../../../initializers/constants' | 13 | import { CONSTRAINTS_FIELDS } from '../../../initializers/constants' |
12 | import { doesVideoChannelOfAccountExist } from '../../../helpers/middlewares' | 14 | import { areValidationErrors } from '../utils' |
15 | import { getCommonVideoEditAttributes } from './videos' | ||
13 | 16 | ||
14 | const videoImportAddValidator = getCommonVideoEditAttributes().concat([ | 17 | const videoImportAddValidator = getCommonVideoEditAttributes().concat([ |
15 | body('channelId') | 18 | body('channelId') |
@@ -64,6 +67,8 @@ const videoImportAddValidator = getCommonVideoEditAttributes().concat([ | |||
64 | .end() | 67 | .end() |
65 | } | 68 | } |
66 | 69 | ||
70 | if (!await isImportAccepted(req, res)) return cleanUpReqFiles(req) | ||
71 | |||
67 | return next() | 72 | return next() |
68 | } | 73 | } |
69 | ]) | 74 | ]) |
@@ -75,3 +80,31 @@ export { | |||
75 | } | 80 | } |
76 | 81 | ||
77 | // --------------------------------------------------------------------------- | 82 | // --------------------------------------------------------------------------- |
83 | |||
84 | async function isImportAccepted (req: express.Request, res: express.Response) { | ||
85 | const body: VideoImportCreate = req.body | ||
86 | const hookName = body.targetUrl | ||
87 | ? 'filter:api.video.pre-import-url.accept.result' | ||
88 | : 'filter:api.video.pre-import-torrent.accept.result' | ||
89 | |||
90 | // Check we accept this video | ||
91 | const acceptParameters = { | ||
92 | videoImportBody: body, | ||
93 | user: res.locals.oauth.token.User | ||
94 | } | ||
95 | const acceptedResult = await Hooks.wrapFun( | ||
96 | isPreImportVideoAccepted, | ||
97 | acceptParameters, | ||
98 | hookName | ||
99 | ) | ||
100 | |||
101 | if (!acceptedResult || acceptedResult.accepted !== true) { | ||
102 | logger.info('Refused to import video.', { acceptedResult, acceptParameters }) | ||
103 | res.status(403) | ||
104 | .json({ error: acceptedResult.errorMessage || 'Refused to import video' }) | ||
105 | |||
106 | return false | ||
107 | } | ||
108 | |||
109 | return true | ||
110 | } | ||
diff --git a/server/tests/fixtures/peertube-plugin-test/main.js b/server/tests/fixtures/peertube-plugin-test/main.js index 69796ab07..a45e98fb5 100644 --- a/server/tests/fixtures/peertube-plugin-test/main.js +++ b/server/tests/fixtures/peertube-plugin-test/main.js | |||
@@ -50,7 +50,47 @@ async function register ({ registerHook, registerSetting, settingsManager, stora | |||
50 | target: 'filter:api.video.upload.accept.result', | 50 | target: 'filter:api.video.upload.accept.result', |
51 | handler: ({ accepted }, { videoBody }) => { | 51 | handler: ({ accepted }, { videoBody }) => { |
52 | if (!accepted) return { accepted: false } | 52 | if (!accepted) return { accepted: false } |
53 | if (videoBody.name.indexOf('bad word') !== -1) return { accepted: false, errorMessage: 'bad word '} | 53 | if (videoBody.name.indexOf('bad word') !== -1) return { accepted: false, errorMessage: 'bad word' } |
54 | |||
55 | return { accepted: true } | ||
56 | } | ||
57 | }) | ||
58 | |||
59 | registerHook({ | ||
60 | target: 'filter:api.video.pre-import-url.accept.result', | ||
61 | handler: ({ accepted }, { videoImportBody }) => { | ||
62 | if (!accepted) return { accepted: false } | ||
63 | if (videoImportBody.targetUrl.includes('bad')) return { accepted: false, errorMessage: 'bad target url' } | ||
64 | |||
65 | return { accepted: true } | ||
66 | } | ||
67 | }) | ||
68 | |||
69 | registerHook({ | ||
70 | target: 'filter:api.video.pre-import-torrent.accept.result', | ||
71 | handler: ({ accepted }, { videoImportBody }) => { | ||
72 | if (!accepted) return { accepted: false } | ||
73 | if (videoImportBody.name.includes('bad torrent')) return { accepted: false, errorMessage: 'bad torrent' } | ||
74 | |||
75 | return { accepted: true } | ||
76 | } | ||
77 | }) | ||
78 | |||
79 | registerHook({ | ||
80 | target: 'filter:api.video.post-import-url.accept.result', | ||
81 | handler: ({ accepted }, { video }) => { | ||
82 | if (!accepted) return { accepted: false } | ||
83 | if (video.name.includes('bad word')) return { accepted: false, errorMessage: 'bad word' } | ||
84 | |||
85 | return { accepted: true } | ||
86 | } | ||
87 | }) | ||
88 | |||
89 | registerHook({ | ||
90 | target: 'filter:api.video.post-import-torrent.accept.result', | ||
91 | handler: ({ accepted }, { video }) => { | ||
92 | if (!accepted) return { accepted: false } | ||
93 | if (video.name.includes('bad word')) return { accepted: false, errorMessage: 'bad word' } | ||
54 | 94 | ||
55 | return { accepted: true } | 95 | return { accepted: true } |
56 | } | 96 | } |
diff --git a/server/tests/plugins/filter-hooks.ts b/server/tests/plugins/filter-hooks.ts index 6c1fd40ba..41242318e 100644 --- a/server/tests/plugins/filter-hooks.ts +++ b/server/tests/plugins/filter-hooks.ts | |||
@@ -1,8 +1,8 @@ | |||
1 | /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ | 1 | /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ |
2 | 2 | ||
3 | import * as chai from 'chai' | ||
4 | import 'mocha' | 3 | import 'mocha' |
5 | import { cleanupTests, flushAndRunMultipleServers, ServerInfo } from '../../../shared/extra-utils/server/servers' | 4 | import * as chai from 'chai' |
5 | import { ServerConfig } from '@shared/models' | ||
6 | import { | 6 | import { |
7 | addVideoCommentReply, | 7 | addVideoCommentReply, |
8 | addVideoCommentThread, | 8 | addVideoCommentThread, |
@@ -23,10 +23,10 @@ import { | |||
23 | uploadVideo, | 23 | uploadVideo, |
24 | waitJobs | 24 | waitJobs |
25 | } from '../../../shared/extra-utils' | 25 | } from '../../../shared/extra-utils' |
26 | import { cleanupTests, flushAndRunMultipleServers, ServerInfo } from '../../../shared/extra-utils/server/servers' | ||
27 | import { getMyVideoImports, getYoutubeVideoUrl, importVideo } from '../../../shared/extra-utils/videos/video-imports' | ||
28 | import { VideoDetails, VideoImport, VideoImportState, VideoPrivacy } from '../../../shared/models/videos' | ||
26 | import { VideoCommentThreadTree } from '../../../shared/models/videos/video-comment.model' | 29 | import { VideoCommentThreadTree } from '../../../shared/models/videos/video-comment.model' |
27 | import { VideoDetails } from '../../../shared/models/videos' | ||
28 | import { getYoutubeVideoUrl, importVideo } from '../../../shared/extra-utils/videos/video-imports' | ||
29 | import { ServerConfig } from '@shared/models' | ||
30 | 30 | ||
31 | const expect = chai.expect | 31 | const expect = chai.expect |
32 | 32 | ||
@@ -87,6 +87,84 @@ describe('Test plugin filter hooks', function () { | |||
87 | await uploadVideo(servers[0].url, servers[0].accessToken, { name: 'video with bad word' }, 403) | 87 | await uploadVideo(servers[0].url, servers[0].accessToken, { name: 'video with bad word' }, 403) |
88 | }) | 88 | }) |
89 | 89 | ||
90 | it('Should run filter:api.video.pre-import-url.accept.result', async function () { | ||
91 | const baseAttributes = { | ||
92 | name: 'normal title', | ||
93 | privacy: VideoPrivacy.PUBLIC, | ||
94 | channelId: servers[0].videoChannel.id, | ||
95 | targetUrl: getYoutubeVideoUrl() + 'bad' | ||
96 | } | ||
97 | await importVideo(servers[0].url, servers[0].accessToken, baseAttributes, 403) | ||
98 | }) | ||
99 | |||
100 | it('Should run filter:api.video.pre-import-torrent.accept.result', async function () { | ||
101 | const baseAttributes = { | ||
102 | name: 'bad torrent', | ||
103 | privacy: VideoPrivacy.PUBLIC, | ||
104 | channelId: servers[0].videoChannel.id, | ||
105 | torrentfile: 'video-720p.torrent' as any | ||
106 | } | ||
107 | await importVideo(servers[0].url, servers[0].accessToken, baseAttributes, 403) | ||
108 | }) | ||
109 | |||
110 | it('Should run filter:api.video.post-import-url.accept.result', async function () { | ||
111 | this.timeout(60000) | ||
112 | |||
113 | let videoImportId: number | ||
114 | |||
115 | { | ||
116 | const baseAttributes = { | ||
117 | name: 'title with bad word', | ||
118 | privacy: VideoPrivacy.PUBLIC, | ||
119 | channelId: servers[0].videoChannel.id, | ||
120 | targetUrl: getYoutubeVideoUrl() | ||
121 | } | ||
122 | const res = await importVideo(servers[0].url, servers[0].accessToken, baseAttributes) | ||
123 | videoImportId = res.body.id | ||
124 | } | ||
125 | |||
126 | await waitJobs(servers) | ||
127 | |||
128 | { | ||
129 | const res = await getMyVideoImports(servers[0].url, servers[0].accessToken) | ||
130 | const videoImports = res.body.data as VideoImport[] | ||
131 | |||
132 | const videoImport = videoImports.find(i => i.id === videoImportId) | ||
133 | |||
134 | expect(videoImport.state.id).to.equal(VideoImportState.REJECTED) | ||
135 | expect(videoImport.state.label).to.equal('Rejected') | ||
136 | } | ||
137 | }) | ||
138 | |||
139 | it('Should run filter:api.video.post-import-torrent.accept.result', async function () { | ||
140 | this.timeout(60000) | ||
141 | |||
142 | let videoImportId: number | ||
143 | |||
144 | { | ||
145 | const baseAttributes = { | ||
146 | name: 'title with bad word', | ||
147 | privacy: VideoPrivacy.PUBLIC, | ||
148 | channelId: servers[0].videoChannel.id, | ||
149 | torrentfile: 'video-720p.torrent' as any | ||
150 | } | ||
151 | const res = await importVideo(servers[0].url, servers[0].accessToken, baseAttributes) | ||
152 | videoImportId = res.body.id | ||
153 | } | ||
154 | |||
155 | await waitJobs(servers) | ||
156 | |||
157 | { | ||
158 | const res = await getMyVideoImports(servers[0].url, servers[0].accessToken) | ||
159 | const videoImports = res.body.data as VideoImport[] | ||
160 | |||
161 | const videoImport = videoImports.find(i => i.id === videoImportId) | ||
162 | |||
163 | expect(videoImport.state.id).to.equal(VideoImportState.REJECTED) | ||
164 | expect(videoImport.state.label).to.equal('Rejected') | ||
165 | } | ||
166 | }) | ||
167 | |||
90 | it('Should run filter:api.video-thread.create.accept.result', async function () { | 168 | it('Should run filter:api.video-thread.create.accept.result', async function () { |
91 | await addVideoCommentThread(servers[0].url, servers[0].accessToken, videoUUID, 'comment with bad word', 403) | 169 | await addVideoCommentThread(servers[0].url, servers[0].accessToken, videoUUID, 'comment with bad word', 403) |
92 | }) | 170 | }) |
diff --git a/shared/extra-utils/videos/video-imports.ts b/shared/extra-utils/videos/video-imports.ts index 8e5abd2f5..d235181b0 100644 --- a/shared/extra-utils/videos/video-imports.ts +++ b/shared/extra-utils/videos/video-imports.ts | |||
@@ -15,7 +15,7 @@ function getBadVideoUrl () { | |||
15 | return 'https://download.cpy.re/peertube/bad_video.mp4' | 15 | return 'https://download.cpy.re/peertube/bad_video.mp4' |
16 | } | 16 | } |
17 | 17 | ||
18 | function importVideo (url: string, token: string, attributes: VideoImportCreate) { | 18 | function importVideo (url: string, token: string, attributes: VideoImportCreate & { torrentfile?: string }, statusCodeExpected = 200) { |
19 | const path = '/api/v1/videos/imports' | 19 | const path = '/api/v1/videos/imports' |
20 | 20 | ||
21 | let attaches: any = {} | 21 | let attaches: any = {} |
@@ -27,7 +27,7 @@ function importVideo (url: string, token: string, attributes: VideoImportCreate) | |||
27 | token, | 27 | token, |
28 | attaches, | 28 | attaches, |
29 | fields: attributes, | 29 | fields: attributes, |
30 | statusCodeExpected: 200 | 30 | statusCodeExpected |
31 | }) | 31 | }) |
32 | } | 32 | } |
33 | 33 | ||
diff --git a/shared/models/plugins/server-hook.model.ts b/shared/models/plugins/server-hook.model.ts index 20f89b86d..5f812904f 100644 --- a/shared/models/plugins/server-hook.model.ts +++ b/shared/models/plugins/server-hook.model.ts | |||
@@ -9,9 +9,13 @@ export const serverFilterHookObject = { | |||
9 | // Used to get detailed video information (video watch page for example) | 9 | // Used to get detailed video information (video watch page for example) |
10 | 'filter:api.video.get.result': true, | 10 | 'filter:api.video.get.result': true, |
11 | 11 | ||
12 | // Filter the result of the accept upload function | 12 | // Filter the result of the accept upload, import via torrent or url functions |
13 | // If this function returns false then the upload is aborted with an error | 13 | // If this function returns false then the upload is aborted with an error |
14 | 'filter:api.video.upload.accept.result': true, | 14 | 'filter:api.video.upload.accept.result': true, |
15 | 'filter:api.video.pre-import-url.accept.result': true, | ||
16 | 'filter:api.video.pre-import-torrent.accept.result': true, | ||
17 | 'filter:api.video.post-import-url.accept.result': true, | ||
18 | 'filter:api.video.post-import-torrent.accept.result': true, | ||
15 | // Filter the result of the accept comment (thread or reply) functions | 19 | // Filter the result of the accept comment (thread or reply) functions |
16 | // If the functions return false then the user cannot post its comment | 20 | // If the functions return false then the user cannot post its comment |
17 | 'filter:api.video-thread.create.accept.result': true, | 21 | 'filter:api.video-thread.create.accept.result': true, |
diff --git a/shared/models/server/job.model.ts b/shared/models/server/job.model.ts index 57d61c480..61010e5a8 100644 --- a/shared/models/server/job.model.ts +++ b/shared/models/server/job.model.ts | |||
@@ -70,8 +70,11 @@ export type VideoFileImportPayload = { | |||
70 | filePath: string | 70 | filePath: string |
71 | } | 71 | } |
72 | 72 | ||
73 | export type VideoImportTorrentPayloadType = 'magnet-uri' | 'torrent-file' | ||
74 | export type VideoImportYoutubeDLPayloadType = 'youtube-dl' | ||
75 | |||
73 | export type VideoImportYoutubeDLPayload = { | 76 | export type VideoImportYoutubeDLPayload = { |
74 | type: 'youtube-dl' | 77 | type: VideoImportYoutubeDLPayloadType |
75 | videoImportId: number | 78 | videoImportId: number |
76 | 79 | ||
77 | generateThumbnail: boolean | 80 | generateThumbnail: boolean |
@@ -80,7 +83,7 @@ export type VideoImportYoutubeDLPayload = { | |||
80 | fileExt?: string | 83 | fileExt?: string |
81 | } | 84 | } |
82 | export type VideoImportTorrentPayload = { | 85 | export type VideoImportTorrentPayload = { |
83 | type: 'magnet-uri' | 'torrent-file' | 86 | type: VideoImportTorrentPayloadType |
84 | videoImportId: number | 87 | videoImportId: number |
85 | } | 88 | } |
86 | export type VideoImportPayload = VideoImportYoutubeDLPayload | VideoImportTorrentPayload | 89 | export type VideoImportPayload = VideoImportYoutubeDLPayload | VideoImportTorrentPayload |
diff --git a/shared/models/videos/import/video-import-state.enum.ts b/shared/models/videos/import/video-import-state.enum.ts index b178fbf3a..8421b8ca7 100644 --- a/shared/models/videos/import/video-import-state.enum.ts +++ b/shared/models/videos/import/video-import-state.enum.ts | |||
@@ -1,5 +1,6 @@ | |||
1 | export enum VideoImportState { | 1 | export enum VideoImportState { |
2 | PENDING = 1, | 2 | PENDING = 1, |
3 | SUCCESS = 2, | 3 | SUCCESS = 2, |
4 | FAILED = 3 | 4 | FAILED = 3, |
5 | REJECTED = 4 | ||
5 | } | 6 | } |