-import * as crypto from 'crypto'
-import * as bcrypt from 'bcrypt'
-import * as fs from 'fs'
-import * as openssl from 'openssl-wrapper'
-import { join } from 'path'
-
-import {
- SIGNATURE_ALGORITHM,
- SIGNATURE_ENCODING,
- PRIVATE_CERT_NAME,
- CONFIG,
- BCRYPT_SALT_SIZE,
- PUBLIC_CERT_NAME
-} from '../initializers'
+import { BCRYPT_SALT_SIZE, PRIVATE_RSA_KEY_SIZE } from '../initializers'
+import { ActorModel } from '../models/activitypub/actor'
+import { bcryptComparePromise, bcryptGenSaltPromise, bcryptHashPromise, createPrivateKey, getPublicKey } from './core-utils'
+import { jsig } from './custom-jsonld-signature'
import { logger } from './logger'
-function checkSignature (publicKey, data, hexSignature) {
- const verify = crypto.createVerify(SIGNATURE_ALGORITHM)
-
- let dataString
- if (typeof data === 'string') {
- dataString = data
- } else {
- try {
- dataString = JSON.stringify(data)
- } catch (err) {
- logger.error('Cannot check signature.', { error: err })
- return false
- }
- }
+async function createPrivateAndPublicKeys () {
+ logger.info('Generating a RSA key...')
- verify.update(dataString, 'utf8')
+ const { key } = await createPrivateKey(PRIVATE_RSA_KEY_SIZE)
+ const { publicKey } = await getPublicKey(key)
- const isValid = verify.verify(publicKey, hexSignature, SIGNATURE_ENCODING)
- return isValid
+ return { privateKey: key, publicKey }
}
-function sign (data) {
- const sign = crypto.createSign(SIGNATURE_ALGORITHM)
-
- let dataString
- if (typeof data === 'string') {
- dataString = data
- } else {
- try {
- dataString = JSON.stringify(data)
- } catch (err) {
- logger.error('Cannot sign data.', { error: err })
- return ''
- }
+function isSignatureVerified (fromActor: ActorModel, signedDocument: object) {
+ const publicKeyObject = {
+ '@context': jsig.SECURITY_CONTEXT_URL,
+ '@id': fromActor.url,
+ '@type': 'CryptographicKey',
+ owner: fromActor.url,
+ publicKeyPem: fromActor.publicKey
}
- sign.update(dataString, 'utf8')
-
- // TODO: make async
- const certPath = join(CONFIG.STORAGE.CERT_DIR, PRIVATE_CERT_NAME)
- const myKey = fs.readFileSync(certPath)
- const signature = sign.sign(myKey.toString(), SIGNATURE_ENCODING)
-
- return signature
-}
-
-function comparePassword (plainPassword, hashPassword, callback) {
- bcrypt.compare(plainPassword, hashPassword, function (err, isPasswordMatch) {
- if (err) return callback(err)
-
- return callback(null, isPasswordMatch)
- })
-}
-
-function createCertsIfNotExist (callback) {
- certsExist(function (err, exist) {
- if (err) return callback(err)
+ const publicKeyOwnerObject = {
+ '@context': jsig.SECURITY_CONTEXT_URL,
+ '@id': fromActor.url,
+ publicKey: [ publicKeyObject ]
+ }
- if (exist === true) {
- return callback(null)
- }
+ const options = {
+ publicKey: publicKeyObject,
+ publicKeyOwner: publicKeyOwnerObject
+ }
- createCerts(function (err) {
- return callback(err)
+ return jsig.promises.verify(signedDocument, options)
+ .catch(err => {
+ logger.error('Cannot check signature.', { err })
+ return false
})
- })
}
-function cryptPassword (password, callback) {
- bcrypt.genSalt(BCRYPT_SALT_SIZE, function (err, salt) {
- if (err) return callback(err)
+function signObject (byActor: ActorModel, data: any) {
+ const options = {
+ privateKeyPem: byActor.privateKey,
+ creator: byActor.url,
+ algorithm: 'RsaSignature2017'
+ }
- bcrypt.hash(password, salt, function (err, hash) {
- return callback(err, hash)
- })
- })
+ return jsig.promises.sign(data, options)
}
-function getMyPrivateCert (callback) {
- const certPath = join(CONFIG.STORAGE.CERT_DIR, PRIVATE_CERT_NAME)
- fs.readFile(certPath, 'utf8', callback)
+function comparePassword (plainPassword: string, hashPassword: string) {
+ return bcryptComparePromise(plainPassword, hashPassword)
}
-function getMyPublicCert (callback) {
- const certPath = join(CONFIG.STORAGE.CERT_DIR, PUBLIC_CERT_NAME)
- fs.readFile(certPath, 'utf8', callback)
+async function cryptPassword (password: string) {
+ const salt = await bcryptGenSaltPromise(BCRYPT_SALT_SIZE)
+
+ return bcryptHashPromise(password, salt)
}
// ---------------------------------------------------------------------------
export {
- checkSignature,
+ isSignatureVerified,
comparePassword,
- createCertsIfNotExist,
+ createPrivateAndPublicKeys,
cryptPassword,
- getMyPrivateCert,
- getMyPublicCert,
- sign
-}
-
-// ---------------------------------------------------------------------------
-
-function certsExist (callback) {
- const certPath = join(CONFIG.STORAGE.CERT_DIR, PRIVATE_CERT_NAME)
- fs.access(certPath, function (err) {
- // If there is an error the certificates do not exist
- const exists = !err
- return callback(null, exists)
- })
-}
-
-function createCerts (callback) {
- certsExist(function (err, exist) {
- if (err) return callback(err)
-
- if (exist === true) {
- const string = 'Certs already exist.'
- logger.warning(string)
- return callback(new Error(string))
- }
-
- logger.info('Generating a RSA key...')
-
- const privateCertPath = join(CONFIG.STORAGE.CERT_DIR, PRIVATE_CERT_NAME)
- const genRsaOptions = {
- 'out': privateCertPath,
- '2048': false
- }
- openssl.exec('genrsa', genRsaOptions, function (err) {
- if (err) {
- logger.error('Cannot create private key on this pod.')
- return callback(err)
- }
-
- logger.info('RSA key generated.')
- logger.info('Managing public key...')
-
- const publicCertPath = join(CONFIG.STORAGE.CERT_DIR, 'peertube.pub')
- const rsaOptions = {
- 'in': privateCertPath,
- 'pubout': true,
- 'out': publicCertPath
- }
- openssl.exec('rsa', rsaOptions, function (err) {
- if (err) {
- logger.error('Cannot create public key on this pod.')
- return callback(err)
- }
-
- logger.info('Public key managed.')
- return callback(null)
- })
- })
- })
+ signObject
}
projects / github / Chocobozzz / PeerTube.git / blobdiff