jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Call backuptask.js directly as root to avoid trampoline shell scripts

Browse Source
This commit is contained in:
Johannes Zellner
2017-04-17 15:10:29 +02:00
parent 9354784f01
commit ff3a748398
4 changed files with 50 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backups.js
+15 -11
View File
@@ -47,8 +47,7 @@ var addons = require('./addons.js'),
SettingsError = require('./settings.js').SettingsError,
util = require('util');
var BACKUP_BOX_CMD = path.join(__dirname, 'scripts/backupbox.sh'),
BACKUP_APP_CMD = path.join(__dirname, 'scripts/backupapp.sh');
var BACKUPTASK_CMD = path.join(__dirname, 'backuptask.js');
var NOOP_CALLBACK = function (error) { if (error) debug(error); };
@@ -182,18 +181,23 @@ function backupBoxWithAppBackupIds(appBackupIds, prefix, callback) {
settings.getBackupConfig(function (error, backupConfig) {
if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
shell.sudo('backupBox', [ BACKUP_BOX_CMD, backupId ], function (error) {
var mysqlDumpArgs = 'mysqldump -u root -ppassword --single-transaction --routines --triggers box > "' + paths.BOX_DATA_DIR + '/box.mysqldump"';
shell.exec('backupBox', '/bin/bash', mysqlDumpArgs.split(' '), function (error) {
if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
debug('backupBoxWithAppBackupIds: success');
backupdb.add({ id: backupId, version: config.version(), type: backupdb.BACKUP_TYPE_BOX, dependsOn: appBackupIds }, function (error) {
shell.sudo('backupBox', [ BACKUPTASK_CMD, backupId ], function (error) {
if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
// FIXME this is only needed for caas, is it really???
api(backupConfig.provider).backupDone(backupId, null /* app */, appBackupIds, function (error) {
if (error) return callback(error);
callback(null, backupId);
debug('backupBoxWithAppBackupIds: success');
backupdb.add({ id: backupId, version: config.version(), type: backupdb.BACKUP_TYPE_BOX, dependsOn: appBackupIds }, function (error) {
if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
// FIXME this is only needed for caas, is it really???
api(backupConfig.provider).backupDone(backupId, null /* app */, appBackupIds, function (error) {
if (error) return callback(error);
callback(null, backupId);
});
});
});
});
@@ -221,7 +225,7 @@ function createNewAppBackup(app, manifest, prefix, callback) {
// FIXME move addon backup into backuptask
async.series([
addons.backupAddons.bind(null, app, manifest.addons),
shell.sudo.bind(null, 'backupApp', [ BACKUP_APP_CMD, backupId, app.id ])
shell.sudo.bind(null, 'backupApp', [ BACKUPTASK_CMD, backupId, app.id ])
], function (error) {
if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));