diff options
| -rw-r--r-- | package-lock.json | 10 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | public/scripts/chat.js | 4 | ||||
| -rw-r--r-- | public/scripts/encryption.js | 18 |
4 files changed, 33 insertions, 1 deletions
diff --git a/package-lock.json b/package-lock.json index 95ae99f..68bb480 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3778,6 +3778,11 @@ "locate-path": "^2.0.0" } }, + "fingerprintjs2": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fingerprintjs2/-/fingerprintjs2-2.0.6.tgz", + "integrity": "sha512-ga84FInnM1gPc39rA88SPyHVdeGOc2soRGhLJQFOxANkeD792M97maGHBK3b8zoVM5tPULS0NvSJ4DM7DXkviA==" + }, "flat-cache": { "version": "1.3.4", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz", @@ -6543,6 +6548,11 @@ "verror": "1.10.0" } }, + "jssha": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/jssha/-/jssha-2.3.1.tgz", + "integrity": "sha1-FHshJTaQNcpLL30hDcU58Amz3po=" + }, "jstransformer": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz", diff --git a/package.json b/package.json index 476219f..d2baaba 100644 --- a/package.json +++ b/package.json @@ -44,8 +44,10 @@ "drag-drop": "^4.2.0", "ejs": "^2.6.1", "express": "^4.16.4", + "fingerprintjs2": "^2.0.6", "html-minifier": "^3.5.21", "jquery": "^3.3.1", + "jssha": "^2.3.1", "minify": "^4.1.0", "moment": "^2.24.0", "morgan": "^1.9.0", diff --git a/public/scripts/chat.js b/public/scripts/chat.js index eac7246..b85a352 100644 --- a/public/scripts/chat.js +++ b/public/scripts/chat.js @@ -47,6 +47,8 @@ async function evaluateKeyGeneration() { pinInput.init(async (pin, tryCount) => { try { if (await encryption.getId(await encryption.getPublic()) !== peerId) throw "Not verified!"; + const fingerPrint = encryption.getFingerprint(pin); + console.log(fingerPrint); passphrase = new Buffer(crypto.createHmac('SHA256', pin).update(pin).digest('hex')).toString('base64'); await encryption.decryptPrivate(await encryption.getPrivate(), passphrase); chat() @@ -84,7 +86,7 @@ function chat() { $('#chat').fadeIn(); // start the peer - const peer = new Peer(peerId, {host: host, port: 4242, path: '/api', debug: 0}); + const peer = new Peer(peerId, {host: host, port: 4242, path: '/api', secure: true, debug: 0}); // Peer events peer.on('call', call => getMediaStream(stream => call.answer(stream))); // TODO: Ask for call accept diff --git a/public/scripts/encryption.js b/public/scripts/encryption.js index fc5665b..4e3eeb4 100644 --- a/public/scripts/encryption.js +++ b/public/scripts/encryption.js @@ -8,6 +8,8 @@ const Dexie = require('dexie'); const moment = require('moment'); const crypto = require('crypto'); +const jsSHA = require("jssha"); +const fingerprint = require('fingerprintjs2'); const openpgp = require('openpgp'); const swal = require('sweetalert'); @@ -248,6 +250,21 @@ async function getPeerPublicKey(peerId) { } /** + * Gets the unique fingerprint of the user + * @param passphrase + * @returns {Promise<String>} + */ +async function getUniqueFingerprint(passphrase) { + return await fingerprint.get(components => { + const passphraseHash = new Buffer(crypto.createHmac('SHA256', passphrase).update(passphrase).digest('hex')).toString('HEX'); + const userFingerprint = fingerprint.x64hash128(components.map(pair => pair.value).join(), 31); + console.log(passphraseHash + " - " + userFingerprint); + console.log(new Buffer(crypto.createHmac('SHA256', userFingerprint + passphraseHash).update(userFingerprint + passphraseHash).digest('hex')).toString('HEX')); + return new Buffer(crypto.createHmac('SHA256', userFingerprint + passphraseHash).update(userFingerprint + passphraseHash).digest('hex')).toString('HEX'); + }) +} + +/** * Returns user id of a public key * @param publicKey * @returns {Promise<String>} @@ -279,4 +296,5 @@ exports.getMsgs = getMessages; exports.store = storePeerPublicKey; exports.get = getPeerPublicKey; exports.getId = getPublicKeyUserId; +exports.getFingerprint = getUniqueFingerprint; exports.reset = reset; |