fix: addressed rabbit findings

backend/src/ee/routes/v1/kmip-operation-router.ts

@@ -236,7 +236,7 @@ export const registerKmipOperationRouter = async (server: FastifyZodProvider) =>
     },
     onRequest: verifyAuth([AuthMode.IDENTITY_ACCESS_TOKEN]),
     handler: async (req) => {
-      const object = await server.services.kmipOperation.deleteOp({
+      const object = await server.services.kmipOperation.destroy({
         ...req.kmipUser,
         actor: req.permission.type,
         actorId: req.permission.id,
@@ -255,7 +255,7 @@ export const registerKmipOperationRouter = async (server: FastifyZodProvider) =>
           }
         },
         event: {
-          type: EventType.KMIP_OPERATION_DELETE,
+          type: EventType.KMIP_OPERATION_DESTROY,
           metadata: {
             id: object.id
           }

backend/src/ee/routes/v1/kmip-router.ts

@@ -61,6 +61,8 @@ export const registerKmipRouter = async (server: FastifyZodProvider) => {
           }
         }
       });
+
+      return kmipClient;
     }
   });
 
@@ -107,6 +109,8 @@ export const registerKmipRouter = async (server: FastifyZodProvider) => {
           }
         }
       });
+
+      return kmipClient;
     }
   });
 
@@ -145,6 +149,8 @@ export const registerKmipRouter = async (server: FastifyZodProvider) => {
           }
         }
       });
+
+      return kmipClient;
     }
   });
 
@@ -183,6 +189,8 @@ export const registerKmipRouter = async (server: FastifyZodProvider) => {
           }
         }
       });
+
+      return kmipClient;
     }
   });
 

backend/src/ee/services/audit-log/audit-log-types.ts

@@ -275,7 +275,7 @@ export enum EventType {
 
   KMIP_OPERATION_CREATE = "kmip-operation-create",
   KMIP_OPERATION_GET = "kmip-operation-get",
-  KMIP_OPERATION_DELETE = "kmip-operation-delete",
+  KMIP_OPERATION_DESTROY = "kmip-operation-destroy",
   KMIP_OPERATION_GET_ATTRIBUTES = "kmip-operation-get-attributes",
   KMIP_OPERATION_ACTIVATE = "kmip-operation-activate",
   KMIP_OPERATION_REVOKE = "kmip-operation-revoke",
@@ -2178,8 +2178,8 @@ interface KmipOperationGetEvent {
   };
 }
 
-interface KmipOperationDeleteEvent {
-  type: EventType.KMIP_OPERATION_DELETE;
+interface KmipOperationDestroyEvent {
+  type: EventType.KMIP_OPERATION_DESTROY;
   metadata: {
     id: string;
   };
@@ -2457,7 +2457,7 @@ export type Event =
   | GetKmipEvent
   | RegisterKmipServerEvent
   | KmipOperationGetEvent
-  | KmipOperationDeleteEvent
+  | KmipOperationDestroyEvent
   | KmipOperationCreateEvent
   | KmipOperationGetAttributesEvent
   | KmipOperationActivateEvent

backend/src/ee/services/kmip/kmip-enum.ts

@@ -6,6 +6,6 @@ export enum KmipPermission {
   GetAttributes = "get-attributes",
   Activate = "activate",
   Revoke = "revoke",
-  Delete = "delete",
+  Destroy = "destroy",
   Register = "register"
 }

backend/src/ee/services/kmip/kmip-operation-service.ts

@@ -11,7 +11,7 @@ import { TKmipClientDALFactory } from "./kmip-client-dal";
 import { KmipPermission } from "./kmip-enum";
 import {
   TKmipCreateDTO,
-  TKmipDeleteDTO,
+  TKmipDestroyDTO,
   TKmipGetAttributesDTO,
   TKmipGetDTO,
   TKmipLocateDTO,
@@ -76,7 +76,7 @@ export const kmipOperationServiceFactory = ({
     return kmsKey;
   };
 
-  const deleteOp = async ({ projectId, id, clientId, actor, actorId, actorOrgId, actorAuthMethod }: TKmipDeleteDTO) => {
+  const destroy = async ({ projectId, id, clientId, actor, actorId, actorOrgId, actorAuthMethod }: TKmipDestroyDTO) => {
     const { permission } = await permissionService.getOrgPermission(
       actor,
       actorId,
@@ -92,9 +92,9 @@ export const kmipOperationServiceFactory = ({
       projectId
     });
 
-    if (!kmipClient.permissions?.includes(KmipPermission.Delete)) {
+    if (!kmipClient.permissions?.includes(KmipPermission.Destroy)) {
       throw new ForbiddenRequestError({
-        message: "Client does not have sufficient permission to perform KMIP delete"
+        message: "Client does not have sufficient permission to perform KMIP destroy"
       });
     }
 
@@ -108,13 +108,19 @@ export const kmipOperationServiceFactory = ({
     }
 
     if (key.isReserved) {
-      throw new BadRequestError({ message: "Cannot delete reserved keys" });
+      throw new BadRequestError({ message: "Cannot destroy reserved keys" });
     }
 
     const completeKeyDetails = await kmsDAL.findByIdWithAssociatedKms(id);
     if (!completeKeyDetails.internalKms) {
       throw new BadRequestError({
-        message: "Cannot delete external keys"
+        message: "Cannot destroy external keys"
+      });
+    }
+
+    if (!completeKeyDetails.isDisabled) {
+      throw new BadRequestError({
+        message: "Cannot destroy active keys"
       });
     }
 
@@ -408,7 +414,7 @@ export const kmipOperationServiceFactory = ({
     get,
     activate,
     getAttributes,
-    deleteOp,
+    destroy,
     revoke,
     locate,
     register

backend/src/ee/services/kmip/kmip-types.ts

@@ -60,7 +60,7 @@ export type TKmipGetAttributesDTO = {
   id: string;
 } & KmipOperationBaseDTO;
 
-export type TKmipDeleteDTO = {
+export type TKmipDestroyDTO = {
   id: string;
 } & KmipOperationBaseDTO;