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

Use the hidden hash when opening a pad from the drive

Browse Source
This commit is contained in:
yflory
2020-01-27 18:09:35 +01:00
parent 83c35543b9
commit 718610b6db
2 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,10 +68,9 @@ var factory = function (Util, Crypto, Nacl) {
if (secret.keys && secret.keys.fileKeyStr) { mode = ''; }
var hash = '/3/' + type + '/' + mode + secret.channel + '/' + pass;
var href = '/' + type + '/#' + hash;
var parsed = Hash.parsePadUrl(href);
if (parsed.hashData && parsed.hashData.getHash) {
return parsed.hashData.getHash(opts || {});
var hashData = Hash.parseTypeHash(type, hash);
if (hashData && hashData.getHash) {
return hashData.getHash(opts || {});
}
return hash;
};
@@ -380,6 +379,14 @@ Version 1
return ret;
};
Hash.hashToHref = function (hash, type) {
return '/' + type + '/#' + hash;
};
Hash.hrefToHref = function (href) {
var parsed = parsedPadUrl(href);
return parsed.hash;
};
Hash.getRelativeHref = function (href) {
if (!href) { return; }
if (href.indexOf('#') === -1) { return; }