X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcore-utils.ts;h=73bd994c17c7618a69db3eb65de751681f8ff6aa;hb=d7ce9dca613d96889baa0c93063806268f68cce5;hp=f7e6fdddcf79fb0ec70c37b96301b36fa91c9aa3;hpb=318b0bd0c2ff575f35d51d97327f77abfecd6b86;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/core-utils.ts b/server/helpers/core-utils.ts
index f7e6fdddc..73bd994c1 100644
--- a/server/helpers/core-utils.ts
+++ b/server/helpers/core-utils.ts
@@ -6,10 +6,8 @@
 */
 
 import { exec, ExecOptions } from 'child_process'
-import { BinaryToTextEncoding, createHash, randomBytes } from 'crypto'
+import { ED25519KeyPairOptions, generateKeyPair, randomBytes, RSAKeyPairOptions, scrypt } from 'crypto'
 import { truncate } from 'lodash'
-import { basename, extname, isAbsolute, join, resolve } from 'path'
-import * as pem from 'pem'
 import { pipeline } from 'stream'
 import { URL } from 'url'
 import { promisify } from 'util'
@@ -57,6 +55,7 @@ const timeTable = {
 export function parseDurationToMs (duration: number | string): number {
   if (duration === null) return null
   if (typeof duration === 'number') return duration
+  if (!isNaN(+duration)) return +duration
 
   if (typeof duration === 'string') {
     const split = duration.match(/^([\d.,]+)\s?(\w+)$/)
@@ -77,6 +76,7 @@ export function parseDurationToMs (duration: number | string): number {
 
 export function parseBytes (value: string | number): number {
   if (typeof value === 'number') return value
+  if (!isNaN(+value)) return +value
 
   const tgm = /^(\d+)\s*TB\s*(\d+)\s*GB\s*(\d+)\s*MB$/
   const tg = /^(\d+)\s*TB\s*(\d+)\s*GB$/
@@ -86,40 +86,55 @@ export function parseBytes (value: string | number): number {
   const g = /^(\d+)\s*GB$/
   const m = /^(\d+)\s*MB$/
   const b = /^(\d+)\s*B$/
-  let match
+
+  let match: RegExpMatchArray
 
   if (value.match(tgm)) {
     match = value.match(tgm)
     return parseInt(match[1], 10) * 1024 * 1024 * 1024 * 1024 +
       parseInt(match[2], 10) * 1024 * 1024 * 1024 +
       parseInt(match[3], 10) * 1024 * 1024
-  } else if (value.match(tg)) {
+  }
+
+  if (value.match(tg)) {
     match = value.match(tg)
     return parseInt(match[1], 10) * 1024 * 1024 * 1024 * 1024 +
       parseInt(match[2], 10) * 1024 * 1024 * 1024
-  } else if (value.match(tm)) {
+  }
+
+  if (value.match(tm)) {
     match = value.match(tm)
     return parseInt(match[1], 10) * 1024 * 1024 * 1024 * 1024 +
       parseInt(match[2], 10) * 1024 * 1024
-  } else if (value.match(gm)) {
+  }
+
+  if (value.match(gm)) {
     match = value.match(gm)
     return parseInt(match[1], 10) * 1024 * 1024 * 1024 +
       parseInt(match[2], 10) * 1024 * 1024
-  } else if (value.match(t)) {
+  }
+
+  if (value.match(t)) {
     match = value.match(t)
     return parseInt(match[1], 10) * 1024 * 1024 * 1024 * 1024
-  } else if (value.match(g)) {
+  }
+
+  if (value.match(g)) {
     match = value.match(g)
     return parseInt(match[1], 10) * 1024 * 1024 * 1024
-  } else if (value.match(m)) {
+  }
+
+  if (value.match(m)) {
     match = value.match(m)
     return parseInt(match[1], 10) * 1024 * 1024
-  } else if (value.match(b)) {
+  }
+
+  if (value.match(b)) {
     match = value.match(b)
     return parseInt(match[1], 10) * 1024
-  } else {
-    return parseInt(value, 10)
   }
+
+  return parseInt(value, 10)
 }
 
 // ---------------------------------------------------------------------------
@@ -149,39 +164,20 @@ function isTestInstance () {
   return process.env.NODE_ENV === 'test'
 }
 
-function isProdInstance () {
-  return process.env.NODE_ENV === 'production'
-}
-
-function getAppNumber () {
-  return process.env.NODE_APP_INSTANCE
+function isDevInstance () {
+  return process.env.NODE_ENV === 'dev'
 }
 
-// ---------------------------------------------------------------------------
-
-let rootPath: string
-
-function root () {
-  if (rootPath) return rootPath
-
-  // We are in /helpers/utils.js
-  rootPath = join(__dirname, '..', '..')
-
-  if (basename(rootPath) === 'dist') rootPath = resolve(rootPath, '..')
-
-  return rootPath
+function isTestOrDevInstance () {
+  return isTestInstance() || isDevInstance()
 }
 
-function buildPath (path: string) {
-  if (isAbsolute(path)) return path
-
-  return join(root(), path)
+function isProdInstance () {
+  return process.env.NODE_ENV === 'production'
 }
 
-function getLowercaseExtension (filename: string) {
-  const ext = extname(filename) || ''
-
-  return ext.toLowerCase()
+function getAppNumber () {
+  return process.env.NODE_APP_INSTANCE || ''
 }
 
 // ---------------------------------------------------------------------------
@@ -220,16 +216,6 @@ function parseSemVersion (s: string) {
 
 // ---------------------------------------------------------------------------
 
-function sha256 (str: string | Buffer, encoding: BinaryToTextEncoding = 'hex') {
-  return createHash('sha256').update(str).digest(encoding)
-}
-
-function sha1 (str: string | Buffer, encoding: BinaryToTextEncoding = 'hex') {
-  return createHash('sha1').update(str).digest(encoding)
-}
-
-// ---------------------------------------------------------------------------
-
 function execShell (command: string, options?: ExecOptions) {
   return new Promise<{ err?: Error, stdout: string, stderr: string }>((res, rej) => {
     exec(command, options, (err, stdout, stderr) => {
@@ -248,13 +234,58 @@ function isOdd (num: number) {
 }
 
 function toEven (num: number) {
-  if (isOdd) return num + 1
+  if (isOdd(num)) return num + 1
 
   return num
 }
 
 // ---------------------------------------------------------------------------
 
+function generateRSAKeyPairPromise (size: number) {
+  return new Promise<{ publicKey: string, privateKey: string }>((res, rej) => {
+    const options: RSAKeyPairOptions<'pem', 'pem'> = {
+      modulusLength: size,
+      publicKeyEncoding: {
+        type: 'spki',
+        format: 'pem'
+      },
+      privateKeyEncoding: {
+        type: 'pkcs1',
+        format: 'pem'
+      }
+    }
+
+    generateKeyPair('rsa', options, (err, publicKey, privateKey) => {
+      if (err) return rej(err)
+
+      return res({ publicKey, privateKey })
+    })
+  })
+}
+
+function generateED25519KeyPairPromise () {
+  return new Promise<{ publicKey: string, privateKey: string }>((res, rej) => {
+    const options: ED25519KeyPairOptions<'pem', 'pem'> = {
+      publicKeyEncoding: {
+        type: 'spki',
+        format: 'pem'
+      },
+      privateKeyEncoding: {
+        type: 'pkcs8',
+        format: 'pem'
+      }
+    }
+
+    generateKeyPair('ed25519', options, (err, publicKey, privateKey) => {
+      if (err) return rej(err)
+
+      return res({ publicKey, privateKey })
+    })
+  })
+}
+
+// ---------------------------------------------------------------------------
+
 function promisify0<A> (func: (cb: (err: any, result: A) => void) => void): () => Promise<A> {
   return function promisified (): Promise<A> {
     return new Promise<A>((resolve: (arg: A) => void, reject: (err: any) => void) => {
@@ -280,9 +311,17 @@ function promisify2<T, U, A> (func: (arg1: T, arg2: U, cb: (err: any, result: A)
   }
 }
 
+// eslint-disable-next-line max-len
+function promisify3<T, U, V, A> (func: (arg1: T, arg2: U, arg3: V, cb: (err: any, result: A) => void) => void): (arg1: T, arg2: U, arg3: V) => Promise<A> {
+  return function promisified (arg1: T, arg2: U, arg3: V): Promise<A> {
+    return new Promise<A>((resolve: (arg: A) => void, reject: (err: any) => void) => {
+      func.apply(null, [ arg1, arg2, arg3, (err: any, res: A) => err ? reject(err) : resolve(res) ])
+    })
+  }
+}
+
 const randomBytesPromise = promisify1<number, Buffer>(randomBytes)
-const createPrivateKey = promisify1<number, { key: string }>(pem.createPrivateKey)
-const getPublicKey = promisify1<string, { publicKey: string }>(pem.getPublicKey)
+const scryptPromise = promisify3<string, string, number, Buffer>(scrypt)
 const execPromise2 = promisify2<string, any, string>(exec)
 const execPromise = promisify1<string, string>(exec)
 const pipelinePromise = promisify(pipeline)
@@ -291,15 +330,13 @@ const pipelinePromise = promisify(pipeline)
 
 export {
   isTestInstance,
+  isTestOrDevInstance,
   isProdInstance,
   getAppNumber,
 
   objectConverter,
   mapToJSON,
 
-  root,
-  buildPath,
-  getLowercaseExtension,
   sanitizeUrl,
   sanitizeHost,
 
@@ -308,16 +345,17 @@ export {
   pageToStartAndCount,
   peertubeTruncate,
 
-  sha256,
-  sha1,
-
   promisify0,
   promisify1,
   promisify2,
 
+  scryptPromise,
+
   randomBytesPromise,
-  createPrivateKey,
-  getPublicKey,
+
+  generateRSAKeyPairPromise,
+  generateED25519KeyPairPromise,
+
   execPromise2,
   execPromise,
   pipelinePromise,