isVideoLanguageValid,
isVideoTagsValid,
isVideoNSFWValid,
- isVideoIdOrUUIDValid,
+ isIdOrUUIDValid,
isVideoAbuseReasonValid,
isVideoRatingTypeValid,
getDurationFromVideoFile,
- checkVideoExists
+ checkVideoExists,
+ isIdValid,
+ isVideoPrivacyValid
} from '../../helpers'
+import { UserRight, VideoPrivacy } from '../../../shared'
+import { authenticate } from '../oauth'
const videosAddValidator = [
body('videofile').custom((value, { req }) => isVideoFile(req.files)).withMessage(
body('language').optional().custom(isVideoLanguageValid).withMessage('Should have a valid language'),
body('nsfw').custom(isVideoNSFWValid).withMessage('Should have a valid NSFW attribute'),
body('description').custom(isVideoDescriptionValid).withMessage('Should have a valid description'),
+ body('channelId').custom(isIdValid).withMessage('Should have correct video channel id'),
+ body('privacy').custom(isVideoPrivacyValid).withMessage('Should have correct video privacy'),
body('tags').optional().custom(isVideoTagsValid).withMessage('Should have correct tags'),
(req: express.Request, res: express.Response, next: express.NextFunction) => {
const videoFile: Express.Multer.File = req.files['videofile'][0]
const user = res.locals.oauth.token.User
- user.isAbleToUploadVideo(videoFile)
+ return db.VideoChannel.loadByIdAndAccount(req.body.channelId, user.Account.id)
+ .then(videoChannel => {
+ if (!videoChannel) {
+ res.status(400)
+ .json({ error: 'Unknown video video channel for this account.' })
+ .end()
+
+ return undefined
+ }
+
+ res.locals.videoChannel = videoChannel
+
+ return user.isAbleToUploadVideo(videoFile)
+ })
.then(isAble => {
if (isAble === false) {
res.status(403)
})
.then(duration => {
// Previous test failed, abort
- if (duration === undefined) return
+ if (duration === undefined) return undefined
if (!isVideoDurationValid('' + duration)) {
return res.status(400)
]
const videosUpdateValidator = [
- param('id').custom(isVideoIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid id'),
+ param('id').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid id'),
body('name').optional().custom(isVideoNameValid).withMessage('Should have a valid name'),
body('category').optional().custom(isVideoCategoryValid).withMessage('Should have a valid category'),
body('licence').optional().custom(isVideoLicenceValid).withMessage('Should have a valid licence'),
body('language').optional().custom(isVideoLanguageValid).withMessage('Should have a valid language'),
body('nsfw').optional().custom(isVideoNSFWValid).withMessage('Should have a valid NSFW attribute'),
+ body('privacy').optional().custom(isVideoPrivacyValid).withMessage('Should have correct video privacy'),
body('description').optional().custom(isVideoDescriptionValid).withMessage('Should have a valid description'),
body('tags').optional().custom(isVideoTagsValid).withMessage('Should have correct tags'),
checkErrors(req, res, () => {
checkVideoExists(req.params.id, res, () => {
+ const video = res.locals.video
+
// We need to make additional checks
- if (res.locals.video.isOwned() === false) {
+ if (video.isOwned() === false) {
return res.status(403)
- .json({ error: 'Cannot update video of another pod' })
+ .json({ error: 'Cannot update video of another server' })
.end()
}
- if (res.locals.video.Author.userId !== res.locals.oauth.token.User.id) {
+ if (video.VideoChannel.Account.userId !== res.locals.oauth.token.User.id) {
return res.status(403)
.json({ error: 'Cannot update video of another user' })
.end()
}
+ if (video.privacy !== VideoPrivacy.PRIVATE && req.body.privacy === VideoPrivacy.PRIVATE) {
+ return res.status(409)
+ .json({ error: 'Cannot set "private" a video that was not private anymore.' })
+ .end()
+ }
+
next()
})
})
]
const videosGetValidator = [
- param('id').custom(isVideoIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid id'),
+ param('id').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid id'),
(req: express.Request, res: express.Response, next: express.NextFunction) => {
logger.debug('Checking videosGet parameters', { parameters: req.params })
checkErrors(req, res, () => {
- checkVideoExists(req.params.id, res, next)
+ checkVideoExists(req.params.id, res, () => {
+ const video = res.locals.video
+
+ // Video is not private, anyone can access it
+ if (video.privacy !== VideoPrivacy.PRIVATE) return next()
+
+ authenticate(req, res, () => {
+ if (video.VideoChannel.Account.userId !== res.locals.oauth.token.User.id) {
+ return res.status(403)
+ .json({ error: 'Cannot get this private video of another user' })
+ .end()
+ }
+
+ next()
+ })
+ })
})
}
]
const videosRemoveValidator = [
- param('id').custom(isVideoIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid id'),
+ param('id').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid id'),
(req: express.Request, res: express.Response, next: express.NextFunction) => {
logger.debug('Checking videosRemove parameters', { parameters: req.params })
]
const videoAbuseReportValidator = [
- param('id').custom(isVideoIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid id'),
+ param('id').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid id'),
body('reason').custom(isVideoAbuseReasonValid).withMessage('Should have a valid reason'),
(req: express.Request, res: express.Response, next: express.NextFunction) => {
]
const videoRateValidator = [
- param('id').custom(isVideoIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid id'),
+ param('id').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid id'),
body('rating').custom(isVideoRatingTypeValid).withMessage('Should have a valid rate type'),
(req: express.Request, res: express.Response, next: express.NextFunction) => {
function checkUserCanDeleteVideo (userId: number, res: express.Response, callback: () => void) {
// Retrieve the user who did the request
- db.User.loadById(userId)
- .then(user => {
- if (res.locals.video.isOwned() === false) {
- return res.status(403)
- .json({ error: 'Cannot remove video of another pod, blacklist it' })
- .end()
- }
-
- // Check if the user can delete the video
- // The user can delete it if s/he is an admin
- // Or if s/he is the video's author
- if (user.isAdmin() === false && res.locals.video.Author.userId !== res.locals.oauth.token.User.id) {
- return res.status(403)
- .json({ error: 'Cannot remove video of another user' })
- .end()
- }
-
- // If we reach this comment, we can delete the video
- callback()
- })
- .catch(err => {
- logger.error('Error in video request validator.', err)
- return res.sendStatus(500)
- })
+ if (res.locals.video.isOwned() === false) {
+ return res.status(403)
+ .json({ error: 'Cannot remove video of another server, blacklist it' })
+ .end()
+ }
+
+ // Check if the user can delete the video
+ // The user can delete it if s/he is an admin
+ // Or if s/he is the video's account
+ const account = res.locals.video.VideoChannel.Account
+ const user = res.locals.oauth.token.User
+ if (user.hasRight(UserRight.REMOVE_ANY_VIDEO) === false && account.userId !== user.id) {
+ return res.status(403)
+ .json({ error: 'Cannot remove video of another user' })
+ .end()
+ }
+
+ // If we reach this comment, we can delete the video
+ callback()
}
projects / github / Chocobozzz / PeerTube.git / blobdiff