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

hacks to handle weird entries in drive

Browse Source
This commit is contained in:
ansuz 2018-05-18 10:28:31 +02:00
parent 2170fcb9ad
commit bd66c8fee8
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -578,7 +578,7 @@ define([
} }
var parsed = Hash.parsePadUrl(window.location.href); var parsed = Hash.parsePadUrl(window.location.href);
if (!parsed.type || !parsed.hashData) { return void cb('E_INVALID_HREF'); } if (!parsed.type || !parsed.hashData) { return void cb('E_INVALID_HREF'); }
if (parsed.type === 'file') { secret.channel = Util.base64ToHex(secret.channel); } if (parsed.type === 'file' && typeof(parsed.channel) === 'string') { secret.channel = Util.base64ToHex(secret.channel); }
hashes = Hash.getHashes(secret); hashes = Hash.getHashes(secret);
if (secret.version === 0) { if (secret.version === 0) {

4
www/common/outer/userObject.js
View File

@ -588,6 +588,7 @@ define([
if (!el.title) { el.title = Hash.getDefaultName(parsed); } if (!el.title) { el.title = Hash.getDefaultName(parsed); }
// Fix channel // Fix channel
if (!el.channel) { if (!el.channel) {
try {
if (parsed.hashData && parsed.hashData.type === "file") { if (parsed.hashData && parsed.hashData.type === "file") {
// PASSWORD_FILES // PASSWORD_FILES
el.channel = Util.base64ToHex(parsed.hashData.channel); el.channel = Util.base64ToHex(parsed.hashData.channel);
@ -596,6 +597,9 @@ define([
el.channel = secret.channel; el.channel = secret.channel;
} }
console.log('Adding missing channel in filesData ', el.channel); console.log('Adding missing channel in filesData ', el.channel);
} catch (e) {
console.error(e);
}
} }
if ((loggedIn || config.testMode) && rootFiles.indexOf(id) === -1) { if ((loggedIn || config.testMode) && rootFiles.indexOf(id) === -1) {