X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=server%2Fhelpers%2Fcustom-validators%2Fmisc.ts;h=3dc5504e32545d611c3b9a1d325621cd6613c87a;hb=99b757488c077cee7d0ab89eeec181a7ee6290eb;hp=b6f0ebe6f2478fd06138978efefa9f95995cd4ef;hpb=73471b1a52f242e86364ffb077ea6cadb3b07ae2;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/custom-validators/misc.ts b/server/helpers/custom-validators/misc.ts
index b6f0ebe6f..3dc5504e3 100644
--- a/server/helpers/custom-validators/misc.ts
+++ b/server/helpers/custom-validators/misc.ts
@@ -1,11 +1,21 @@
 import 'multer'
-import * as validator from 'validator'
+import { UploadFilesForCheck } from 'express'
+import { sep } from 'path'
+import validator from 'validator'
+import { isShortUUID, shortToUUID } from '@shared/extra-utils'
 
 function exists (value: any) {
   return value !== undefined && value !== null
 }
 
-function isArray (value: any) {
+function isSafePath (p: string) {
+  return exists(p) &&
+    (p + '').split(sep).every(part => {
+      return [ '..' ].includes(part) === false
+    })
+}
+
+function isArray (value: any): value is any[] {
   return Array.isArray(value)
 }
 
@@ -13,6 +23,14 @@ function isNotEmptyIntArray (value: any) {
   return Array.isArray(value) && value.every(v => validator.isInt('' + v)) && value.length !== 0
 }
 
+function isNotEmptyStringArray (value: any) {
+  return Array.isArray(value) && value.every(v => typeof v === 'string' && v.length !== 0) && value.length !== 0
+}
+
+function isArrayOf (value: any, validator: (value: any) => boolean) {
+  return isArray(value) && value.every(v => validator(v))
+}
+
 function isDateValid (value: string) {
   return exists(value) && validator.isISO8601(value)
 }
@@ -25,6 +43,10 @@ function isUUIDValid (value: string) {
   return exists(value) && validator.isUUID('' + value, 4)
 }
 
+function areUUIDsValid (values: string[]) {
+  return isArray(values) && values.every(v => isUUIDValid(v))
+}
+
 function isIdOrUUIDValid (value: string) {
   return isIdValid(value) || isUUIDValid(value)
 }
@@ -33,64 +55,116 @@ function isBooleanValid (value: any) {
   return typeof value === 'boolean' || (typeof value === 'string' && validator.isBoolean(value))
 }
 
-function toIntOrNull (value: string) {
-  if (value === 'null') return null
-
-  return validator.toInt(value)
+function isIntOrNull (value: any) {
+  return value === null || validator.isInt('' + value)
 }
 
-function toValueOrNull (value: string) {
-  if (value === 'null') return null
+// ---------------------------------------------------------------------------
 
-  return value
-}
+function isFileValid (options: {
+  files: UploadFilesForCheck
 
-function toArray (value: string) {
-  if (value && isArray(value) === false) return [ value ]
+  maxSize: number | null
+  mimeTypeRegex: string | null
 
-  return value
-}
+  field?: string
+
+  optional?: boolean // Default false
+}) {
+  const { files, mimeTypeRegex, field, maxSize, optional = false } = options
 
-function isFileValid (
-  files: { [ fieldname: string ]: Express.Multer.File[] } | Express.Multer.File[],
-  mimeTypeRegex: string,
-  field: string,
-  maxSize: number | null,
-  optional = false
-) {
   // Should have files
   if (!files) return optional
-  if (isArray(files)) return optional
 
-  // Should have a file
-  const fileArray = files[ field ]
-  if (!fileArray || fileArray.length === 0) {
+  const fileArray = isArray(files)
+    ? files
+    : files[field]
+
+  if (!fileArray || !isArray(fileArray) || fileArray.length === 0) {
     return optional
   }
 
-  // The file should exist
-  const file = fileArray[ 0 ]
-  if (!file || !file.originalname) return false
+  // The file exists
+  const file = fileArray[0]
+  if (!file?.originalname) return false
 
   // Check size
   if ((maxSize !== null) && file.size > maxSize) return false
 
-  return new RegExp(`^${mimeTypeRegex}$`, 'i').test(file.mimetype)
+  if (mimeTypeRegex === null) return true
+
+  return checkMimetypeRegex(file.mimetype, mimeTypeRegex)
+}
+
+function checkMimetypeRegex (fileMimeType: string, mimeTypeRegex: string) {
+  return new RegExp(`^${mimeTypeRegex}$`, 'i').test(fileMimeType)
+}
+
+// ---------------------------------------------------------------------------
+
+function toCompleteUUID (value: string) {
+  if (isShortUUID(value)) return shortToUUID(value)
+
+  return value
+}
+
+function toCompleteUUIDs (values: string[]) {
+  return values.map(v => toCompleteUUID(v))
+}
+
+function toIntOrNull (value: string) {
+  const v = toValueOrNull(value)
+
+  if (v === null || v === undefined) return v
+  if (typeof v === 'number') return v
+
+  return validator.toInt('' + v)
+}
+
+function toBooleanOrNull (value: any) {
+  const v = toValueOrNull(value)
+
+  if (v === null || v === undefined) return v
+  if (typeof v === 'boolean') return v
+
+  return validator.toBoolean('' + v)
+}
+
+function toValueOrNull (value: string) {
+  if (value === 'null') return null
+
+  return value
+}
+
+function toIntArray (value: any) {
+  if (!value) return []
+  if (isArray(value) === false) return [ validator.toInt(value) ]
+
+  return value.map(v => validator.toInt(v))
 }
 
 // ---------------------------------------------------------------------------
 
 export {
   exists,
+  isArrayOf,
   isNotEmptyIntArray,
   isArray,
+  isIntOrNull,
   isIdValid,
+  isSafePath,
+  isNotEmptyStringArray,
   isUUIDValid,
+  toCompleteUUIDs,
+  toCompleteUUID,
   isIdOrUUIDValid,
   isDateValid,
   toValueOrNull,
+  toBooleanOrNull,
   isBooleanValid,
   toIntOrNull,
-  toArray,
-  isFileValid
+  areUUIDsValid,
+  toIntArray,
+  isFileValid,
+  checkMimetypeRegex
 }