@xen-orchestra/rest-api 0.33.0 → 0.34.0

package/dist/vms/vm.controller.mjs

@@ -28,6 +28,7 @@ import { BackupJobService } from '../backup-jobs/backup-job.service.mjs';
 import { partialVmBackupJobs, vmBackupJobIds } from '../open-api/oa-examples/backup-job.oa-example.mjs';
 import { messageIds, partialMessages } from '../open-api/oa-examples/message.oa-example.mjs';
 import { Task } from '@vates/task';
+import { vmExportCompressDeprecated } from '../middlewares/deprecated.middleware.mjs';
 const IGNORED_VDIS_TAG = '[NOSNAP]';
 // `datasources` is managed through the dedicated `/vms/{id}/stats/data_source`
 // endpoints, not as a direct VM property, so it cannot be updated via PATCH /vms.
@@ -447,6 +448,8 @@ let VmController = class VmController extends XapiXoController {
         });
     }
     /**
+     * Required privilege:
+     * - resource: vm, action: clone
      *
      * - For fast clone on the same SR, omit `srId` and set `fast` to `true`.
      * - For full copy on the same SR, omit `srId` and set `fast` to `false`.
@@ -630,6 +633,10 @@ let VmController = class VmController extends XapiXoController {
         }
     }
     /**
+     * Required privileges:
+     * - resource: vm, action: migrate-send
+     * - resource: host, action: migrate-receive (on the destination host)
+     *
      * VIF mapping is not allowed for intra-pool migration
      *
      * Networks and SRs must belong to the same pool as the destination host
@@ -649,6 +656,7 @@ let VmController = class VmController extends XapiXoController {
                 migrationNetworkId: migrationNetworkId,
                 sr: 'srId' in body ? body.srId : undefined,
             });
+            return;
         };
         return this.createAction(action, {
             sync,
@@ -673,7 +681,7 @@ __decorate([
 __decorate([
     Extension('x-mcp-exposure', 'deny'),
     Get('{id}.{format}'),
-    Middlewares(acl({ resource: 'vm', action: 'export', objectId: 'params.id' })),
+    Middlewares([acl({ resource: 'vm', action: 'export', objectId: 'params.id' }), vmExportCompressDeprecated]),
     SuccessResponse(200, 'Download started', 'application/octet-stream'),
     Response(forbiddenOperationResp.status, forbiddenOperationResp.description),
     Response(notFoundResp.status, notFoundResp.description),
@@ -919,8 +927,9 @@ __decorate([
     Example(taskLocation),
     Extension('x-mcp-exposure', 'confirm'),
     Post('{id}/actions/clone'),
-    Middlewares(json()),
+    Middlewares([json(), acl({ resource: 'vm', action: 'clone', objectId: 'params.id' })]),
     SuccessResponse(asynchronousActionResp.status, asynchronousActionResp.description),
+    Response(forbiddenOperationResp.status, forbiddenOperationResp.description),
     Response(createdResp.status, createdResp.description),
     Response(notFoundResp.status, notFoundResp.description),
     Response(internalServerErrorResp.status, internalServerErrorResp.description),
@@ -1041,8 +1050,17 @@ __decorate([
     Example(taskLocation),
     Extension('x-mcp-exposure', 'confirm'),
     Post('{id}/actions/migrate'),
-    Middlewares(json()),
+    Middlewares([
+        json(),
+        // Two separate checks allow independent control so a user can be allowed to migrate a VM away
+        // without being allowed to place VMs on any specific host, and vice versa.
+        acl([
+            { resource: 'vm', action: 'migrate-send', objectId: 'params.id' },
+            { resource: 'host', action: 'migrate-receive', objectId: 'body.hostId' },
+        ]),
+    ]),
     SuccessResponse(asynchronousActionResp.status, asynchronousActionResp.description),
+    Response(forbiddenOperationResp.status, forbiddenOperationResp.description),
     Response(noContentResp.status, noContentResp.description),
     Response(notFoundResp.status, notFoundResp.description),
     Response(invalidParametersResp.status, invalidParametersResp.description),

package/dist/vms/vm.service.mjs

@@ -120,7 +120,7 @@ export class VmService {
         }
         return vdis;
     }
-    async export(id, vmType, { compress, format, response }) {
+    async export(id, vmType, { compress, format, response, }) {
         const xapiVm = this.#restApi.getXapiObject(id, vmType);
         let stream;
         if (format === 'xva') {
@@ -196,23 +196,24 @@ export class VmService {
     }
     #getLastReplication(id) {
         const vm = this.#restApi.getObject(id, 'VM');
-        const replicatedVms = this.#restApi.getObjectsByType('VM', {
-            filter: obj => obj.other['xo:backup:vm'] === vm.id,
+        const snapshotReplicas = this.#restApi.getObjectsByType('VM-snapshot', {
+            filter: obj => obj.other['xo:backup:vm'] === vm.id && obj.$snapshot_of !== vm.id,
         });
         let lastTimestamp;
-        let lastReplica;
-        for (const id in replicatedVms) {
-            const replica = replicatedVms[id];
-            const timestamp = parseDateTime(replica.other['xo:backup:datetime']);
+        let lastReplicaId;
+        for (const id in snapshotReplicas) {
+            const snapshot = snapshotReplicas[id];
+            const timestamp = parseDateTime(snapshot.other['xo:backup:datetime']);
             if (lastTimestamp === undefined || lastTimestamp < timestamp) {
                 lastTimestamp = timestamp;
-                lastReplica = replica;
+                lastReplicaId = snapshot.$snapshot_of;
             }
         }
-        if (lastReplica === undefined) {
+        if (lastReplicaId === undefined) {
             return {};
         }
-        const vdis = this.getVmVdis(id, 'VM');
+        const replica = this.#restApi.getObject(lastReplicaId, 'VM');
+        const vdis = this.getVmVdis(replica.id, 'VM');
         let sr = undefined;
         for (const vdi of vdis) {
             if (sr === undefined) {
@@ -226,7 +227,7 @@ export class VmService {
             }
         }
         return {
-            id: lastReplica.id,
+            id: replica.id,
             timestamp: lastTimestamp * 1000,
             sr,
         };