From a0284c2ba36ac8433ea752e93b4a0a331a3f0c0b Mon Sep 17 00:00:00 2001
From: Saúl Ibarra Corretgé <s@saghul.net>
Date: Wed, 17 Jun 2020 13:51:49 +0200
Subject: Fix group demo to work with > 2 users
Add 4 by default, and make sure OT keys are not reused.
---
javascript/demo/group_demo.html | 51 +++++++++++++++++++++++++++++++++++++++++
javascript/demo/group_demo.js | 34 +++++++++++++++++----------
2 files changed, 73 insertions(+), 12 deletions(-)
diff --git a/javascript/demo/group_demo.html b/javascript/demo/group_demo.html
index 31aacb0..d93a7cd 100644
--- a/javascript/demo/group_demo.html
+++ b/javascript/demo/group_demo.html
@@ -57,5 +57,56 @@
<div class="user_progress"></div>
</div>
+<div id="user3" class="user">
+ <h1>User 3</h1>
+
+ <textarea class="user_plain_input"></textarea>
+ <button class="user_encrypt">Encrypt</button>
+
+ <h2>Outgoing</h2>
+
+ <h3>One-to-one output</h3>
+ <div class="user_cipher_output"></div>
+
+ <h3>Group output</h3>
+ <div class="group_output"></div>
+
+ <h2>Incoming</h2>
+
+ <h3>One-to-one Received</h3>
+ <div class="user_cipher_input"></div>
+
+ <h3>Group received</h3>
+ <div class="group_input"></div>
+
+ <h2>Tasks</h2>
+ <div class="user_progress"></div>
+</div>
+
+<div id="user4" class="user">
+ <h1>User 4</h1>
+
+ <textarea class="user_plain_input"></textarea>
+ <button class="user_encrypt">Encrypt</button>
+
+ <h2>Outgoing</h2>
+
+ <h3>One-to-one output</h3>
+ <div class="user_cipher_output"></div>
+
+ <h3>Group output</h3>
+ <div class="group_output"></div>
+
+ <h2>Incoming</h2>
+
+ <h3>One-to-one Received</h3>
+ <div class="user_cipher_input"></div>
+
+ <h3>Group received</h3>
+ <div class="group_input"></div>
+
+ <h2>Tasks</h2>
+ <div class="user_progress"></div>
+</div>
</body>
</html>
diff --git a/javascript/demo/group_demo.js b/javascript/demo/group_demo.js
index 7cd9e3e..44b8166 100644
--- a/javascript/demo/group_demo.js
+++ b/javascript/demo/group_demo.js
@@ -167,20 +167,13 @@ DemoUser.prototype.getIdKeys = function() {
return JSON.parse(this.olmAccount.identity_keys());
};
-DemoUser.prototype.generateKeys = function(callback) {
- var self = this;
- this.addTask("generate one time key", function(done) {
- self.olmAccount.generate_one_time_keys(1);
- done();
- }, callback);
-};
-
DemoUser.prototype.getOneTimeKey = function() {
var self = this;
- var keys = JSON.parse(self.olmAccount.one_time_keys())
- .curve25519;
+ self.olmAccount.generate_one_time_keys(1);
+ var keys = JSON.parse(self.olmAccount.one_time_keys()).curve25519;
for (key_id in keys) {
if (keys.hasOwnProperty(key_id)) {
+ self.olmAccount.mark_keys_as_published();
return keys[key_id];
}
}
@@ -478,14 +471,31 @@ function initUserDiv(demoUser, div) {
function startDemo() {
var user1 = new DemoUser();
initUserDiv(user1, document.getElementById("user1"));
- user1.generateKeys();
var user2 = new DemoUser();
initUserDiv(user2, document.getElementById("user2"));
- user2.generateKeys();
+
+ var user3 = new DemoUser();
+ initUserDiv(user3, document.getElementById("user3"));
+
+ var user4 = new DemoUser();
+ initUserDiv(user4, document.getElementById("user4"));
user1.addPeer(user2.remoteOps);
+ user1.addPeer(user3.remoteOps);
+ user1.addPeer(user4.remoteOps);
+
user2.addPeer(user1.remoteOps);
+ user2.addPeer(user3.remoteOps);
+ user2.addPeer(user4.remoteOps);
+
+ user3.addPeer(user1.remoteOps);
+ user3.addPeer(user2.remoteOps);
+ user3.addPeer(user4.remoteOps);
+
+ user4.addPeer(user1.remoteOps);
+ user4.addPeer(user2.remoteOps);
+ user4.addPeer(user3.remoteOps);
}
--
cgit v1.2.3-70-g09d2