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

Merge branch 'soon' into staging

Browse Source
This commit is contained in:
ansuz 2019-12-30 12:33:38 -05:00
commit adc29e8b42
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
www/common/common-ui-elements.js
View File

@ -1552,9 +1552,6 @@ define([
var common = config.common; var common = config.common;
var hasFriends = Object.keys(config.friends || {}).length !== 0; var hasFriends = Object.keys(config.friends || {}).length !== 0;
if (!hasFriends) {
return void UI.alert(Messages.team_noFriend);
}
var privateData = common.getMetadataMgr().getPrivateData(); var privateData = common.getMetadataMgr().getPrivateData();
var team = privateData.teams[config.teamId]; var team = privateData.teams[config.teamId];
if (!team) { return void UI.warn(Messages.error); } if (!team) { return void UI.warn(Messages.error); }

12
www/common/userObject.js
View File

@ -43,10 +43,20 @@ define([
var c = Crypto.createEncryptor(key); var c = Crypto.createEncryptor(key);
cryptor.encrypt = function (href) { cryptor.encrypt = function (href) {
// Never encrypt blob href, they are always read-only // Never encrypt blob href, they are always read-only
try {
if (href.slice(0,7) === '/file/#') { return href; } if (href.slice(0,7) === '/file/#') { return href; }
return c.encrypt(href); return c.encrypt(href);
} catch (e) {
return;
}
};
cryptor.decrypt = function (msg) {
try {
return c.decrypt(msg);
} catch (e) {
return;
}
}; };
cryptor.decrypt = c.decrypt;
} catch (e) { } catch (e) {
console.error(e); console.error(e);
} }