web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix profile in read-only mode

Browse Source
This commit is contained in:
yflory 2017-12-12 12:06:31 +01:00
parent b06b2dbafc
commit a863011a0c
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/common/common-hash.js
View File

@ -125,7 +125,7 @@ Version 1
url += ret.type + '/'; url += ret.type + '/';
if (!ret.hashData) { return url; } if (!ret.hashData) { return url; }
if (ret.hashData.type !== 'pad') { return url + '#' + ret.hash; } if (ret.hashData.type !== 'pad') { return url + '#' + ret.hash; }
if (ret.hashData.version !== 1) { throw new Error("Only v1 hashes are managed here."); } if (ret.hashData.version !== 1) { return url + '#' + ret.hash; }
url += '#/' + ret.hashData.version + url += '#/' + ret.hashData.version +
'/' + ret.hashData.mode + '/' + ret.hashData.mode +
'/' + ret.hashData.channel.replace(/\//g, '-') + '/' + ret.hashData.channel.replace(/\//g, '-') +

3
www/common/sframe-chainpad-netflux-outer.js
View File

@ -24,6 +24,7 @@ define([], function () {
var channel = conf.channel; var channel = conf.channel;
var Crypto = conf.crypto; var Crypto = conf.crypto;
var validateKey = conf.validateKey; var validateKey = conf.validateKey;
var isNewHash = conf.isNewHash;
var readOnly = conf.readOnly || false; var readOnly = conf.readOnly || false;
var padRpc = conf.padRpc; var padRpc = conf.padRpc;
var sframeChan = conf.sframeChan; var sframeChan = conf.sframeChan;
@ -40,7 +41,7 @@ define([], function () {
// shim between chainpad and netflux // shim between chainpad and netflux
var msgIn = function (msg) { var msgIn = function (msg) {
try { try {
var decryptedMsg = Crypto.decrypt(msg, validateKey); var decryptedMsg = Crypto.decrypt(msg, isNewHash);
return decryptedMsg; return decryptedMsg;
} catch (err) { } catch (err) {
console.error(err); console.error(err);

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

@ -138,7 +138,6 @@ define([
// Check if the pad exists on server // Check if the pad exists on server
if (!window.location.hash) { isNewFile = true; return; } if (!window.location.hash) { isNewFile = true; return; }
Cryptpad.getFileSize(window.location.href, waitFor(function (err, size) { Cryptpad.getFileSize(window.location.href, waitFor(function (err, size) {
console.log(size);
if (size) { if (size) {
isNewFile = false; isNewFile = false;
return; return;
@ -146,9 +145,12 @@ define([
isNewFile = true; isNewFile = true;
})); }));
}).nThen(function () { }).nThen(function () {
console.log(isNewFile);
var readOnly = secret.keys && !secret.keys.editKeyStr; var readOnly = secret.keys && !secret.keys.editKeyStr;
if (!secret.keys) { secret.keys = secret.key; } var isNewHash = true;
if (!secret.keys) {
isNewHash = false;
secret.keys = secret.key;
}
var parsed = Utils.Hash.parsePadUrl(window.location.href); var parsed = Utils.Hash.parsePadUrl(window.location.href);
if (!parsed.type) { throw new Error(); } if (!parsed.type) { throw new Error(); }
var defaultTitle = Utils.Hash.getDefaultName(parsed); var defaultTitle = Utils.Hash.getDefaultName(parsed);
@ -581,6 +583,7 @@ define([
channel: secret.channel, channel: secret.channel,
padRpc: Cryptpad.padRpc, padRpc: Cryptpad.padRpc,
validateKey: secret.keys.validateKey || undefined, validateKey: secret.keys.validateKey || undefined,
isNewHash: isNewHash,
readOnly: readOnly, readOnly: readOnly,
crypto: Crypto.createEncryptor(secret.keys), crypto: Crypto.createEncryptor(secret.keys),
onConnect: function (wc) { onConnect: function (wc) {

1
www/profile/main.js
View File

@ -93,7 +93,6 @@ define([
getSecrets: getSecrets, getSecrets: getSecrets,
noHash: true, // Don't add the hash in the URL if it doesn't already exist noHash: true, // Don't add the hash in the URL if it doesn't already exist
addRpc: addRpc, addRpc: addRpc,
noRealtime: !localStorage.User_hash
}); });
}); });
}); });