timoreo/olm
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix group demo to work with > 2 users

Browse source 
Add 4 by default, and make sure OT keys are not reused.
This commit is contained in:
Saúl Ibarra Corretgé 2020-06-17 13:51:49 +02:00 committed by Hubert Chathi
parent 8a958beb48
commit a0284c2ba3
2 changed files with 73 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
javascript/demo/group_demo.html
View file

@ -57,5 +57,56 @@
<div class="user_progress"></div> <div class="user_progress"></div>
</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> </body>
</html> </html>

34
javascript/demo/group_demo.js
View file

@ -167,20 +167,13 @@ DemoUser.prototype.getIdKeys = function() {
return JSON.parse(this.olmAccount.identity_keys()); 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() { DemoUser.prototype.getOneTimeKey = function() {
var self = this; var self = this;
var keys = JSON.parse(self.olmAccount.one_time_keys()) self.olmAccount.generate_one_time_keys(1);
.curve25519; var keys = JSON.parse(self.olmAccount.one_time_keys()).curve25519;
for (key_id in keys) { for (key_id in keys) {
if (keys.hasOwnProperty(key_id)) { if (keys.hasOwnProperty(key_id)) {
self.olmAccount.mark_keys_as_published();
return keys[key_id]; return keys[key_id];
} }
} }
@ -478,14 +471,31 @@ function initUserDiv(demoUser, div) {
function startDemo() { function startDemo() {
var user1 = new DemoUser(); var user1 = new DemoUser();
initUserDiv(user1, document.getElementById("user1")); initUserDiv(user1, document.getElementById("user1"));
user1.generateKeys();
var user2 = new DemoUser(); var user2 = new DemoUser();
initUserDiv(user2, document.getElementById("user2")); 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(user2.remoteOps);
user1.addPeer(user3.remoteOps);
user1.addPeer(user4.remoteOps);
user2.addPeer(user1.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);
} }