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

backups: encrypted backups must have .enc extension

Browse Source
This commit is contained in:
Girish Ramakrishnan
2023-07-24 22:25:06 +05:30
parent febac9e8ca
commit 3d5c21d9ca
7 changed files with 28 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/storage/filesystem.js
View File

@@ -138,17 +138,15 @@ function upload(apiConfig, backupFilePath, sourceStream, callback) {
});
}
function download(apiConfig, sourceFilePath, callback) {
async function download(apiConfig, sourceFilePath) {
assert.strictEqual(typeof apiConfig, 'object');
assert.strictEqual(typeof sourceFilePath, 'string');
assert.strictEqual(typeof callback, 'function');
debug(`download: ${sourceFilePath}`);
if (!safe.fs.existsSync(sourceFilePath)) return callback(new BoxError(BoxError.NOT_FOUND, `File not found: ${sourceFilePath}`));
if (!safe.fs.existsSync(sourceFilePath)) throw new BoxError(BoxError.NOT_FOUND, `File not found: ${sourceFilePath}`);
var fileStream = fs.createReadStream(sourceFilePath);
callback(null, fileStream);
return fs.createReadStream(sourceFilePath);
}
async function exists(apiConfig, sourceFilePath) {

22
src/storage/gcs.js
View File

@@ -31,7 +31,6 @@ const assert = require('assert'),
BoxError = require('../boxerror.js'),
constants = require('../constants.js'),
debug = require('debug')('box:storage/gcs'),
PassThrough = require('stream').PassThrough,
path = require('path'),
safe = require('safetydance'),
util = require('util');
@@ -136,29 +135,14 @@ async function exists(apiConfig, backupFilePath) {
}
}
function download(apiConfig, backupFilePath, callback) {
async function download(apiConfig, backupFilePath) {
assert.strictEqual(typeof apiConfig, 'object');
assert.strictEqual(typeof backupFilePath, 'string');
assert.strictEqual(typeof callback, 'function');
debug(`Download ${backupFilePath} starting`);
var file = getBucket(apiConfig).file(backupFilePath);
var ps = new PassThrough();
var readStream = file.createReadStream()
.on('error', function(error) {
if (error && error.code == 404){
ps.emit('error', new BoxError(BoxError.NOT_FOUND));
} else {
debug(`download: [${backupFilePath}] gcp stream error. %o`, error);
ps.emit('error', new BoxError(BoxError.EXTERNAL_ERROR, error));
}
})
;
readStream.pipe(ps);
callback(null, ps);
const file = getBucket(apiConfig).file(backupFilePath);
return file.createReadStream();
}
function listDir(apiConfig, backupFilePath, batchSize, iteratorCallback, callback) {

5
src/storage/interface.js
View File

@@ -85,13 +85,12 @@ async function exists(apiConfig, backupFilePath) {
throw new BoxError(BoxError.NOT_IMPLEMENTED, 'exists is not implemented');
}
function download(apiConfig, backupFilePath, callback) {
async function download(apiConfig, backupFilePath) {
assert.strictEqual(typeof apiConfig, 'object');
assert.strictEqual(typeof backupFilePath, 'string');
assert.strictEqual(typeof callback, 'function');
// Result: download stream
callback(new BoxError(BoxError.NOT_IMPLEMENTED, 'download is not implemented'));
throw new BoxError(BoxError.NOT_IMPLEMENTED, 'download is not implemented');
}
async function copy(apiConfig, oldFilePath, newFilePath, progressCallback) {

5
src/storage/noop.js
View File

@@ -63,14 +63,13 @@ async function exists(apiConfig, backupFilePath) {
return false;
}
function download(apiConfig, backupFilePath, callback) {
async function download(apiConfig, backupFilePath) {
assert.strictEqual(typeof apiConfig, 'object');
assert.strictEqual(typeof backupFilePath, 'string');
assert.strictEqual(typeof callback, 'function');
debug('download: %s', backupFilePath);
callback(new BoxError(BoxError.NOT_IMPLEMENTED, 'Cannot download from noop backend'));
throw new BoxError(BoxError.NOT_IMPLEMENTED, 'Cannot download from noop backend');
}
function listDir(apiConfig, dir, batchSize, iteratorCallback, callback) {

7
src/storage/s3.js
View File

@@ -262,10 +262,9 @@ class S3MultipartDownloadStream extends Readable {
}
}
function download(apiConfig, backupFilePath, callback) {
async function download(apiConfig, backupFilePath) {
assert.strictEqual(typeof apiConfig, 'object');
assert.strictEqual(typeof backupFilePath, 'string');
assert.strictEqual(typeof callback, 'function');
const credentials = getS3Config(apiConfig);
@@ -275,9 +274,7 @@ function download(apiConfig, backupFilePath, callback) {
};
const s3 = new aws.S3(credentials);
const multipartDownloadStream = new S3MultipartDownloadStream(s3, params, { blockSize: 64 * 1024 * 1024 });
return callback(null, multipartDownloadStream);
return new S3MultipartDownloadStream(s3, params, { blockSize: 64 * 1024 * 1024 });
}
function listDir(apiConfig, dir, batchSize, iteratorCallback, callback) {