0f648ed1eb
Promises only get recreated upon logout, not reconnection. However OMEMO was getting re-initialized on reconnection and `_converse.omemo_store` was also deleted. This caused a race condition where an incoming MAM message would cause `parseEncryptedMessage` that then throws an AttributeError because `_converse.omemo_store` is undefined because OMEMO isn't yet initialized. Waiting for the `OMEMOInitialized` promise doesn't help because it's still the old (already resolved) promise from before the reconnection.
111 lines
3.9 KiB
JavaScript
111 lines
3.9 KiB
JavaScript
/**
|
|
* @copyright The Converse.js contributors
|
|
* @license Mozilla Public License (MPLv2)
|
|
*/
|
|
import './fingerprints.js';
|
|
import './profile.js';
|
|
import 'modals/user-details.js';
|
|
import 'plugins/profile/index.js';
|
|
import ChatBox from './overrides/chatbox.js';
|
|
import ConverseMixins from './mixins/converse.js';
|
|
import Device from './device.js';
|
|
import DeviceList from './devicelist.js';
|
|
import DeviceLists from './devicelists.js';
|
|
import Devices from './devices.js';
|
|
import OMEMOStore from './store.js';
|
|
import log from '@converse/headless/log';
|
|
import omemo_api from './api.js';
|
|
import { OMEMOEnabledChatBox } from './mixins/chatbox.js';
|
|
import { _converse, api, converse } from '@converse/headless/core';
|
|
import {
|
|
encryptFile,
|
|
getOMEMOToolbarButton,
|
|
handleEncryptedFiles,
|
|
initOMEMO,
|
|
omemo,
|
|
onChatBoxesInitialized,
|
|
onChatInitialized,
|
|
parseEncryptedMessage,
|
|
setEncryptedFileURL,
|
|
registerPEPPushHandler,
|
|
} from './utils.js';
|
|
|
|
const { Strophe } = converse.env;
|
|
|
|
converse.env.omemo = omemo;
|
|
|
|
Strophe.addNamespace('OMEMO_DEVICELIST', Strophe.NS.OMEMO + '.devicelist');
|
|
Strophe.addNamespace('OMEMO_VERIFICATION', Strophe.NS.OMEMO + '.verification');
|
|
Strophe.addNamespace('OMEMO_WHITELISTED', Strophe.NS.OMEMO + '.whitelisted');
|
|
Strophe.addNamespace('OMEMO_BUNDLES', Strophe.NS.OMEMO + '.bundles');
|
|
|
|
|
|
converse.plugins.add('converse-omemo', {
|
|
enabled (_converse) {
|
|
return (
|
|
window.libsignal &&
|
|
_converse.config.get('trusted') &&
|
|
!api.settings.get('clear_cache_on_logout') &&
|
|
!_converse.api.settings.get('blacklisted_plugins').includes('converse-omemo')
|
|
);
|
|
},
|
|
|
|
dependencies: ['converse-chatview', 'converse-pubsub'],
|
|
|
|
overrides: { ChatBox },
|
|
|
|
initialize () {
|
|
api.settings.extend({ 'omemo_default': false });
|
|
api.promises.add(['OMEMOInitialized']);
|
|
|
|
_converse.NUM_PREKEYS = 100; // Set here so that tests can override
|
|
|
|
Object.assign(_converse.ChatBox.prototype, OMEMOEnabledChatBox);
|
|
Object.assign(_converse, ConverseMixins);
|
|
Object.assign(_converse.api, omemo_api);
|
|
|
|
_converse.OMEMOStore = OMEMOStore;
|
|
_converse.Device = Device;
|
|
_converse.Devices = Devices;
|
|
_converse.DeviceList = DeviceList;
|
|
_converse.DeviceLists = DeviceLists;
|
|
|
|
/******************** Event Handlers ********************/
|
|
api.waitUntil('chatBoxesInitialized').then(onChatBoxesInitialized);
|
|
|
|
api.listen.on('afterFileUploaded', (msg, attrs) => msg.file.xep454_ivkey ? setEncryptedFileURL(msg, attrs) : attrs);
|
|
api.listen.on('beforeFileUpload', (chat, file) => chat.get('omemo_active') ? encryptFile(file) : file);
|
|
|
|
api.listen.on('parseMessage', parseEncryptedMessage);
|
|
api.listen.on('parseMUCMessage', parseEncryptedMessage);
|
|
|
|
api.listen.on('chatBoxViewInitialized', onChatInitialized);
|
|
api.listen.on('chatRoomViewInitialized', onChatInitialized);
|
|
|
|
api.listen.on('connected', registerPEPPushHandler);
|
|
api.listen.on('getToolbarButtons', getOMEMOToolbarButton);
|
|
|
|
api.listen.on('statusInitialized', initOMEMO);
|
|
api.listen.on('addClientFeatures', () => api.disco.own.features.add(`${Strophe.NS.OMEMO_DEVICELIST}+notify`));
|
|
|
|
api.listen.on('afterMessageBodyTransformed', handleEncryptedFiles);
|
|
|
|
api.listen.on('userDetailsModalInitialized', contact => {
|
|
const jid = contact.get('jid');
|
|
_converse.generateFingerprints(jid).catch(e => log.error(e));
|
|
});
|
|
|
|
api.listen.on('profileModalInitialized', () => {
|
|
_converse.generateFingerprints(_converse.bare_jid).catch(e => log.error(e));
|
|
});
|
|
|
|
api.listen.on('clearSession', () => {
|
|
delete _converse.omemo_store
|
|
if (_converse.shouldClearCache() && _converse.devicelists) {
|
|
_converse.devicelists.clearStore();
|
|
delete _converse.devicelists;
|
|
}
|
|
});
|
|
}
|
|
});
|