From fd974f81f7e8df5def826b8bb212dc26d41ff7e8 Mon Sep 17 00:00:00 2001
From: Orin Eman <orin.eman@gmail.com>
Date: Thu, 17 Nov 2022 20:21:43 -0800
Subject: [PATCH] fix: issue 668 - ensure CIM_KVMRedirectionSAP is present
 before using it

---
 src/routes/amt/getAMTFeatures.ts | 1 +
 src/routes/amt/setAMTFeatures.ts | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/routes/amt/getAMTFeatures.ts b/src/routes/amt/getAMTFeatures.ts
index 29dac75d4..8ebcf76f7 100644
--- a/src/routes/amt/getAMTFeatures.ts
+++ b/src/routes/amt/getAMTFeatures.ts
@@ -46,6 +46,7 @@ export function processAmtRedirectionResponse (amtRedirection: AMT.Models.Redire
 }
 
 export function processKvmRedirectionResponse (kvmRedirection: CIM.Models.KVMRedirectionSAP): boolean {
+  if (kvmRedirection == null) return false
   const kvm = (kvmRedirection.EnabledState === Common.Models.CIM_KVM_REDIRECTION_SAP_ENABLED_STATE.Enabled ||
                kvmRedirection.EnabledState === Common.Models.CIM_KVM_REDIRECTION_SAP_ENABLED_STATE.EnabledButOffline)
   return kvm
diff --git a/src/routes/amt/setAMTFeatures.ts b/src/routes/amt/setAMTFeatures.ts
index 85e17b85d..c96f7921f 100644
--- a/src/routes/amt/setAMTFeatures.ts
+++ b/src/routes/amt/setAMTFeatures.ts
@@ -27,8 +27,9 @@ export async function setAMTFeatures (req: Request, res: Response): Promise<void
     let redir = amtRedirectionResponse.AMT_RedirectionService.ListenerEnabled
     let sol = (amtRedirectionResponse.AMT_RedirectionService.EnabledState & Common.Models.AMT_REDIRECTION_SERVICE_ENABLE_STATE.Enabled) !== 0
     let ider = (amtRedirectionResponse.AMT_RedirectionService.EnabledState & Common.Models.AMT_REDIRECTION_SERVICE_ENABLE_STATE.Other) !== 0
-    let kvm = (kvmRedirectionResponse.CIM_KVMRedirectionSAP.EnabledState === Common.Models.CIM_KVM_REDIRECTION_SAP_ENABLED_STATE.Enabled ||
-      kvmRedirectionResponse.CIM_KVMRedirectionSAP.EnabledState === Common.Models.CIM_KVM_REDIRECTION_SAP_ENABLED_STATE.EnabledButOffline)
+    let kvm = (kvmRedirectionResponse.CIM_KVMRedirectionSAP != null &&
+      (kvmRedirectionResponse.CIM_KVMRedirectionSAP.EnabledState === Common.Models.CIM_KVM_REDIRECTION_SAP_ENABLED_STATE.Enabled ||
+       kvmRedirectionResponse.CIM_KVMRedirectionSAP.EnabledState === Common.Models.CIM_KVM_REDIRECTION_SAP_ENABLED_STATE.EnabledButOffline))
 
     if (payload.enableSOL !== sol) {
       sol = payload.enableSOL