import { Model } from 'sequelize-typescript'
+import * as ipaddr from 'ipaddr.js'
import { ResultList } from '../../shared'
import { VideoResolution } from '../../shared/models/videos'
import { CONFIG } from '../initializers'
import { pseudoRandomBytesPromise } from './core-utils'
import { logger } from './logger'
+const isCidr = require('is-cidr')
+
async function generateRandomString (size: number) {
const raw = await pseudoRandomBytesPromise(size)
}
interface FormattableToJSON {
- toFormattedJSON ()
+ toFormattedJSON (args?: any)
}
-function getFormattedObjects<U, T extends FormattableToJSON> (objects: T[], objectsTotal: number) {
+function getFormattedObjects<U, T extends FormattableToJSON> (objects: T[], objectsTotal: number, formattedArg?: any) {
const formattedObjects: U[] = []
objects.forEach(object => {
- formattedObjects.push(object.toFormattedJSON())
+ formattedObjects.push(object.toFormattedJSON(formattedArg))
})
- const res: ResultList<U> = {
+ return {
total: objectsTotal,
data: formattedObjects
- }
-
- return res
+ } as ResultList<U>
}
async function isSignupAllowed () {
return totalUsers < CONFIG.SIGNUP.LIMIT
}
+function isSignupAllowedForCurrentIP (ip: string) {
+ const addr = ipaddr.parse(ip)
+ let excludeList = [ 'blacklist' ]
+ let matched: string
+
+ // 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)
}
}
generateRandomString,
getFormattedObjects,
isSignupAllowed,
+ isSignupAllowedForCurrentIP,
computeResolutionsToTranscode,
resetSequelizeInstance,
getServerActor,