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

Add settings to continue using unsafe links

Browse Source
This commit is contained in:
yflory
2020-01-28 11:31:03 +01:00
parent 0237bb2867
commit 6183401a6f
4 changed files with 99 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
www/common/drive-ui.js
View File

@@ -1034,7 +1034,14 @@ define([
if (!data || (!data.href && !data.roHref)) {
return void logError("Missing data for the file", el, data);
}
var href = data.href || data.roHref;
var href = isRo ? data.roHref : (data.href || data.roHref);
var priv = metadataMgr.getPrivateData();
var useUnsafe = Util.find(priv, ['settings', 'security', 'unsafeLinks']);
if (useUnsafe) {
return void window.open(APP.origin + href);
}
// Get hidden hash
var parsed = Hash.parsePadUrl(href);
var secret = Hash.getSecrets(parsed.type, parsed.hash, data.password);
if (isRo && secret.keys && secret.keys.editKeyStr) {
@@ -1043,7 +1050,6 @@ define([
}
var hash = Hash.getHiddenHashFromKeys(parsed.type, secret);
var hiddenHref = Hash.hashToHref(hash, parsed.type);
// XXX hidden hash: use settings
window.open(APP.origin + hiddenHref);
};