yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-05 02:39:33 +02:00
Code Issues Releases Wiki Activity

expliciting type checks and predicates (server only)

Browse source
This commit is contained in:
Rigel Kent 2018-07-25 22:01:25 +02:00
parent 5f7021c33d
commit c1e791bad0
No known key found for this signature in database
GPG key ID: EA12971B0E438F36
34 changed files with 127 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

4
server/helpers/custom-validators/misc.ts
View file

@ -51,7 +51,7 @@ function isFileValid (
files: { [ fieldname: string ]: Express.Multer.File[] } | Express.Multer.File[],
mimeTypeRegex: string,
field: string,
maxSize: number,
maxSize: number | null,
optional = false
) {
// Should have files
@ -69,7 +69,7 @@ function isFileValid (
if (!file || !file.originalname) return false
// Check size
if (maxSize && file.size > maxSize) return false
if ((maxSize !== null) && file.size > maxSize) return false
return new RegExp(`^${mimeTypeRegex}$`, 'i').test(file.mimetype)
}

8
server/helpers/custom-validators/videos.ts
View file

@ -150,7 +150,7 @@ function checkUserCanManageVideo (user: UserModel, video: VideoModel, right: Use
}
async function isVideoExist (id: string, res: Response) {
let video: VideoModel
let video: VideoModel | null
if (validator.isInt(id)) {
video = await VideoModel.loadAndPopulateAccountAndServerAndTags(+id)
@ -158,7 +158,7 @@ async function isVideoExist (id: string, res: Response) {
video = await VideoModel.loadByUUIDAndPopulateAccountAndServerAndTags(id)
}
if (!video) {
if (video && video !== null) {
res.status(404)
.json({ error: 'Video not found' })
.end()
@ -173,7 +173,7 @@ async function isVideoExist (id: string, res: Response) {
async function isVideoChannelOfAccountExist (channelId: number, user: UserModel, res: Response) {
if (user.hasRight(UserRight.UPDATE_ANY_VIDEO) === true) {
const videoChannel = await VideoChannelModel.loadAndPopulateAccount(channelId)
if (!videoChannel) {
if (videoChannel && videoChannel !== null) {
res.status(400)
.json({ error: 'Unknown video video channel on this instance.' })
.end()
@ -186,7 +186,7 @@ async function isVideoChannelOfAccountExist (channelId: number, user: UserModel,
}
const videoChannel = await VideoChannelModel.loadByIdAndAccount(channelId, user.Account.id)
if (!videoChannel) {
if (videoChannel && videoChannel !== null) {
res.status(400)
.json({ error: 'Unknown video video channel for this account.' })
.end()