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

Ensure we purge the ssh backup key file in case it was left over by a

Browse Source 
previous failed backup run

fs.writeFileSync() would fail to overwrite due to restricted file mode
for ssh
This commit is contained in:
Johannes Zellner
2025-12-02 10:59:51 +01:00
parent 1cbad1057d
commit 043d89c03b
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/storage/filesystem.js
+6 -2
View File
@@ -210,7 +210,9 @@ async function copyInternal(config, fromPath, toPath, options, progressCallback)
if (config._provider === mounts.MOUNT_TYPE_SSHFS) {
// we use a temporary key file instead of passing it as stdin
const identityFilePath = `/tmp/identity_file_${config._managedMountPath.replaceAll('/', '-')}`;
const identityFilePath = `/tmp/identity_file${config._managedMountPath.replaceAll('/', '-')}`;
// have to unlink first, in case a previous run crash before cleanup. With mode 0c600 we cannot overwrite it
safe.fs.unlinkSync(identityFilePath);
if (!safe.fs.writeFileSync(identityFilePath, `${config.mountOptions.privateKey}\n`, { mode: 0o600 })) throw new BoxError(BoxError.FS_ERROR, `Could not write temporary private key: ${safe.error.message}`);
const sshOptions = [ '-o', '"StrictHostKeyChecking no"', '-i', identityFilePath, '-p', config.mountOptions.port, `${config.mountOptions.user}@${config.mountOptions.host}` ];
@@ -271,7 +273,9 @@ async function removeDir(config, limits, remotePathPrefix, progressCallback) {
if (config._provider === mounts.MOUNT_TYPE_SSHFS) {
// we use a temporary key file instead of passing it as stdin
const identityFilePath = `/tmp/identity_file_${config._managedMountPath.replaceAll('/', '-')}`;
const identityFilePath = `/tmp/identity_file${config._managedMountPath.replaceAll('/', '-')}`;
// have to unlink first, in case a previous run crash before cleanup. With mode 0c600 we cannot overwrite it
safe.fs.unlinkSync(identityFilePath);
if (!safe.fs.writeFileSync(identityFilePath, `${config.mountOptions.privateKey}\n`, { mode: 0o600 })) throw new BoxError(BoxError.FS_ERROR, `Could not write temporary private key: ${safe.error.message}`);
const sshOptions = [ '-o', '"StrictHostKeyChecking no"', '-i', identityFilePath, '-p', config.mountOptions.port, `${config.mountOptions.user}@${config.mountOptions.host}` ];