X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fvideos.js;h=9a50a29bef5065e04fc39b12cc7aa20ca48b04c7;hb=d6a5b018b89f9d2569ca7435b0e270095c93cc17;hp=a61f2b2c9fe54fc57a451fa1eaa74b3bd7a1281b;hpb=feb4bdfd9b46e87aadfa7c0d5338cde887d1f58c;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/videos.js b/server/controllers/api/videos.js index a61f2b2c9..9a50a29be 100644 --- a/server/controllers/api/videos.js +++ b/server/controllers/api/videos.js @@ -11,6 +11,7 @@ const db = require('../../initializers/database') const logger = require('../../helpers/logger') const friends = require('../../lib/friends') const middlewares = require('../../middlewares') +const admin = middlewares.admin const oAuth = middlewares.oauth const pagination = middlewares.pagination const validators = middlewares.validators @@ -43,6 +44,21 @@ const storage = multer.diskStorage({ const reqFiles = multer({ storage: storage }).fields([{ name: 'videofile', maxCount: 1 }]) +router.get('/abuse', + oAuth.authenticate, + admin.ensureIsAdmin, + validatorsPagination.pagination, + validatorsSort.videoAbusesSort, + sort.setVideoAbusesSort, + pagination.setPagination, + listVideoAbuses +) +router.post('/:id/abuse', + oAuth.authenticate, + validatorsVideos.videoAbuseReport, + reportVideoAbuseRetryWrapper +) + router.get('/', validatorsPagination.pagination, validatorsSort.videosSort, @@ -50,11 +66,17 @@ router.get('/', pagination.setPagination, listVideos ) +router.put('/:id', + oAuth.authenticate, + reqFiles, + validatorsVideos.videosUpdate, + updateVideoRetryWrapper +) router.post('/', oAuth.authenticate, reqFiles, validatorsVideos.videosAdd, - addVideo + addVideoRetryWrapper ) router.get('/:id', validatorsVideos.videosGet, @@ -81,137 +103,258 @@ module.exports = router // --------------------------------------------------------------------------- -function addVideo (req, res, next) { - const videoFile = req.files.videofile[0] +// Wrapper to video add that retry the function if there is a database error +// We need this because we run the transaction in SERIALIZABLE isolation that can fail +function addVideoRetryWrapper (req, res, next) { + const options = { + arguments: [ req, res, req.files.videofile[0] ], + errorMessage: 'Cannot insert the video with many retries.' + } + + utils.retryWrapper(addVideo, options, function (err) { + if (err) return next(err) + + // TODO : include Location of the new video -> 201 + return res.type('json').status(204).end() + }) +} + +function addVideo (req, res, videoFile, callback) { const videoInfos = req.body waterfall([ - function findOrCreateAuthor (callback) { - const username = res.locals.oauth.token.user.username - - const query = { - where: { - name: username, - podId: null - }, - defaults: { - name: username, - podId: null // null because it is OUR pod - } - } + function startTransaction (callbackWaterfall) { + db.sequelize.transaction({ isolationLevel: 'SERIALIZABLE' }).asCallback(function (err, t) { + return callbackWaterfall(err, t) + }) + }, + + function findOrCreateAuthor (t, callbackWaterfall) { + const user = res.locals.oauth.token.User + + const name = user.username + // null because it is OUR pod + const podId = null + const userId = user.id - db.Author.findOrCreate(query).asCallback(function (err, result) { - // [ instance, wasCreated ] - return callback(err, result[0]) + db.Author.findOrCreateAuthor(name, podId, userId, t, function (err, authorInstance) { + return callbackWaterfall(err, t, authorInstance) }) }, - function createVideoObject (author, callback) { + function findOrCreateTags (t, author, callbackWaterfall) { + const tags = videoInfos.tags + + db.Tag.findOrCreateTags(tags, t, function (err, tagInstances) { + return callbackWaterfall(err, t, author, tagInstances) + }) + }, + + function createVideoObject (t, author, tagInstances, callbackWaterfall) { const videoData = { name: videoInfos.name, remoteId: null, extname: path.extname(videoFile.filename), description: videoInfos.description, duration: videoFile.duration, - tags: videoInfos.tags, authorId: author.id } const video = db.Video.build(videoData) - return callback(null, author, video) + return callbackWaterfall(null, t, author, tagInstances, video) }, // Set the videoname the same as the id - function renameVideoFile (author, video, callback) { + function renameVideoFile (t, author, tagInstances, video, callbackWaterfall) { const videoDir = constants.CONFIG.STORAGE.VIDEOS_DIR const source = path.join(videoDir, videoFile.filename) const destination = path.join(videoDir, video.getVideoFilename()) fs.rename(source, destination, function (err) { - return callback(err, author, video) + if (err) return callbackWaterfall(err) + + // This is important in case if there is another attempt + videoFile.filename = video.getVideoFilename() + return callbackWaterfall(null, t, author, tagInstances, video) }) }, - function insertIntoDB (author, video, callback) { - video.save().asCallback(function (err, videoCreated) { + function insertVideoIntoDB (t, author, tagInstances, video, callbackWaterfall) { + const options = { transaction: t } + + // Add tags association + video.save(options).asCallback(function (err, videoCreated) { + if (err) return callbackWaterfall(err) + // Do not forget to add Author informations to the created video videoCreated.Author = author - return callback(err, videoCreated) + return callbackWaterfall(err, t, tagInstances, videoCreated) }) }, - function sendToFriends (video, callback) { - video.toRemoteJSON(function (err, remoteVideo) { - if (err) return callback(err) + function associateTagsToVideo (t, tagInstances, video, callbackWaterfall) { + const options = { transaction: t } - // Now we'll add the video's meta data to our friends - friends.addVideoToFriends(remoteVideo) + video.setTags(tagInstances, options).asCallback(function (err) { + video.Tags = tagInstances - return callback(null) + return callbackWaterfall(err, t, video) }) - } + }, - ], function andFinally (err) { - if (err) { - logger.error('Cannot insert the video.') - return next(err) + function sendToFriends (t, video, callbackWaterfall) { + video.toAddRemoteJSON(function (err, remoteVideo) { + if (err) return callbackWaterfall(err) + + // Now we'll add the video's meta data to our friends + friends.addVideoToFriends(remoteVideo, t, function (err) { + return callbackWaterfall(err, t) + }) + }) } - // TODO : include Location of the new video -> 201 - return res.type('json').status(204).end() - }) -} + ], function andFinally (err, t) { + if (err) { + // This is just a debug because we will retry the insert + logger.debug('Cannot insert the video.', { error: err }) -function getVideo (req, res, next) { - db.Video.loadAndPopulateAuthorAndPod(req.params.id, function (err, video) { - if (err) return next(err) + // Abort transaction? + if (t) t.rollback() - if (!video) { - return res.type('json').status(204).end() + return callback(err) } - res.json(video.toFormatedJSON()) + // Commit transaction + t.commit().asCallback(function (err) { + if (err) return callback(err) + + logger.info('Video with name %s created.', videoInfos.name) + return callback(null) + }) }) } -function listVideos (req, res, next) { - db.Video.listForApi(req.query.start, req.query.count, req.query.sort, function (err, videosList, videosTotal) { +function updateVideoRetryWrapper (req, res, next) { + const options = { + arguments: [ req, res ], + errorMessage: 'Cannot update the video with many retries.' + } + + utils.retryWrapper(updateVideo, options, function (err) { if (err) return next(err) - res.json(getFormatedVideos(videosList, videosTotal)) + // TODO : include Location of the new video -> 201 + return res.type('json').status(204).end() }) } -function removeVideo (req, res, next) { - const videoId = req.params.id +function updateVideo (req, res, finalCallback) { + const videoInstance = res.locals.video + const videoFieldsSave = videoInstance.toJSON() + const videoInfosToUpdate = req.body waterfall([ - function getVideo (callback) { - db.Video.load(videoId, callback) + + function startTransaction (callback) { + db.sequelize.transaction({ isolationLevel: 'SERIALIZABLE' }).asCallback(function (err, t) { + return callback(err, t) + }) + }, + + function findOrCreateTags (t, callback) { + if (videoInfosToUpdate.tags) { + db.Tag.findOrCreateTags(videoInfosToUpdate.tags, t, function (err, tagInstances) { + return callback(err, t, tagInstances) + }) + } else { + return callback(null, t, null) + } }, - function removeFromDB (video, callback) { - video.destroy().asCallback(function (err) { - if (err) return callback(err) + function updateVideoIntoDB (t, tagInstances, callback) { + const options = { + transaction: t + } + + if (videoInfosToUpdate.name) videoInstance.set('name', videoInfosToUpdate.name) + if (videoInfosToUpdate.description) videoInstance.set('description', videoInfosToUpdate.description) - return callback(null, video) + videoInstance.save(options).asCallback(function (err) { + return callback(err, t, tagInstances) }) }, - function sendInformationToFriends (video, callback) { - const params = { - name: video.name, - remoteId: video.id + function associateTagsToVideo (t, tagInstances, callback) { + if (tagInstances) { + const options = { transaction: t } + + videoInstance.setTags(tagInstances, options).asCallback(function (err) { + videoInstance.Tags = tagInstances + + return callback(err, t) + }) + } else { + return callback(null, t) } + }, - friends.removeVideoToFriends(params) + function sendToFriends (t, callback) { + const json = videoInstance.toUpdateRemoteJSON() - return callback(null) + // Now we'll update the video's meta data to our friends + friends.updateVideoToFriends(json, t, function (err) { + return callback(err, t) + }) } - ], function andFinally (err) { + + ], function andFinally (err, t) { + if (err) { + logger.debug('Cannot update the video.', { error: err }) + + // Abort transaction? + if (t) t.rollback() + + // Force fields we want to update + // If the transaction is retried, sequelize will think the object has not changed + // So it will skip the SQL request, even if the last one was ROLLBACKed! + Object.keys(videoFieldsSave).forEach(function (key) { + const value = videoFieldsSave[key] + videoInstance.set(key, value) + }) + + return finalCallback(err) + } + + // Commit transaction + t.commit().asCallback(function (err) { + if (err) return finalCallback(err) + + logger.info('Video with name %s updated.', videoInfosToUpdate.name) + return finalCallback(null) + }) + }) +} + +function getVideo (req, res, next) { + const videoInstance = res.locals.video + res.json(videoInstance.toFormatedJSON()) +} + +function listVideos (req, res, next) { + db.Video.listForApi(req.query.start, req.query.count, req.query.sort, function (err, videosList, videosTotal) { + if (err) return next(err) + + res.json(utils.getFormatedObjects(videosList, videosTotal)) + }) +} + +function removeVideo (req, res, next) { + const videoInstance = res.locals.video + + videoInstance.destroy().asCallback(function (err) { if (err) { logger.error('Errors when removed the video.', { error: err }) return next(err) @@ -222,25 +365,97 @@ function removeVideo (req, res, next) { } function searchVideos (req, res, next) { - db.Video.searchAndPopulateAuthorAndPod(req.params.value, req.query.field, req.query.start, req.query.count, req.query.sort, - function (err, videosList, videosTotal) { + db.Video.searchAndPopulateAuthorAndPodAndTags( + req.params.value, req.query.field, req.query.start, req.query.count, req.query.sort, + function (err, videosList, videosTotal) { + if (err) return next(err) + + res.json(utils.getFormatedObjects(videosList, videosTotal)) + } + ) +} + +function listVideoAbuses (req, res, next) { + db.VideoAbuse.listForApi(req.query.start, req.query.count, req.query.sort, function (err, abusesList, abusesTotal) { if (err) return next(err) - res.json(getFormatedVideos(videosList, videosTotal)) + res.json(utils.getFormatedObjects(abusesList, abusesTotal)) }) } -// --------------------------------------------------------------------------- +function reportVideoAbuseRetryWrapper (req, res, next) { + utils.transactionRetryer( + function (callback) { + return reportVideoAbuse(req, res, callback) + }, + function (err) { + if (err) { + logger.error('Cannot report abuse to the video with many retries.', { error: err }) + return next(err) + } -function getFormatedVideos (videos, videosTotal) { - const formatedVideos = [] + return res.type('json').status(204).end() + } + ) +} - videos.forEach(function (video) { - formatedVideos.push(video.toFormatedJSON()) - }) +function reportVideoAbuse (req, res, finalCallback) { + const videoInstance = res.locals.video + const reporterUsername = res.locals.oauth.token.User.username - return { - total: videosTotal, - data: formatedVideos + const abuse = { + reporterUsername, + reason: req.body.reason, + videoId: videoInstance.id, + reporterPodId: null // This is our pod that reported this abuse } + + waterfall([ + + function startTransaction (callback) { + db.sequelize.transaction().asCallback(function (err, t) { + return callback(err, t) + }) + }, + + function createAbuse (t, callback) { + db.VideoAbuse.create(abuse).asCallback(function (err, abuse) { + return callback(err, t, abuse) + }) + }, + + function sendToFriendsIfNeeded (t, abuse, callback) { + // We send the information to the destination pod + if (videoInstance.isOwned() === false) { + const reportData = { + reporterUsername, + reportReason: abuse.reason, + videoRemoteId: videoInstance.remoteId + } + + friends.reportAbuseVideoToFriend(reportData, videoInstance) + } + + return callback(null, t) + } + + ], function andFinally (err, t) { + if (err) { + logger.debug('Cannot update the video.', { error: err }) + + // Abort transaction? + if (t) t.rollback() + + return finalCallback(err) + } + + // Commit transaction + t.commit().asCallback(function (err) { + if (err) return finalCallback(err) + + logger.info('Abuse report for video %s created.', videoInstance.name) + return finalCallback(null) + }) + }) } +