${obj_url.message}
`; - } - - const file_url = uri.toString(); - if (isImageURL(file_url)) { - return tpl_image({ - 'src': obj_url, - 'onClick': richtext.onImgClick, - 'onLoad': richtext.onImgLoad - }); - } else if (isAudioURL(file_url)) { - return tpl_audio(obj_url); - } else if (isVideoURL(file_url)) { - return tpl_video(obj_url); - } else { - return tpl_file(obj_url, uri.filename()); - } - +export const omemo = { + decryptMessage, + encryptMessage, + formatFingerprint } -function addEncryptedFiles(text, offset, richtext) { +export function processEncryptedFiles (text) { const objs = []; try { const parse_options = { 'start': /\b(aesgcm:\/\/)/gi }; URI.withinString( text, (url, start, end) => { - objs.push({ url, start, end }); + const uri = getURI(text.slice(o.start, o.end)); + objs.push({ + uri, + start, + end, + obj_url: getAndDecryptFile(uri); // this is a promise + }); return url; }, parse_options @@ -235,21 +218,8 @@ function addEncryptedFiles(text, offset, richtext) { log.debug(error); return; } - objs.forEach(o => { - const uri = getURI(text.slice(o.start, o.end)); - const promise = getAndDecryptFile(uri) - .then(obj_url => getTemplateForObjectURL(uri, obj_url, richtext)); - - const template = html`${until(promise, '')}`; - richtext.addTemplateResult(o.start + offset, o.end + offset, template); - }); -} -export function handleEncryptedFiles (richtext) { - if (!_converse.config.get('trusted')) { - return; - } - richtext.addAnnotations((text, offset) => addEncryptedFiles(text, offset, richtext)); + return objs; } /** @@ -306,24 +276,17 @@ export function onChatBoxesInitialized () { }); } -export function onChatInitialized (el) { - el.listenTo(el.model.messages, 'add', message => { +export function onChatBoxInitialized(model) { + model.listenTo(model.messages, 'add', message => { if (message.get('is_encrypted') && !message.get('is_error')) { - el.model.save('omemo_supported', true); + model.save('omemo_supported', true); } }); - el.listenTo(el.model, 'change:omemo_supported', () => { - if (!el.model.get('omemo_supported') && el.model.get('omemo_active')) { - el.model.set('omemo_active', false); - } else { - // Manually trigger an update, setting omemo_active to - // false above will automatically trigger one. - el.querySelector('converse-chat-toolbar')?.requestUpdate(); + model.listenTo(model, 'change:omemo_supported', () => { + if (!model.get('omemo_supported') && model.get('omemo_active')) { + model.set('omemo_active', false); } }); - el.listenTo(el.model, 'change:omemo_active', () => { - el.querySelector('converse-chat-toolbar').requestUpdate(); - }); } export function getSessionCipher (jid, id) { @@ -331,6 +294,7 @@ export function getSessionCipher (jid, id) { return new window.libsignal.SessionCipher(_converse.omemo_store, address); } + function getJIDForDecryption (attrs) { const from_jid = attrs.from_muc ? attrs.from_real_jid : attrs.from; if (!from_jid) { @@ -459,6 +423,7 @@ export function addKeysToMessageStanza (stanza, dicts, iv) { return Promise.resolve(stanza); } + /** * Given an XML element representing a user's OMEMO bundle, parse it * and return a map. @@ -676,6 +641,7 @@ export async function initOMEMO (reconnecting) { api.trigger('OMEMOInitialized'); } + async function onOccupantAdded (chatroom, occupant) { if (occupant.isSelf() || !chatroom.features.get('nonanonymous') || !chatroom.features.get('membersonly')) { return; @@ -710,73 +676,6 @@ async function checkOMEMOSupported (chatbox) { } } -function toggleOMEMO (ev) { - ev.stopPropagation(); - ev.preventDefault(); - const toolbar_el = u.ancestor(ev.target, 'converse-chat-toolbar'); - if (!toolbar_el.model.get('omemo_supported')) { - let messages; - if (toolbar_el.model.get('type') === _converse.CHATROOMS_TYPE) { - messages = [ - __( - 'Cannot use end-to-end encryption in this groupchat, ' + - 'either the groupchat has some anonymity or not all participants support OMEMO.' - ) - ]; - } else { - messages = [ - __( - "Cannot use end-to-end encryption because %1$s uses a client that doesn't support OMEMO.", - toolbar_el.model.contact.getDisplayName() - ) - ]; - } - return api.alert('error', __('Error'), messages); - } - toolbar_el.model.save({ 'omemo_active': !toolbar_el.model.get('omemo_active') }); -} - -export function getOMEMOToolbarButton (toolbar_el, buttons) { - const model = toolbar_el.model; - const is_muc = model.get('type') === _converse.CHATROOMS_TYPE; - let title; - if (model.get('omemo_supported')) { - const i18n_plaintext = __('Messages are being sent in plaintext'); - const i18n_encrypted = __('Messages are sent encrypted'); - title = model.get('omemo_active') ? i18n_encrypted : i18n_plaintext; - } else if (is_muc) { - title = __( - 'This groupchat needs to be members-only and non-anonymous in ' + - 'order to support OMEMO encrypted messages' - ); - } else { - title = __('OMEMO encryption is not supported'); - } - - let color; - if (model.get('omemo_supported')) { - if (model.get('omemo_active')) { - color = is_muc ? `var(--muc-color)` : `var(--chat-toolbar-btn-color)`; - } else { - color = `var(--error-color)`; - } - } else { - color = `var(--muc-toolbar-btn-disabled-color)`; - } - buttons.push(html` - - `); - return buttons; -} - - async function getBundlesAndBuildSessions (chatbox) { const no_devices_err = __('Sorry, no devices found to which we can send an OMEMO encrypted message.'); let devices; @@ -858,9 +757,3 @@ export async function createOMEMOMessageStanza (chat, data) { stanza.c('encryption', { 'xmlns': Strophe.NS.EME, namespace: Strophe.NS.OMEMO }); return { message, stanza }; } - -export const omemo = { - decryptMessage, - encryptMessage, - formatFingerprint -} diff --git a/src/plugins/omemo/errors.js b/src/plugins/omemo-views/errors.js similarity index 100% rename from src/plugins/omemo/errors.js rename to src/plugins/omemo-views/errors.js diff --git a/src/plugins/omemo/fingerprints.js b/src/plugins/omemo-views/fingerprints.js similarity index 100% rename from src/plugins/omemo/fingerprints.js rename to src/plugins/omemo-views/fingerprints.js diff --git a/src/plugins/omemo-views/index.js b/src/plugins/omemo-views/index.js new file mode 100644 index 0000000000..c3dadc403f --- /dev/null +++ b/src/plugins/omemo-views/index.js @@ -0,0 +1,44 @@ +/** + * @copyright The Converse.js contributors + * @license Mozilla Public License (MPLv2) + */ +import './fingerprints.js'; +import './profile.js'; +import 'shared/modals/user-details.js'; +import log from '@converse/headless/log'; +import { _converse, api, converse } from '@converse/headless/core'; +import { + getOMEMOToolbarButton, + onChatInitialized, +} from './utils.js'; + +converse.plugins.add('converse-omemo-views', { + 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-views') + ); + }, + + dependencies: ['converse-chatview', 'converse-pubsub', 'converse-profile', 'converse-omemo'], + + initialize () { + api.listen.on('chatBoxViewInitialized', onChatInitialized); + api.listen.on('chatRoomViewInitialized', onChatInitialized); + + api.listen.on('getToolbarButtons', getOMEMOToolbarButton); + + 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('afterMessageBodyTransformed', handleEncryptedFiles); + } +}); diff --git a/src/plugins/omemo/profile.js b/src/plugins/omemo-views/profile.js similarity index 100% rename from src/plugins/omemo/profile.js rename to src/plugins/omemo-views/profile.js diff --git a/src/plugins/omemo/templates/fingerprints.js b/src/plugins/omemo-views/templates/fingerprints.js similarity index 96% rename from src/plugins/omemo/templates/fingerprints.js rename to src/plugins/omemo-views/templates/fingerprints.js index c30493dda4..3563ebdf6b 100644 --- a/src/plugins/omemo/templates/fingerprints.js +++ b/src/plugins/omemo-views/templates/fingerprints.js @@ -1,6 +1,6 @@ import { __ } from 'i18n'; import { html } from 'lit'; -import { formatFingerprint } from '../utils.js'; +import { formatFingerprint } from '@converse/headless/plugins/omemo/utils.js'; const device_fingerprint = (el, device) => { const i18n_trusted = __('Trusted'); diff --git a/src/plugins/omemo/templates/profile.js b/src/plugins/omemo-views/templates/profile.js similarity index 97% rename from src/plugins/omemo/templates/profile.js rename to src/plugins/omemo-views/templates/profile.js index 42278c13b1..e75d7a80f4 100644 --- a/src/plugins/omemo/templates/profile.js +++ b/src/plugins/omemo-views/templates/profile.js @@ -1,5 +1,5 @@ import spinner from "templates/spinner.js"; -import { formatFingerprint } from 'plugins/omemo/utils.js'; +import { formatFingerprint } from '@converse/headless/plugins/omemo/utils.js'; import { html } from "lit"; import { __ } from 'i18n'; diff --git a/src/plugins/omemo/tests/corrections.js b/src/plugins/omemo-views/tests/corrections.js similarity index 100% rename from src/plugins/omemo/tests/corrections.js rename to src/plugins/omemo-views/tests/corrections.js diff --git a/src/plugins/omemo/tests/media-sharing.js b/src/plugins/omemo-views/tests/media-sharing.js similarity index 100% rename from src/plugins/omemo/tests/media-sharing.js rename to src/plugins/omemo-views/tests/media-sharing.js diff --git a/src/plugins/omemo/tests/muc.js b/src/plugins/omemo-views/tests/muc.js similarity index 100% rename from src/plugins/omemo/tests/muc.js rename to src/plugins/omemo-views/tests/muc.js diff --git a/src/plugins/omemo/tests/omemo.js b/src/plugins/omemo-views/tests/omemo.js similarity index 100% rename from src/plugins/omemo/tests/omemo.js rename to src/plugins/omemo-views/tests/omemo.js diff --git a/src/plugins/omemo-views/utils.js b/src/plugins/omemo-views/utils.js new file mode 100644 index 0000000000..194b05bff8 --- /dev/null +++ b/src/plugins/omemo-views/utils.js @@ -0,0 +1,137 @@ +/* global libsignal */ +import log from '@converse/headless/log'; +import tpl_audio from 'templates/audio.js'; +import tpl_file from 'templates/file.js'; +import tpl_image from 'templates/image.js'; +import tpl_video from 'templates/video.js'; +import { __ } from 'i18n'; +import { _converse, converse, api } from '@converse/headless/core'; +import { html } from 'lit'; +import { isError } from '@converse/headless/utils/core.js'; +import { isAudioURL, isImageURL, isVideoURL, getURI } from '@converse/headless/utils/url.js'; +import { processEncryptedFiles } from '@converse/headless/plugins/omemo/utils.js' +import { until } from 'lit/directives/until.js'; + +const { u } = converse.env; + +function getTemplateForObjectURL (uri, obj_url, richtext) { + if (isError(obj_url)) { + return html`${obj_url.message}
`; + } + + const file_url = uri.toString(); + if (isImageURL(file_url)) { + return tpl_image({ + 'src': obj_url, + 'onClick': richtext.onImgClick, + 'onLoad': richtext.onImgLoad + }); + } else if (isAudioURL(file_url)) { + return tpl_audio(obj_url); + } else if (isVideoURL(file_url)) { + return tpl_video(obj_url); + } else { + return tpl_file(obj_url, uri.filename()); + } + +} + +function addEncryptedFiles(text, offset, richtext) { + const objs = processEncryptedFiles(text); + + objs.forEach(o => { + o.obj_url.then(obj_url => getTemplateForObjectURL(o.uri, obj_url, richtext)); + + const template = html`${until(o.obj_url, '')}`; + richtext.addTemplateResult(o.start + offset, o.end + offset, template); + }); +} + +export function handleEncryptedFiles (richtext) { + if (!_converse.config.get('trusted')) { + return; + } + richtext.addAnnotations((text, offset) => addEncryptedFiles(text, offset, richtext)); +} + +export function onChatInitialized (el) { + el.listenTo(el.model, 'change:omemo_supported', () => { + if (el.model.get('omemo_supported') || !el.model.get('omemo_active')) { + // Do nothing; the model will be updated by + // onChatBoxInitialized in the headless plugin + } else { + // Manually trigger an update, setting omemo_active to + // false above will automatically trigger one. + el.querySelector('converse-chat-toolbar')?.requestUpdate(); + } + }); + el.listenTo(el.model, 'change:omemo_active', () => { + el.querySelector('converse-chat-toolbar').requestUpdate(); + }); +} + +function toggleOMEMO (ev) { + ev.stopPropagation(); + ev.preventDefault(); + const toolbar_el = u.ancestor(ev.target, 'converse-chat-toolbar'); + if (!toolbar_el.model.get('omemo_supported')) { + let messages; + if (toolbar_el.model.get('type') === _converse.CHATROOMS_TYPE) { + messages = [ + __( + 'Cannot use end-to-end encryption in this groupchat, ' + + 'either the groupchat has some anonymity or not all participants support OMEMO.' + ) + ]; + } else { + messages = [ + __( + "Cannot use end-to-end encryption because %1$s uses a client that doesn't support OMEMO.", + toolbar_el.model.contact.getDisplayName() + ) + ]; + } + return api.alert('error', __('Error'), messages); + } + toolbar_el.model.save({ 'omemo_active': !toolbar_el.model.get('omemo_active') }); +} + +export function getOMEMOToolbarButton (toolbar_el, buttons) { + const model = toolbar_el.model; + const is_muc = model.get('type') === _converse.CHATROOMS_TYPE; + let title; + if (model.get('omemo_supported')) { + const i18n_plaintext = __('Messages are being sent in plaintext'); + const i18n_encrypted = __('Messages are sent encrypted'); + title = model.get('omemo_active') ? i18n_encrypted : i18n_plaintext; + } else if (is_muc) { + title = __( + 'This groupchat needs to be members-only and non-anonymous in ' + + 'order to support OMEMO encrypted messages' + ); + } else { + title = __('OMEMO encryption is not supported'); + } + + let color; + if (model.get('omemo_supported')) { + if (model.get('omemo_active')) { + color = is_muc ? `var(--muc-color)` : `var(--chat-toolbar-btn-color)`; + } else { + color = `var(--error-color)`; + } + } else { + color = `var(--muc-toolbar-btn-disabled-color)`; + } + buttons.push(html` + + `); + return buttons; +} diff --git a/src/plugins/profile/templates/profile_modal.js b/src/plugins/profile/templates/profile_modal.js index da9f2a8234..ed10498919 100644 --- a/src/plugins/profile/templates/profile_modal.js +++ b/src/plugins/profile/templates/profile_modal.js @@ -51,7 +51,7 @@ export default (el) => { ` ); - if (_converse.pluggable.plugins['converse-omemo']?.enabled(_converse)) { + if (_converse.pluggable.plugins['converse-omemo-views']?.enabled(_converse)) { navigation_tabs.push( html`