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

Fixed EXDEV error on rename.

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2020-01-31 14:44:11 -08:00
parent b2e3ee056e
commit c137eda4ac
3 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common.js
View File

@ -259,3 +259,13 @@ module.exports.translationsToJson = function(t) {
arr2.sort(function (a, b) { if (a.en > b.en) return 1; if (a.en < b.en) return -1; return 0; }); arr2.sort(function (a, b) { if (a.en > b.en) return 1; if (a.en < b.en) return -1; return 0; });
return JSON.stringify({ strings: arr2 }, null, ' '); return JSON.stringify({ strings: arr2 }, null, ' ');
} }
module.exports.copyFile = function(source, target, cb) {
var cbCalled = false, rd = fs.createReadStream(source);
rd.on('error', function (err) { done(err); });
var wr = fs.createWriteStream(target);
wr.on('error', function (err) { done(err); });
wr.on('close', function (ex) { done(); });
rd.pipe(wr);
function done(err) { if (!cbCalled) { cb(err); cbCalled = true; } }
}

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "meshcentral", "name": "meshcentral",
"version": "0.4.8-g", "version": "0.4.8-h",
"keywords": [ "keywords": [
"Remote Management", "Remote Management",
"Intel AMT", "Intel AMT",

16
webserver.js
View File

@ -1677,7 +1677,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
} }
// Return true if it looks like we are using a real TLS certificate. // Return true if it looks like we are using a real TLS certificate.
obj.isTrustedCert = function(domain) { obj.isTrustedCert = function (domain) {
if (obj.args.notls == true) return false; // We are not using TLS, so not trusted cert. if (obj.args.notls == true) return false; // We are not using TLS, so not trusted cert.
if ((domain != null) && (typeof domain.trustedcert == 'boolean')) return domain.trustedcert; // If the status of the cert specified, use that. if ((domain != null) && (typeof domain.trustedcert == 'boolean')) return domain.trustedcert; // If the status of the cert specified, use that.
if (typeof obj.args.trustedcert == 'boolean') return obj.args.trustedcert; // If the status of the cert specified, use that. if (typeof obj.args.trustedcert == 'boolean') return obj.args.trustedcert; // If the status of the cert specified, use that.
@ -2261,9 +2261,19 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
try { obj.fs.mkdirSync(obj.parent.path.join(obj.parent.filespath, domainx)); } catch (e) { } try { obj.fs.mkdirSync(obj.parent.path.join(obj.parent.filespath, domainx)); } catch (e) { }
try { obj.fs.mkdirSync(xfile.fullpath); } catch (e) { } try { obj.fs.mkdirSync(xfile.fullpath); } catch (e) { }
obj.fs.rename(file.path, fpath, function () { // Rename the file
obj.fs.rename(file.path, fpath, function (err) {
if (err && (err.code === 'EXDEV') && fs.copyFile) {
// On some Linux, the rename will fail with a "EXDEV" error, do a copy+unlink instead.
obj.common.copyFile(file.path, fpath, function (err) {
obj.fs.unlink(file.path, function (err) {
obj.parent.DispatchEvent([user._id], obj, 'updatefiles'); // Fire an event causing this user to update this files obj.parent.DispatchEvent([user._id], obj, 'updatefiles'); // Fire an event causing this user to update this files
}); });
});
} else {
obj.parent.DispatchEvent([user._id], obj, 'updatefiles'); // Fire an event causing this user to update this files
}
});
} else { } else {
try { obj.fs.unlink(file.path, function (err) { }); } catch (e) { } try { obj.fs.unlink(file.path, function (err) { }); } catch (e) { }
} }
@ -3621,7 +3631,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
obj.app.use(function (req, res, next) { obj.app.use(function (req, res, next) {
parent.debug('web', '404 Error ' + req.url); parent.debug('web', '404 Error ' + req.url);
var domain = getDomain(req); var domain = getDomain(req);
res.status(404).render(getRenderPage('error404', req), getRenderArgs({ }, domain)); res.status(404).render(getRenderPage('error404', req), getRenderArgs({}, domain));
}); });
} }