feat(e2ee) publish olm id key in presence

modules/e2ee/E2EEncryption.js

@@ -43,17 +43,20 @@ export class E2EEncryption {
         // Participant join / leave operations. Used for key advancement / rotation.
         //
 
+        this.conference.on(
+            JitsiConferenceEvents.CONFERENCE_JOINED,
+            () => {
+                this._conferenceJoined = true;
+            });
+        this.conference.on(
+            JitsiConferenceEvents.PARTICIPANT_PROPERTY_CHANGED,
+            this._onParticipantPropertyChanged.bind(this));
         this.conference.on(
             JitsiConferenceEvents.USER_JOINED,
             this._onParticipantJoined.bind(this));
         this.conference.on(
             JitsiConferenceEvents.USER_LEFT,
             this._onParticipantLeft.bind(this));
-        this.conference.on(
-            JitsiConferenceEvents.CONFERENCE_JOINED,
-            () => {
-                this._conferenceJoined = true;
-            });
 
         // Conference media events in order to attach the encryptor / decryptor.
         // FIXME add events to TraceablePeerConnection which will allow to see when there's new receiver or sender
@@ -74,6 +77,9 @@ export class E2EEncryption {
             this._trackMuteChanged.bind(this));
 
         // Olm signalling events.
+        this._olmAdapter.on(
+            OlmAdapter.events.OLM_ID_KEY_READY,
+            this._onOlmIdKeyReady.bind(this));
         this._olmAdapter.on(
             OlmAdapter.events.PARTICIPANT_E2EE_CHANNEL_READY,
             this._onParticipantE2EEChannelReady.bind(this));
@@ -170,6 +176,17 @@ export class E2EEncryption {
         }
     }
 
+    /**
+     * Publushes our own Olmn id key in presence.
+     * @private
+     */
+    _onOlmIdKeyReady(idKey) {
+        logger.debug(`Olm id key ready: ${idKey}`);
+
+        // Publish it in presence.
+        this.conference.setLocalParticipantProperty('e2ee.idKey', idKey);
+    }
+
     /**
      * Advances (using ratcheting) the current key when a new participant joins the conference.
      * @private
@@ -218,6 +235,23 @@ export class E2EEncryption {
         this._e2eeCtx.setKey(id, key, index);
     }
 
+    /**
+     * Handles an update in a participant's presence property.
+     *
+     * @param {JitsiParticipant} participant - The participant.
+     * @param {string} name - The name of the property that changed.
+     * @param {*} oldValue - The property's previous value.
+     * @param {*} newValue - The property's new value.
+     * @private
+     */
+    _onParticipantPropertyChanged(participant, name, oldValue, newValue) {
+        switch (name) {
+        case 'e2ee.idKey':
+            logger.debug(`Participant ${participant.getId()} updated their id key: ${newValue}`);
+            break;
+        }
+    }
+
     /**
      * Advances the current key by using ratcheting.
      *

modules/e2ee/OlmAdapter.js

@@ -25,6 +25,7 @@ const OLM_MESSAGE_TYPES = {
 const kOlmData = Symbol('OlmData');
 
 const OlmAdapterEvents = {
+    OLM_ID_KEY_READY: 'olm.id_key_ready',
     PARTICIPANT_E2EE_CHANNEL_READY: 'olm.participant_e2ee_channel_ready',
     PARTICIPANT_KEY_UPDATED: 'olm.partitipant_key_updated'
 };
@@ -175,6 +176,7 @@ export class OlmAdapter extends Listenable {
 
             logger.debug('Olm initialized!');
             this._init.resolve();
+            this.eventEmitter.emit(OlmAdapterEvents.OLM_ID_KEY_READY, this._idKey);
         } catch (e) {
             logger.error('Failed to initialize Olm', e);
             this._init.reject(e);