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

Fix XXX in sframe-common-outer

Browse Source
This commit is contained in:
yflory 2020-01-29 17:40:16 +01:00
parent 745bcd7363
commit 9961bffd48
2 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -193,7 +193,8 @@ Version 1
return { return {
embed: parsed.embed, embed: parsed.embed,
present: parsed.present, present: parsed.present,
ownerKey: parsed.ownerKey ownerKey: parsed.ownerKey,
password: parsed.password
}; };
}; };
if (hash.slice(0,1) !== '/' && hash.length >= 56) { // Version 0 if (hash.slice(0,1) !== '/' && hash.length >= 56) { // Version 0
@ -209,7 +210,7 @@ Version 1
var hash = hashArr.slice(0, 5).join('/') + '/'; var hash = hashArr.slice(0, 5).join('/') + '/';
var owner = typeof(opts.ownerKey) !== "undefined" ? opts.ownerKey : parsed.ownerKey; var owner = typeof(opts.ownerKey) !== "undefined" ? opts.ownerKey : parsed.ownerKey;
if (owner) { hash += owner + '/'; } if (owner) { hash += owner + '/'; }
if (parsed.password) { hash += 'p/'; } if (parsed.password || opts.password) { hash += 'p/'; }
if (opts.embed) { hash += 'embed/'; } if (opts.embed) { hash += 'embed/'; }
if (opts.present) { hash += 'present/'; } if (opts.present) { hash += 'present/'; }
return hash; return hash;
@ -258,7 +259,8 @@ Version 1
return { return {
embed: parsed.embed, embed: parsed.embed,
present: parsed.present, present: parsed.present,
ownerKey: parsed.ownerKey ownerKey: parsed.ownerKey,
password: parsed.password
}; };
}; };
@ -266,7 +268,7 @@ Version 1
var hash = hashArr.slice(0, 4).join('/') + '/'; var hash = hashArr.slice(0, 4).join('/') + '/';
var owner = typeof(opts.ownerKey) !== "undefined" ? opts.ownerKey : parsed.ownerKey; var owner = typeof(opts.ownerKey) !== "undefined" ? opts.ownerKey : parsed.ownerKey;
if (owner) { hash += owner + '/'; } if (owner) { hash += owner + '/'; }
if (parsed.password) { hash += 'p/'; } if (parsed.password || opts.password) { hash += 'p/'; }
if (opts.embed) { hash += 'embed/'; } if (opts.embed) { hash += 'embed/'; }
if (opts.present) { hash += 'present/'; } if (opts.present) { hash += 'present/'; }
return hash; return hash;

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

@ -188,15 +188,24 @@ define([
secret = Utils.secret = Utils.Hash.getSecrets(parsed.type, parsed.hash, password); secret = Utils.secret = Utils.Hash.getSecrets(parsed.type, parsed.hash, password);
Cryptpad.getShareHashes(secret, waitFor(function (err, h) { Cryptpad.getShareHashes(secret, waitFor(function (err, h) {
hashes = h; hashes = h;
/* XXX this won't happen again: we don't need to update the rendered hash // Update the rendered hash and the full hash with the "password" settings
if (password && !parsed.hashData.password) { if (password && !parsed.hashData.password) {
var opts = parsed.getOptions();
opts.password = true;
// Full hash
currentPad.href = parsed.getUrl(opts);
if (parsed.hashData) {
currentPad.hash = parsed.hashData.getHash(opts);
}
// Rendered (maybe hidden) hash
var renderedParsed = Utils.Hash.parsePadUrl(window.location.href);
var ohc = window.onhashchange; var ohc = window.onhashchange;
window.onhashchange = function () {}; window.onhashchange = function () {};
window.location.hash = h.fileHash || h.editHash || h.viewHash || window.location.hash; window.location.href = renderedParsed.getUrl(opts);
window.onhashchange = ohc; window.onhashchange = ohc;
ohc({reset: true}); ohc({reset: true});
} }
*/
})); }));
}; };
@ -276,13 +285,6 @@ define([
var noPadData = function (err) { var noPadData = function (err) {
sframeChan.event("EV_PAD_NODATA", err); sframeChan.event("EV_PAD_NODATA", err);
}; };
// Hidden hash: can't find requestd edit URL in our drives: ask
var badPadData = function (cb) {
// If we requested edit but we only know view: ???
setTimeout(function () {
cb(true);
}); // XXX ask in inner?
};
var newHref; var newHref;
nThen(function (w) { nThen(function (w) {
@ -305,13 +307,7 @@ define([
} }
// Data found but weaker? warn // Data found but weaker? warn
if (edit && !res.href) { if (edit && !res.href) {
return void badPadData(w(function (load) {
if (!load) {
w.abort();
return;
}
newHref = res.roHref; newHref = res.roHref;
}));
} }
// We have good data, keep the hash in memory // We have good data, keep the hash in memory
newHref = edit ? res.href : (res.roHref || res.href); newHref = edit ? res.href : (res.roHref || res.href);
@ -1337,7 +1333,6 @@ define([
rtStarted = true; rtStarted = true;
var replaceHash = function (hash) { var replaceHash = function (hash) {
// XXX Always put the full hash here.
// The pad has just been created but is not stored yet. We'll switch // The pad has just been created but is not stored yet. We'll switch
// to hidden hash once the pad is stored // to hidden hash once the pad is stored
if (window.history && window.history.replaceState) { if (window.history && window.history.replaceState) {