infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

include 'registrationProof' in WRITE_LOGIN_BLOCK RPC

pull/1/head
ansuz 2021-04-27 16:13:15 +05:30
parent b42adf5576
commit 2436cd2b2f
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/common/outer/store-rpc.js
View File

@ -24,7 +24,7 @@ define([
UPLOAD_COMPLETE: Store.uploadComplete, UPLOAD_COMPLETE: Store.uploadComplete,
UPLOAD_STATUS: Store.uploadStatus, UPLOAD_STATUS: Store.uploadStatus,
UPLOAD_CANCEL: Store.uploadCancel, UPLOAD_CANCEL: Store.uploadCancel,
WRITE_LOGIN_BLOCK: Store.writeLoginBlock, // XXX restricted-registration WRITE_LOGIN_BLOCK: Store.writeLoginBlock,
REMOVE_LOGIN_BLOCK: Store.removeLoginBlock, REMOVE_LOGIN_BLOCK: Store.removeLoginBlock,
PIN_PADS: Store.pinPads, PIN_PADS: Store.pinPads,
UNPIN_PADS: Store.unpinPads, UNPIN_PADS: Store.unpinPads,

8
www/common/pinpad.js
View File

@ -220,17 +220,21 @@ var factory = function (Util, Rpc) {
}); });
}; };
exp.writeLoginBlock = function (data, cb) { // XXX restricted-registration exp.writeLoginBlock = function (data, cb) {
if (!data) { return void cb('NO_DATA'); } if (!data) { return void cb('NO_DATA'); }
if (!data.publicKey || !data.signature || !data.ciphertext) { if (!data.publicKey || !data.signature || !data.ciphertext) {
console.log(data); console.log(data);
return void cb("MISSING_PARAMETERS"); return void cb("MISSING_PARAMETERS");
} }
if (['string', 'undefined'].indexOf(typeof(data.registrationProof)) !== -1) {
return void cb("INVALID_REGISTRATION_PROOF");
}
rpc.send('WRITE_LOGIN_BLOCK', [ rpc.send('WRITE_LOGIN_BLOCK', [
data.publicKey, data.publicKey,
data.signature, data.signature,
data.ciphertext data.ciphertext,
data.registrationProof || undefined,
], function (e) { ], function (e) {
cb(e); cb(e);
}); });

2
www/common/sframe-common-outer.js
View File

@ -1557,7 +1557,7 @@ define([
}); });
sframeChan.on('Q_CHANGE_USER_PASSWORD', function (data, cb) { sframeChan.on('Q_CHANGE_USER_PASSWORD', function (data, cb) {
Cryptpad.changeUserPassword(Cryptget, edPublic, data, cb); // XXX restricted-registration Cryptpad.changeUserPassword(Cryptget, edPublic, data, cb);
}); });
sframeChan.on('Q_WRITE_LOGIN_BLOCK', function (data, cb) { sframeChan.on('Q_WRITE_LOGIN_BLOCK', function (data, cb) {

1
www/settings/inner.js
View File

@ -593,7 +593,6 @@ define([
$(form).appendTo($div); $(form).appendTo($div);
var updateBlock = function(data, cb) { var updateBlock = function(data, cb) {
// XXX restricted-registration registered users should be able to change their password even if registration is closed. Include proof of ownership of their existing block when requesting the creation of a new one
sframeChan.query('Q_CHANGE_USER_PASSWORD', data, function(err, obj) { sframeChan.query('Q_CHANGE_USER_PASSWORD', data, function(err, obj) {
if (err || obj.error) { return void cb({ error: err || obj.error }); } if (err || obj.error) { return void cb({ error: err || obj.error }); }
cb(obj); cb(obj);