Key exchange improvements and logging
This commit is contained in:
parent
6de0adb7bd
commit
774bbcae58
1 changed files with 13 additions and 0 deletions
|
|
@ -41,6 +41,17 @@ const isEncryptedMessage = message =>
|
||||||
*/
|
*/
|
||||||
const generateKeyPair = deviceId => {
|
const generateKeyPair = deviceId => {
|
||||||
try {
|
try {
|
||||||
|
const existingKey = nodeKeyPairs.get(deviceId)
|
||||||
|
|
||||||
|
if (existingKey) {
|
||||||
|
logger.warn('Device ID is already trusted')
|
||||||
|
return {
|
||||||
|
...existingKey,
|
||||||
|
publicKeyBase64: convertBufferToBase64(existingKey.publicKey),
|
||||||
|
privateKeyBase64: convertBufferToBase64(existingKey.privateKey)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const privateKey = ECCrypto.generatePrivate()
|
const privateKey = ECCrypto.generatePrivate()
|
||||||
const publicKey = ECCrypto.getPublic(privateKey)
|
const publicKey = ECCrypto.getPublic(privateKey)
|
||||||
const privateKeyBase64 = convertBufferToBase64(privateKey)
|
const privateKeyBase64 = convertBufferToBase64(privateKey)
|
||||||
|
|
@ -149,8 +160,10 @@ const decryptMessage = async ({ encryptedMessage, deviceId }) => {
|
||||||
convertToEncryptedMessage(encryptedMessage)
|
convertToEncryptedMessage(encryptedMessage)
|
||||||
)
|
)
|
||||||
const parsedMessage = decryptedMessage.toString('utf8')
|
const parsedMessage = decryptedMessage.toString('utf8')
|
||||||
|
|
||||||
return parsedMessage
|
return parsedMessage
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
logger.error(err)
|
||||||
if (err.message?.toLowerCase() === 'bad mac') {
|
if (err.message?.toLowerCase() === 'bad mac') {
|
||||||
logger.error(
|
logger.error(
|
||||||
'Bad Mac!',
|
'Bad Mac!',
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue