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

guard against trying to parse special fragments

Browse Source
This commit is contained in:
ansuz
2016-12-26 14:23:17 +01:00
parent 51067430f9
commit 5e1d8292c5
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
www/common/cryptpad-common.js
View File

@@ -168,21 +168,25 @@ define([
}; };
var getHashFromKeys = common.getHashFromKeys = getEditHashFromKeys; var getHashFromKeys = common.getHashFromKeys = getEditHashFromKeys;
var specialHashes = common.specialHashes = ['iframe'];
var getSecrets = common.getSecrets = function (secretHash) { var getSecrets = common.getSecrets = function (secretHash) {
var secret = {}; var secret = {};
var generate = function () {
secret.keys = Crypto.createEditCryptor();
secret.key = Crypto.createEditCryptor().editKeyStr;
};
if (/#\?path=/.test(window.location.href)) { if (/#\?path=/.test(window.location.href)) {
var arr = window.location.hash.match(/\?path=(.+)/); var arr = window.location.hash.match(/\?path=(.+)/);
common.initialPath = arr[1] || undefined; common.initialPath = arr[1] || undefined;
window.location.hash = ''; window.location.hash = '';
} }
if (!secretHash && !/#/.test(window.location.href)) { if (!secretHash && !/#/.test(window.location.href)) {
secret.keys = Crypto.createEditCryptor(); generate();
secret.key = Crypto.createEditCryptor().editKeyStr; return secret;
} else { } else {
var hash = secretHash || window.location.hash.slice(1); var hash = secretHash || window.location.hash.slice(1);
if (hash.length === 0) { if (hash.length === 0 || specialHashes.indexOf(hash) !== -1) {
secret.keys = Crypto.createEditCryptor(); generate();
secret.key = Crypto.createEditCryptor().editKeyStr;
return secret; return secret;
} }
// old hash system : #{hexChanKey}{cryptKey} // old hash system : #{hexChanKey}{cryptKey}