diff --git a/src/backups.js b/src/backups.js index 12fc4bd20..b2ec9f0aa 100644 --- a/src/backups.js +++ b/src/backups.js @@ -168,7 +168,7 @@ function getRestoreUrl(backupId, callback) { if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error)); var backupConfig = result.config; - api(backupConfig.provider).getSignedDownloadUrl(apiConfig, backupConfig, function (error, result) { + api(backupConfig.provider).getSignedDownloadUrl(apiConfig, backupConfig, backupId, function (error, result) { if (error) return callback(error); var obj = { diff --git a/src/storage/caas.js b/src/storage/caas.js index 38d4762fb..8056bf0bc 100644 --- a/src/storage/caas.js +++ b/src/storage/caas.js @@ -79,9 +79,10 @@ function getSignedUploadUrl(apiConfig, filename, callback) { }); } -function getSignedDownloadUrl(apiConfig, info, callback) { +function getSignedDownloadUrl(apiConfig, info, filename, callback) { assert.strictEqual(typeof apiConfig, 'object'); assert.strictEqual(typeof info, 'object'); + assert.strictEqual(typeof filename, 'string'); assert.strictEqual(typeof callback, 'function'); if (!info.bucket || !info.prefix) return new Error('Invalid configuration'); // prevent error in s3 @@ -93,7 +94,7 @@ function getSignedDownloadUrl(apiConfig, info, callback) { var params = { Bucket: info.bucket, - Key: info.prefix + '/' + info.filename, + Key: info.prefix + '/' + filename, Expires: 60 * 30 /* 30 minutes */ }; diff --git a/src/storage/s3.js b/src/storage/s3.js index 235128d02..08c2a48fc 100644 --- a/src/storage/s3.js +++ b/src/storage/s3.js @@ -85,9 +85,10 @@ function getSignedUploadUrl(apiConfig, filename, callback) { }); } -function getSignedDownloadUrl(apiConfig, info, callback) { +function getSignedDownloadUrl(apiConfig, info, filename, callback) { assert.strictEqual(typeof apiConfig, 'object'); assert.strictEqual(typeof info, 'object'); + assert.strictEqual(typeof filename, 'string'); assert.strictEqual(typeof callback, 'function'); getBackupCredentials(apiConfig, function (error, credentials) { @@ -97,7 +98,7 @@ function getSignedDownloadUrl(apiConfig, info, callback) { var params = { Bucket: info.bucket, - Key: info.prefix + '/' + info.filename, + Key: info.prefix + '/' + filename, Expires: 60 * 30 /* 30 minutes */ };