X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcore-utils.ts;h=c762f6a29331523b203354d17b22292e26997627;hb=251ce26db364e1d7468b43ca917dee648a9ad133;hp=531ccfba958f05eeb503207795292d8defaf439c;hpb=c3edc5b074aa4bb1861ed0a94d3713808e87170f;p=github%2FChocobozzz%2FPeerTube.git
diff --git a/server/helpers/core-utils.ts b/server/helpers/core-utils.ts
index 531ccfba9..c762f6a29 100644
--- a/server/helpers/core-utils.ts
+++ b/server/helpers/core-utils.ts
@@ -6,9 +6,8 @@
*/
import { exec, ExecOptions } from 'child_process'
-import { randomBytes } from 'crypto'
+import { ED25519KeyPairOptions, generateKeyPair, randomBytes, RSAKeyPairOptions } from 'crypto'
import { truncate } from 'lodash'
-import { createPrivateKey as createPrivateKey_1, getPublicKey as getPublicKey_1 } from 'pem'
import { pipeline } from 'stream'
import { URL } from 'url'
import { promisify } from 'util'
@@ -56,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+)$/)
@@ -76,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$/
@@ -85,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)
}
// ---------------------------------------------------------------------------
@@ -148,12 +164,20 @@ function isTestInstance () {
return process.env.NODE_ENV === 'test'
}
+function isDevInstance () {
+ return process.env.NODE_ENV === 'dev'
+}
+
+function isTestOrDevInstance () {
+ return isTestInstance() || isDevInstance()
+}
+
function isProdInstance () {
return process.env.NODE_ENV === 'production'
}
function getAppNumber () {
- return process.env.NODE_APP_INSTANCE
+ return process.env.NODE_APP_INSTANCE || ''
}
// ---------------------------------------------------------------------------
@@ -217,6 +241,51 @@ function toEven (num: number) {
// ---------------------------------------------------------------------------
+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 (func: (cb: (err: any, result: A) => void) => void): () => Promise {
return function promisified (): Promise {
return new Promise((resolve: (arg: A) => void, reject: (err: any) => void) => {
@@ -243,8 +312,6 @@ function promisify2 (func: (arg1: T, arg2: U, cb: (err: any, result: A)
}
const randomBytesPromise = promisify1(randomBytes)
-const createPrivateKey = promisify1(createPrivateKey_1)
-const getPublicKey = promisify1(getPublicKey_1)
const execPromise2 = promisify2(exec)
const execPromise = promisify1(exec)
const pipelinePromise = promisify(pipeline)
@@ -253,6 +320,7 @@ const pipelinePromise = promisify(pipeline)
export {
isTestInstance,
+ isTestOrDevInstance,
isProdInstance,
getAppNumber,
@@ -272,8 +340,10 @@ export {
promisify2,
randomBytesPromise,
- createPrivateKey,
- getPublicKey,
+
+ generateRSAKeyPairPromise,
+ generateED25519KeyPairPromise,
+
execPromise2,
execPromise,
pipelinePromise,