NuKVM/xen-orchestra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(vhd-lib): remove unsafe VhdAbstract.rename implementation

Browse Source 
actual implementation was deleting the target vhd even if the source did not exist, leading to ptential data loss
This commit is contained in:
Florent Beauchamp
2022-11-21 16:14:27 +01:00
committed by Julien Fontanet
parent 20a01bf266
commit c5b3acfce2
2 changed files with 3 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/vhd-lib/Vhd/VhdAbstract.integ.spec.js
View File

@@ -98,12 +98,8 @@ test('It rename and unlink a VHDFile', async () => {
const { size } = await fs.stat(vhdFileName)
const targetFileName = `${tempDir}/renamed.vhd`
await VhdAbstract.rename(handler, vhdFileName, targetFileName)
await VhdAbstract.unlink(handler, vhdFileName)
expect(await fs.exists(vhdFileName)).toEqual(false)
const { size: renamedSize } = await fs.stat(targetFileName)
expect(size).toEqual(renamedSize)
await VhdAbstract.unlink(handler, targetFileName)
expect(await fs.exists(targetFileName)).toEqual(false)
})
})
@@ -122,12 +118,8 @@ test('It rename and unlink a VhdDirectory', async () => {
// it should clean an existing directory
await fs.mkdir(targetFileName)
await fs.writeFile(`${targetFileName}/dummy`, 'I exists')
await VhdAbstract.rename(handler, vhdDirectory, targetFileName)
expect(await fs.exists(vhdDirectory)).toEqual(false)
expect(await fs.exists(targetFileName)).toEqual(true)
await VhdAbstract.unlink(handler, `${targetFileName}/dummy`)
expect(await fs.exists(`${targetFileName}/dummy`)).toEqual(false)
await VhdAbstract.unlink(handler, targetFileName)
expect(await fs.exists(targetFileName)).toEqual(false)
})
})
@@ -146,15 +138,9 @@ test('It create , rename and unlink alias', async () => {
expect(await fs.exists(aliasFileName)).toEqual(true)
expect(await fs.exists(vhdFileName)).toEqual(true)
await VhdAbstract.rename(handler, aliasFileName, aliasFileNameRenamed)
expect(await fs.exists(aliasFileName)).toEqual(false)
expect(await fs.exists(vhdFileName)).toEqual(true)
expect(await fs.exists(aliasFileNameRenamed)).toEqual(true)
await VhdAbstract.unlink(handler, aliasFileNameRenamed)
await VhdAbstract.unlink(handler, aliasFileName)
expect(await fs.exists(aliasFileName)).toEqual(false)
expect(await fs.exists(vhdFileName)).toEqual(false)
expect(await fs.exists(aliasFileNameRenamed)).toEqual(false)
})
})

8
packages/vhd-lib/Vhd/VhdAbstract.js
View File

@@ -200,14 +200,6 @@ exports.VhdAbstract = class VhdAbstract {
}
}
static async rename(handler, sourcePath, targetPath) {
try {
// delete target if it already exists
await VhdAbstract.unlink(handler, targetPath)
} catch (e) {}
await handler.rename(sourcePath, targetPath)
}
static async unlink(handler, path) {
const resolved = await resolveVhdAlias(handler, path)
try {