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

Fix issue deleting app dir during restore

Browse Source 
During restore, only the superfluous addons are teardown. Rest of
the addons are kept as-is. This is done to preserve the addon
configuration across restores (thus preserving db passwords).

We then rely on the restoreApp logic to call restore in each addon.
Each restore currently setup, clear and them imports the backup.

With the volume changes, we have moved volume create/delete to the
localstorage addon. Currently, the localstorage addon has no concept of restore
because the backup download extracts it directly into the volume.

Because of the above, during the restore code path, we don't teardown
the localstorage addon and thus files are left behind in appid/data/. This
prevents deleteAppDir() from removing the appid/ directory.

The fix is to add a new 'clear' command to addons. Before restore, we
clear the addons.
This commit is contained in:
Girish Ramakrishnan
2018-09-15 17:05:04 -07:00
parent 46a00c839b
commit 64a7b80395
3 changed files with 174 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apptask.js
+16 -14
View File
@@ -172,21 +172,23 @@ function deleteAppDir(app, options, callback) {
assert.strictEqual(typeof options, 'object');
assert.strictEqual(typeof callback, 'function');
// remove symlinked directory contents and not the symlink
const volumeDir = path.join(paths.APPS_DATA_DIR, app.id);
const isSymlinked = safe.fs.readlinkSync(volumeDir) !== volumeDir;
const appDataDir = path.join(paths.APPS_DATA_DIR, app.id);
let resolvedAppDataDir = safe.fs.readlinkSync(appDataDir) || appDataDir;
// only remove folder contents if removeDirectory is falsy and we do have a symlink
const subdir = options.removeDirectory || isSymlinked ? '' : '*';
if (!safe.fs.existsSync(resolvedAppDataDir)) return callback();
docker.removeVolume(app, app.id, subdir, function (error) {
if (error) {
debug(`deleteVolume: error removing ${volumeDir} (symlink ${isSymlinked}): ${error}`);
return callback(error);
}
const dirents = safe.fs.readdirSync(resolvedAppDataDir, { withFileTypes: true });
if (!dirents) return callback(`Error listing ${resolvedAppDataDir}: ${safe.error.message}`);
callback();
// remove only files. directories inside app dir are currently volumes managed by the addons
dirents.forEach(function (dirent) {
if (!dirent.isDirectory()) safe.fs.unlinkSync(path.join(resolvedAppDataDir, name));
});
// if this fails, it's probably because the localstorage/redis addons have not cleaned up properly
if (options.removeDirectory && !safe.fs.rmdirSync(appDataDir)) return callback(safe.error.code === 'ENOENT' ? null : safe.error);
callback(null);
}
function addCollectdProfile(app, callback) {
@@ -473,9 +475,7 @@ function install(app, callback) {
deleteMainContainer.bind(null, app),
function teardownAddons(next) {
// when restoring, app does not require these addons anymore. remove carefully to preserve the db passwords
var addonsToRemove = !isRestoring
? app.manifest.addons
: _.omit(app.oldConfig.manifest.addons, Object.keys(app.manifest.addons));
var addonsToRemove = !isRestoring ? app.manifest.addons : _.omit(app.oldConfig.manifest.addons, Object.keys(app.manifest.addons));
addons.teardownAddons(app, addonsToRemove, next);
},
@@ -511,6 +511,8 @@ function install(app, callback) {
} else {
async.series([
updateApp.bind(null, app, { installationProgress: '60, Download backup and restoring addons' }),
addons.setupAddons.bind(null, app, app.manifest.addons),
addons.clearAddons.bind(null, app, app.manifest.addons),
backups.restoreApp.bind(null, app, app.manifest.addons, restoreConfig),
], next);
}