MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2024-12-27 15:45:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

MongoDB record encryption fix.

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2021-01-11 13:37:40 -08:00
parent 6107723304
commit e5694aeb93
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
db.js
View File

@ -40,10 +40,8 @@ module.exports.CreateDB = function (parent, func) {
obj.pluginsActive = ((parent.config) && (parent.config.settings) && (parent.config.settings.plugins != null) && (parent.config.settings.plugins != false) && ((typeof parent.config.settings.plugins != 'object') || (parent.config.settings.plugins.enabled != false))); obj.pluginsActive = ((parent.config) && (parent.config.settings) && (parent.config.settings.plugins != null) && (parent.config.settings.plugins != false) && ((typeof parent.config.settings.plugins != 'object') || (parent.config.settings.plugins.enabled != false)));
// MongoDB bulk write state // MongoDB bulk write state
/*
obj.filePendingGet = null; obj.filePendingGet = null;
obj.filePendingGets = null; obj.filePendingGets = null;
*/
obj.filePendingSet = false; obj.filePendingSet = false;
obj.filePendingSets = null; obj.filePendingSets = null;
obj.filePendingCb = null; obj.filePendingCb = null;
@ -1059,6 +1057,8 @@ module.exports.CreateDB = function (parent, func) {
if (func != null) { if (obj.filePendingCb == null) { obj.filePendingCb = [ func ]; } else { obj.filePendingCb.push(func); } } if (func != null) { if (obj.filePendingCb == null) { obj.filePendingCb = [ func ]; } else { obj.filePendingCb.push(func); } }
} }
}; };
/*
obj.Get = function (id, func) { obj.Get = function (id, func) {
if (arguments.length > 2) { if (arguments.length > 2) {
var parms = [func]; var parms = [func];
@ -1081,8 +1081,8 @@ module.exports.CreateDB = function (parent, func) {
}); });
} }
}; };
*/
/*
obj.Get = function (id, func) { // Fast Get operation using a bulk find() to reduce round trips to the database. obj.Get = function (id, func) { // Fast Get operation using a bulk find() to reduce round trips to the database.
// Encode arguments into return function if any are present. // Encode arguments into return function if any are present.
var func2 = func; var func2 = func;
@ -1109,7 +1109,6 @@ module.exports.CreateDB = function (parent, func) {
if (obj.filePendingGet[id] == null) { obj.filePendingGet[id] = [func2]; } else { obj.filePendingGet[id].push(func2); } if (obj.filePendingGet[id] == null) { obj.filePendingGet[id] = [func2]; } else { obj.filePendingGet[id].push(func2); }
} }
}; };
*/
obj.GetAll = function (func) { obj.file.find({}).toArray(function (err, docs) { func(err, performTypedRecordDecrypt(docs)); }); }; obj.GetAll = function (func) { obj.file.find({}).toArray(function (err, docs) { func(err, performTypedRecordDecrypt(docs)); }); };
obj.GetHash = function (id, func) { obj.file.find({ _id: id }).project({ _id: 0, hash: 1 }).toArray(function (err, docs) { func(err, performTypedRecordDecrypt(docs)); }); }; obj.GetHash = function (id, func) { obj.file.find({ _id: id }).project({ _id: 0, hash: 1 }).toArray(function (err, docs) { func(err, performTypedRecordDecrypt(docs)); }); };
@ -1490,7 +1489,6 @@ module.exports.CreateDB = function (parent, func) {
} }
} }
/*
// MongoDB pending bulk read operation, perform fast bulk document reads. // MongoDB pending bulk read operation, perform fast bulk document reads.
function fileBulkReadCompleted(err, docs) { function fileBulkReadCompleted(err, docs) {
// Send out callbacks with results // Send out callbacks with results
@ -1498,7 +1496,7 @@ module.exports.CreateDB = function (parent, func) {
for (var i in docs) { for (var i in docs) {
if (docs[i].links != null) { docs[i] = common.unEscapeLinksFieldName(docs[i]); } if (docs[i].links != null) { docs[i] = common.unEscapeLinksFieldName(docs[i]); }
const id = docs[i]._id; const id = docs[i]._id;
if (obj.filePendingGets[id] != null) { for (var j in obj.filePendingGets[id]) { obj.filePendingGets[id][j](err, [ docs[i] ]); } delete obj.filePendingGets[id]; } if (obj.filePendingGets[id] != null) { for (var j in obj.filePendingGets[id]) { obj.filePendingGets[id][j](err, performTypedRecordDecrypt([docs[i]])); } delete obj.filePendingGets[id]; }
} }
} }
@ -1514,7 +1512,6 @@ module.exports.CreateDB = function (parent, func) {
obj.file.find({ _id: { $in: findlist } }).toArray(fileBulkReadCompleted); obj.file.find({ _id: { $in: findlist } }).toArray(fileBulkReadCompleted);
} }
} }
*/
// MongoDB pending bulk write operation, perform fast bulk document replacement. // MongoDB pending bulk write operation, perform fast bulk document replacement.
function fileBulkWriteCompleted() { function fileBulkWriteCompleted() {