X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcore-utils.ts;h=c762f6a29331523b203354d17b22292e26997627;hb=6d15b12a068ba5232f2d8c83e596172fd56ed18d;hp=6ebe8e2acb5a2b6dace1282a0f8598ecb2c00a24;hpb=714e33a7428b71ef98129ce85a4bd64140bcd912;p=github%2FChocobozzz%2FPeerTube.git
diff --git a/server/helpers/core-utils.ts b/server/helpers/core-utils.ts
index 6ebe8e2ac..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'
@@ -165,6 +164,14 @@ 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'
}
@@ -234,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) => {
@@ -260,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)
@@ -270,6 +320,7 @@ const pipelinePromise = promisify(pipeline)
export {
isTestInstance,
+ isTestOrDevInstance,
isProdInstance,
getAppNumber,
@@ -289,8 +340,10 @@ export {
promisify2,
randomBytesPromise,
- createPrivateKey,
- getPublicKey,
+
+ generateRSAKeyPairPromise,
+ generateED25519KeyPairPromise,
+
execPromise2,
execPromise,
pipelinePromise,