import 'multer'
-import * as validator from 'validator'
+import validator from 'validator'
import { sep } from 'path'
function exists (value: any) {
function isSafePath (p: string) {
return exists(p) &&
(p + '').split(sep).every(part => {
- return [ '', '.', '..' ].includes(part) === false
+ return [ '..' ].includes(part) === false
})
}
}
function toIntOrNull (value: string) {
- if (value === 'null') return null
+ 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.toInt(value)
+ return validator.toBoolean('' + v)
}
function toValueOrNull (value: string) {
if (isArray(files)) return optional
// Should have a file
- const fileArray = files[ field ]
+ const fileArray = files[field]
if (!fileArray || fileArray.length === 0) {
return optional
}
// The file should exist
- const file = fileArray[ 0 ]
+ const file = fileArray[0]
if (!file || !file.originalname) return false
// Check size
isIdOrUUIDValid,
isDateValid,
toValueOrNull,
+ toBooleanOrNull,
isBooleanValid,
toIntOrNull,
toArray,