X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Futils.ts;h=7abcec5d727fe3f08ea7607d755cfe92a01fcc66;hb=5d08a6a74e83f2e4dfe2f3ba7f5a39371e1bc89e;hp=c581172195072fb52d7437f32ddcf6ceba869bc3;hpb=d5b7d9110dd637a7f67ce9e430145314812a8df1;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/utils.ts b/server/helpers/utils.ts index c58117219..7abcec5d7 100644 --- a/server/helpers/utils.ts +++ b/server/helpers/utils.ts @@ -1,66 +1,38 @@ -import * as express from 'express' -import * as multer from 'multer' import { Model } from 'sequelize-typescript' +import * as ipaddr from 'ipaddr.js' import { ResultList } from '../../shared' import { VideoResolution } from '../../shared/models/videos' -import { CONFIG, REMOTE_SCHEME } from '../initializers' +import { CONFIG } from '../initializers' import { UserModel } from '../models/account/user' import { ActorModel } from '../models/activitypub/actor' import { ApplicationModel } from '../models/application/application' -import { pseudoRandomBytesPromise } from './core-utils' +import { pseudoRandomBytesPromise, unlinkPromise } from './core-utils' import { logger } from './logger' +import { isArray } from './custom-validators/misc' -function getHostWithPort (host: string) { - const splitted = host.split(':') +const isCidr = require('is-cidr') - // The port was not specified - if (splitted.length === 1) { - if (REMOTE_SCHEME.HTTP === 'https') return host + ':443' +function cleanUpReqFiles (req: { files: { [ fieldname: string ]: Express.Multer.File[] } | Express.Multer.File[] }) { + const files = req.files - return host + ':80' - } - - return host -} - -function badRequest (req: express.Request, res: express.Response, next: express.NextFunction) { - return res.type('json').status(400).end() -} + if (!files) return -function createReqFiles ( - fieldNames: string[], - mimeTypes: { [ id: string ]: string }, - destinations: { [ fieldName: string ]: string } -) { - const storage = multer.diskStorage({ - destination: (req, file, cb) => { - cb(null, destinations[file.fieldname]) - }, - - filename: async (req, file, cb) => { - const extension = mimeTypes[file.mimetype] - let randomString = '' - - try { - randomString = await generateRandomString(16) - } catch (err) { - logger.error('Cannot generate random string for file name.', { err }) - randomString = 'fake-random-string' - } + if (isArray(files)) { + (files as Express.Multer.File[]).forEach(f => deleteFileAsync(f.path)) + return + } - cb(null, randomString + extension) - } - }) + for (const key of Object.keys(files)) { + const file = files[key] - const fields = [] - for (const fieldName of fieldNames) { - fields.push({ - name: fieldName, - maxCount: 1 - }) + if (isArray(file)) file.forEach(f => deleteFileAsync(f.path)) + else deleteFileAsync(file.path) } +} - return multer({ storage }).fields(fields) +function deleteFileAsync (path: string) { + unlinkPromise(path) + .catch(err => logger.error('Cannot delete the file %s asynchronously.', path, { err })) } async function generateRandomString (size: number) { @@ -70,22 +42,20 @@ async function generateRandomString (size: number) { } interface FormattableToJSON { - toFormattedJSON () + toFormattedJSON (args?: any) } -function getFormattedObjects (objects: T[], objectsTotal: number) { +function getFormattedObjects (objects: T[], objectsTotal: number, formattedArg?: any) { const formattedObjects: U[] = [] objects.forEach(object => { - formattedObjects.push(object.toFormattedJSON()) + formattedObjects.push(object.toFormattedJSON(formattedArg)) }) - const res: ResultList = { + return { total: objectsTotal, data: formattedObjects - } - - return res + } as ResultList } async function isSignupAllowed () { @@ -103,20 +73,54 @@ async function isSignupAllowed () { return totalUsers < CONFIG.SIGNUP.LIMIT } +function isSignupAllowedForCurrentIP (ip: string) { + const addr = ipaddr.parse(ip) + let excludeList = [ 'blacklist' ] + let matched = '' + + // if there is a valid, non-empty whitelist, we exclude all unknown adresses too + if (CONFIG.SIGNUP.FILTERS.CIDR.WHITELIST.filter(cidr => isCidr(cidr)).length > 0) { + excludeList.push('unknown') + } + + if (addr.kind() === 'ipv4') { + const addrV4 = ipaddr.IPv4.parse(ip) + const rangeList = { + whitelist: CONFIG.SIGNUP.FILTERS.CIDR.WHITELIST.filter(cidr => isCidr.v4(cidr)) + .map(cidr => ipaddr.IPv4.parseCIDR(cidr)), + blacklist: CONFIG.SIGNUP.FILTERS.CIDR.BLACKLIST.filter(cidr => isCidr.v4(cidr)) + .map(cidr => ipaddr.IPv4.parseCIDR(cidr)) + } + matched = ipaddr.subnetMatch(addrV4, rangeList, 'unknown') + } else if (addr.kind() === 'ipv6') { + const addrV6 = ipaddr.IPv6.parse(ip) + const rangeList = { + whitelist: CONFIG.SIGNUP.FILTERS.CIDR.WHITELIST.filter(cidr => isCidr.v6(cidr)) + .map(cidr => ipaddr.IPv6.parseCIDR(cidr)), + blacklist: CONFIG.SIGNUP.FILTERS.CIDR.BLACKLIST.filter(cidr => isCidr.v6(cidr)) + .map(cidr => ipaddr.IPv6.parseCIDR(cidr)) + } + matched = ipaddr.subnetMatch(addrV6, rangeList, 'unknown') + } + + return !excludeList.includes(matched) +} + function computeResolutionsToTranscode (videoFileHeight: number) { const resolutionsEnabled: number[] = [] const configResolutions = CONFIG.TRANSCODING.RESOLUTIONS + // Put in the order we want to proceed jobs const resolutions = [ - VideoResolution.H_240P, - VideoResolution.H_360P, VideoResolution.H_480P, + VideoResolution.H_360P, VideoResolution.H_720P, + VideoResolution.H_240P, VideoResolution.H_1080P ] for (const resolution of resolutions) { - if (configResolutions[resolution + 'p'] === true && videoFileHeight > resolution) { + if (configResolutions[ resolution + 'p' ] === true && videoFileHeight > resolution) { resolutionsEnabled.push(resolution) } } @@ -124,6 +128,35 @@ function computeResolutionsToTranscode (videoFileHeight: number) { return resolutionsEnabled } +const timeTable = { + ms: 1, + second: 1000, + minute: 60000, + hour: 3600000, + day: 3600000 * 24, + week: 3600000 * 24 * 7, + month: 3600000 * 24 * 30 +} +export function parseDuration (duration: number | string): number { + if (typeof duration === 'number') return duration + + if (typeof duration === 'string') { + const split = duration.match(/^([\d\.,]+)\s?(\w+)$/) + + if (split.length === 3) { + const len = parseFloat(split[1]) + let unit = split[2].replace(/s$/i,'').toLowerCase() + if (unit === 'm') { + unit = 'ms' + } + + return (len || 1) * (timeTable[unit] || 0) + } + } + + throw new Error('Duration could not be properly parsed') +} + function resetSequelizeInstance (instance: Model, savedFields: object) { Object.keys(savedFields).forEach(key => { const value = savedFields[key] @@ -135,6 +168,8 @@ let serverActor: ActorModel async function getServerActor () { if (serverActor === undefined) { const application = await ApplicationModel.load() + if (!application) throw Error('Could not load Application from database.') + serverActor = application.Account.Actor } @@ -151,14 +186,14 @@ type SortType = { sortModel: any, sortValue: string } // --------------------------------------------------------------------------- export { - badRequest, + cleanUpReqFiles, + deleteFileAsync, generateRandomString, getFormattedObjects, isSignupAllowed, + isSignupAllowedForCurrentIP, computeResolutionsToTranscode, resetSequelizeInstance, getServerActor, - SortType, - getHostWithPort, - createReqFiles + SortType }