gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

futrther improvements to anonymization

Browse Source
This commit is contained in:
zadam 2020-06-07 10:20:48 +02:00
parent be7ac74235
commit e8cd821e57
3 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -78,7 +78,7 @@
"yazl": "^2.5.1" "yazl": "^2.5.1"
}, },
"devDependencies": { "devDependencies": {
"electron": "9.0.2", "electron": "9.0.3",
"electron-builder": "22.6.0", "electron-builder": "22.6.0",
"electron-packager": "14.2.1", "electron-packager": "14.2.1",
"electron-rebuild": "1.10.1", "electron-rebuild": "1.10.1",

20
src/services/attributes.js
View File

@ -115,13 +115,24 @@ function isAttributeType(type) {
} }
function isAttributeDangerous(type, name) { function isAttributeDangerous(type, name) {
return BUILTIN_ATTRIBUTES.some(attr => return BUILTIN_ATTRIBUTES.some(attr =>
attr.type === attr.type && attr.type === attr.type &&
attr.name.toLowerCase() === name.trim().toLowerCase() && attr.name.toLowerCase() === name.trim().toLowerCase() &&
attr.isDangerous attr.isDangerous
); );
} }
function getBuiltinAttributeNames() {
return BUILTIN_ATTRIBUTES
.map(attr => attr.name)
.concat([
'internalLink',
'imageLink',
'includeNoteLink',
'relationMapLink'
]);
}
module.exports = { module.exports = {
getNotesWithLabel, getNotesWithLabel,
getNotesWithLabels, getNotesWithLabels,
@ -131,5 +142,6 @@ module.exports = {
createAttribute, createAttribute,
getAttributeNames, getAttributeNames,
isAttributeType, isAttributeType,
isAttributeDangerous isAttributeDangerous,
}; getBuiltinAttributeNames
};

13
src/services/backup.js
View File

@ -7,7 +7,9 @@ const dataDir = require('./data_dir');
const log = require('./log'); const log = require('./log');
const sqlInit = require('./sql_init'); const sqlInit = require('./sql_init');
const syncMutexService = require('./sync_mutex'); const syncMutexService = require('./sync_mutex');
const attributeService = require('./attributes');
const cls = require('./cls'); const cls = require('./cls');
const utils = require('./utils');
const sqlite = require('sqlite'); const sqlite = require('sqlite');
const sqlite3 = require('sqlite3'); const sqlite3 = require('sqlite3');
@ -98,9 +100,14 @@ async function anonymize() {
await db.run("UPDATE notes SET title = 'title'"); await db.run("UPDATE notes SET title = 'title'");
await db.run("UPDATE note_contents SET content = 'text' WHERE content IS NOT NULL"); await db.run("UPDATE note_contents SET content = 'text' WHERE content IS NOT NULL");
await db.run("UPDATE note_revisions SET title = 'title'"); await db.run("UPDATE note_revisions SET title = 'title'");
await db.run("UPDATE note_revision_contents SET content = 'title' WHERE content IS NOT NULL"); await db.run("UPDATE note_revision_contents SET content = 'text' WHERE content IS NOT NULL");
await db.run("UPDATE attributes SET name = 'name', value = 'value' WHERE type = 'label'");
await db.run("UPDATE attributes SET name = 'name' WHERE type = 'relation' AND name != 'template'"); // we want to delete all non-builtin attributes because they can contain sensitive names and values
// on the other hand builtin/system attrs should not contain any sensitive info
const builtinAttrs = attributeService.getBuiltinAttributeNames().map(name => "'" + utils.sanitizeSql(name) + "'").join(', ');
await db.run(`UPDATE attributes SET name = 'name', value = 'value' WHERE type = 'label' AND name NOT IN(${builtinAttrs})`);
await db.run(`UPDATE attributes SET name = 'name' WHERE type = 'relation' AND name NOT IN (${builtinAttrs})`);
await db.run("UPDATE branches SET prefix = 'prefix' WHERE prefix IS NOT NULL"); await db.run("UPDATE branches SET prefix = 'prefix' WHERE prefix IS NOT NULL");
await db.run(`UPDATE options SET value = 'anonymized' WHERE name IN await db.run(`UPDATE options SET value = 'anonymized' WHERE name IN
('documentId', 'documentSecret', 'encryptedDataKey', 'passwordVerificationHash', ('documentId', 'documentSecret', 'encryptedDataKey', 'passwordVerificationHash',