Improve validation for virt volumes (#15474)

truenas · Jan 24, 2025 · 348bff7 · 348bff7
1 parent 03d7282
commit 348bff7
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/middlewared/middlewared/plugins/virt/volume.py b/src/middlewared/middlewared/plugins/virt/volume.py
@@ -1,10 +1,12 @@
+import errno
+
 from middlewared.api import api_method
 from middlewared.api.current import (
     VirtVolumeEntry, VirtVolumeCreateArgs, VirtVolumeCreateResult, VirtVolumeUpdateArgs,
     VirtVolumeUpdateResult, VirtVolumeDeleteArgs, VirtVolumeDeleteResult, VirtVolumeImportISOArgs,
     VirtVolumeImportISOResult,
 )
-from middlewared.service import CallError, CRUDService, job
+from middlewared.service import CallError, CRUDService, job, ValidationErrors
 from middlewared.utils import filter_list
 
 from .utils import incus_call, incus_call_sync, Status, incus_wait
@@ -46,6 +48,11 @@ async def query(self, filters, options):
     async def do_create(self, data):
         await self.middleware.call('virt.global.check_initialized')
 
+        verrors = ValidationErrors()
+        if await self.middleware.call('virt.volume.query', [['id', '=', data['name']]]):
+            verrors.add('virt_volume_create.name', 'Volume with this name already exists')
+        verrors.check()
+
         result = await incus_call('1.0/storage-pools/default/volumes/custom', 'post', {
             'json': {
                 'name': data['name'],
@@ -100,6 +107,9 @@ async def import_iso(self, job, data):
         elif data['iso_location'] is None:
             raise CallError('Either upload iso or provide iso_location')
 
+        if await self.middleware.call('virt.volume.query', [['id', '=', data['name']]]):
+            raise CallError('Volume with this name already exists', errno=errno.EEXIST)
+
         request_kwargs = {
             'headers': {
                 'X-Incus-type': 'iso',