Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Parse incoming OMEMO encrypted messages

Browse Source
This commit is contained in:
JC Brand 2018-08-04 09:17:45 +02:00
parent bb1fdd843a
commit be0eaecff9
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
spec/omemo.js
View File

@ -16,7 +16,7 @@
function (done, _converse) { function (done, _converse) {
var sent_stanza; var sent_stanza;
let iq_stanza; let iq_stanza, view;
test_utils.createContacts(_converse, 'current', 1); test_utils.createContacts(_converse, 'current', 1);
_converse.emit('rosterContactsFetched'); _converse.emit('rosterContactsFetched');
const contact_jid = mock.cur_names[0].replace(/ /g,'.').toLowerCase() + '@localhost'; const contact_jid = mock.cur_names[0].replace(/ /g,'.').toLowerCase() + '@localhost';
@ -70,7 +70,7 @@
const devicelist = _converse.devicelists.create({'jid': contact_jid}); const devicelist = _converse.devicelists.create({'jid': contact_jid});
expect(devicelist.devices.length).toBe(1); expect(devicelist.devices.length).toBe(1);
const view = _converse.chatboxviews.get(contact_jid); view = _converse.chatboxviews.get(contact_jid);
view.model.set('omemo_active', true); view.model.set('omemo_active', true);
const textarea = view.el.querySelector('.chat-textarea'); const textarea = view.el.querySelector('.chat-textarea');
@ -167,8 +167,20 @@
.c('encrypted', {'xmlns': Strophe.NS.OMEMO}) .c('encrypted', {'xmlns': Strophe.NS.OMEMO})
.c('header', {'sid': '555'}) .c('header', {'sid': '555'})
.c('key', {'rid': _converse.omemo_store.get('device_id')}).t('c1ph3R73X7').up() .c('key', {'rid': _converse.omemo_store.get('device_id')}).t('c1ph3R73X7').up()
.c('iv').t('1234'); .c('iv').t('1234')
.up().up()
.c('payload').t('M04R-c1ph3R73X7');
_converse.connection._dataRecv(test_utils.createRequest(stanza)); _converse.connection._dataRecv(test_utils.createRequest(stanza));
expect(view.model.messages.length).toBe(2);
const last_msg = view.model.messages.at(1),
encrypted = last_msg.get('encrypted');
expect(encrypted instanceof Object).toBe(true);
expect(encrypted.device_id).toBe('555');
expect(encrypted.iv).toBe('1234');
expect(encrypted.key).toBe('c1ph3R73X7');
expect(encrypted.payload).toBe('M04R-c1ph3R73X7');
done(); done();
}); });
})); }));

6
src/converse-chatboxes.js
View File

@ -480,11 +480,7 @@
if (attrs.type === 'groupchat') { if (attrs.type === 'groupchat') {
attrs.from = stanza.getAttribute('from'); attrs.from = stanza.getAttribute('from');
attrs.nick = Strophe.unescapeNode(Strophe.getResourceFromJid(attrs.from)); attrs.nick = Strophe.unescapeNode(Strophe.getResourceFromJid(attrs.from));
if (Strophe.getResourceFromJid(attrs.from) === this.get('nick')) { attrs.sender = attrs.nick === this.get('nick') ? 'me': 'them';
attrs.sender = 'me';
} else {
attrs.sender = 'them';
}
} else { } else {
attrs.from = Strophe.getBareJidFromJid(stanza.getAttribute('from')); attrs.from = Strophe.getBareJidFromJid(stanza.getAttribute('from'));
if (attrs.from === _converse.bare_jid) { if (attrs.from === _converse.bare_jid) {

10
src/converse-omemo.js
View File

@ -134,16 +134,14 @@
encrypted = sizzle(`encrypted[xmlns="${Strophe.NS.OMEMO}"]`, original_stanza).pop(); encrypted = sizzle(`encrypted[xmlns="${Strophe.NS.OMEMO}"]`, original_stanza).pop();
if (encrypted) { if (encrypted) {
const header = encrypted.firstElementChild; const header = encrypted.querySelector('header'),
if (header.nodeName != "header") { key = sizzle(`key[rid="${_converse.omemo_store.get('device_id')}"]`, encrypted).pop();
throw new Error("Error parsing encrypted OMEMO message. Wrong format");
}
const key = sizzle(`key[rid="${_converse.omemo_store.get('device_id')}"]`, encrypted).pop();
if (key) { if (key) {
attrs['encrypted'] = { attrs['encrypted'] = {
'device_id': header.getAttribute('sid'), 'device_id': header.getAttribute('sid'),
'iv': header.querySelector('iv').textContent, 'iv': header.querySelector('iv').textContent,
'key': key.textContent 'key': key.textContent,
'payload': _.get(encrypted.querySelector('payload'), 'textContent', null)
} }
if (key.getAttribute('prekey') === 'true') { if (key.getAttribute('prekey') === 'true') {
// TODO: // TODO: