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

Fix permissions for the filesystem backend

Browse Source 
node will always apply the umask, so we have to set and then restore it
properly
This commit is contained in:
Johannes Zellner
2017-04-17 16:18:18 +02:00
parent a21750a4c9
commit 9c45dec8b0
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/storage/filesystem.js
View File

@@ -40,8 +40,9 @@ var FALLBACK_BACKUP_FOLDER = '/var/backups';
function copyFile(source, destination, callback) {
callback = once(callback);
// not run as root, permissions are fine
var readStream = fs.createReadStream(source);
var writeStream = fs.createWriteStream(destination, { mode: 0o777 });
var writeStream = fs.createWriteStream(destination);
readStream.on('error', callback);
writeStream.on('error', callback);
@@ -58,6 +59,14 @@ function backup(apiConfig, backupId, sourceDirectories, callback) {
callback = once(callback);
// to allow setting 777 for real
var oldUmask = process.umask(0);
var oldCallback = callback;
callback = function (error) {
process.umask(oldUmask);
oldCallback(error);
};
var backupFilePath = path.join(apiConfig.backupFolder || FALLBACK_BACKUP_FOLDER, backupId + '.tar.gz');
debug('[%s] backup: %j -> %s', backupId, sourceDirectories, backupFilePath);
@@ -232,14 +241,22 @@ function saveAppRestoreConfig(apiConfig, backupId, restoreConfig, callback) {
assert.strictEqual(typeof restoreConfig, 'object');
assert.strictEqual(typeof callback, 'function');
// to allow setting 777 for real
var oldUmask = process.umask(0);
var oldCallback = callback;
callback = function (error) {
process.umask(oldUmask);
oldCallback(error);
};
var backupFilePath = path.join(apiConfig.backupFolder || FALLBACK_BACKUP_FOLDER, backupId + '.json');
debug('[%s] saveAppRestoreConfig: %j -> %s', backupId, restoreConfig, backupFilePath);
mkdirp(path.dirname(backupFilePath), function (error) {
mkdirp(path.dirname(backupFilePath), { mode: 0o777 }, function (error) {
if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
fs.writeFile(backupFilePath, JSON.stringify(restoreConfig), function (error) {
fs.writeFile(backupFilePath, JSON.stringify(restoreConfig), { mode: 0o777 }, function (error) {
if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
debug('[%s] saveAppRestoreConfig: done', backupId);