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

remove extraneous slashes from hashes when parsing

Browse Source
This commit is contained in:
ansuz
2017-05-10 11:54:05 +02:00
parent 299a53ded7
commit 922e7803e9
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,6 +66,10 @@ define([
return '/' + parsed.type + '/#' + parsed.hash; return '/' + parsed.type + '/#' + parsed.hash;
}; };
var fixDuplicateSlashes = function (s) {
return s.replace(/\/+/g, '/');
};
/* /*
* Returns all needed keys for a realtime channel * Returns all needed keys for a realtime channel
* - no argument: use the URL hash or create one if it doesn't exist * - no argument: use the URL hash or create one if it doesn't exist
@@ -95,7 +99,7 @@ define([
} }
else { else {
// New hash // New hash
var hashArray = hash.split('/'); var hashArray = fixDuplicateSlashes(hash).split('/');
if (hashArray.length < 4) { if (hashArray.length < 4) {
Hash.alert("Unable to parse the key"); Hash.alert("Unable to parse the key");
throw new Error("Unable to parse the key"); throw new Error("Unable to parse the key");
@@ -179,7 +183,7 @@ Version 2
parsed.version = 0; parsed.version = 0;
return parsed; return parsed;
} }
var hashArr = hash.split('/'); var hashArr = fixDuplicateSlashes(hash).split('/');
if (hashArr[1] && hashArr[1] === '1') { if (hashArr[1] && hashArr[1] === '1') {
parsed.version = 1; parsed.version = 1;
parsed.mode = hashArr[2]; parsed.mode = hashArr[2];