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

Fixup volume management

Browse Source 
Fixes related to removing directory and directory perms
This commit is contained in:
Girish Ramakrishnan
2019-01-18 14:48:31 -08:00
parent fcc77635c2
commit 38a4c1aede
8 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/apps.js
View File

@@ -303,7 +303,7 @@ function validateEnv(env) {
}
function validateDataDir(dataDir) {
if (!dataDir) return new AppsError(AppsError.BAD_FIELD, 'dataDir cannot be empty');
if (dataDir === '') return null; // revert back to default dataDir
if (path.resolve(dataDir) !== dataDir) return new AppsError(AppsError.BAD_FIELD, 'dataDir must be an absolute path');
@@ -773,7 +773,7 @@ function configure(appId, data, user, auditSource, callback) {
if (error) return callback(error);
}
if ('dataDir' in data) {
if ('dataDir' in data && data.dataDir !== app.dataDir) {
error = validateDataDir(data.dataDir);
if (error) return callback(error);
values.dataDir = data.dataDir;