dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/staging' into staging

This commit is contained in:
David Benqué 2021-06-14 14:06:54 +01:00
parent fa526d5618 ea01c0c204
commit a577281724
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
www/form/inner.js
View File

@ -1869,7 +1869,7 @@ define([
} }
evOnChange.fire(false, true); evOnChange.fire(false, true);
window.onbeforeunload = undefined; window.onbeforeunload = undefined;
if (!update) { if (!update && content.answers.privateKey) {
// Add results button // Add results button
addResultsButton(framework, content); addResultsButton(framework, content);
} }
@ -2711,6 +2711,9 @@ define([
answers = obj; answers = obj;
// If we have a non-anon answer, we can't answer anonymously later // If we have a non-anon answer, we can't answer anonymously later
if (!obj._isAnon) { APP.cantAnon = true; } if (!obj._isAnon) { APP.cantAnon = true; }
// Add results button
if (content.answers.privateKey) { addResultsButton(framework, content); }
} }
checkIntegrity(false); checkIntegrity(false);
updateForm(framework, content, false, answers); updateForm(framework, content, false, answers);

1
www/form/main.js
View File

@ -163,6 +163,7 @@ define([
var keys = Utils.secret && Utils.secret.keys; var keys = Utils.secret && Utils.secret.keys;
var curvePrivate = privateKey || data.privateKey; var curvePrivate = privateKey || data.privateKey;
if (!curvePrivate) { return void cb({error: 'EFORBIDDEN'}); }
var crypto = Utils.Crypto.Mailbox.createEncryptor({ var crypto = Utils.Crypto.Mailbox.createEncryptor({
curvePrivate: curvePrivate, curvePrivate: curvePrivate,
curvePublic: publicKey || data.publicKey, curvePublic: publicKey || data.publicKey,