From ff7881130fdfb8b31300ef2af95d55447d5af83d Mon Sep 17 00:00:00 2001
From: dwertent <dwertent@cyberarmor.io>
Date: Tue, 21 Dec 2021 13:09:31 +0200
Subject: [PATCH] fixed host sensor issue

---
 clihandler/initcli.go                   | 41 +++++++++++++------------
 clihandler/initcliutils.go              |  3 +-
 hostsensorutils/hostsensordeploy.go     |  3 ++
 hostsensorutils/hostsensorgetfrompod.go | 11 +------
 4 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/clihandler/initcli.go b/clihandler/initcli.go
index b870f364..d8ccf8b1 100644
--- a/clihandler/initcli.go
+++ b/clihandler/initcli.go
@@ -37,6 +37,18 @@ func getInterfaces(scanInfo *cautils.ScanInfo) componentInterfaces {
 	setSubmitBehavior(scanInfo, tenantConfig)
 
 	hostSensorHandler := getHostSensorHandler(scanInfo, k8s)
+	if err := hostSensorHandler.Init(); err != nil {
+		errMsg := "failed to init host sensor"
+		if scanInfo.VerboseMode {
+			errMsg = fmt.Sprintf("%s: %v", errMsg, err)
+		}
+		cautils.ErrorDisplay(errMsg)
+		hostSensorHandler = &hostsensorutils.HostSensorHandlerMock{}
+	}
+	// excluding hostsensor namespace
+	if len(scanInfo.IncludeNamespaces) == 0 && hostSensorHandler.GetNamespace() != "" {
+		scanInfo.ExcludedNamespaces = fmt.Sprintf("%s,%s", scanInfo.ExcludedNamespaces, hostSensorHandler.GetNamespace())
+	}
 
 	resourceHandler := getResourceHandler(scanInfo, tenantConfig, k8s, hostSensorHandler)
 
@@ -73,28 +85,19 @@ func ScanCliSetup(scanInfo *cautils.ScanInfo) error {
 	interfaces.report.SetClusterName(interfaces.tenantConfig.GetClusterName())
 	interfaces.report.SetCustomerGUID(interfaces.tenantConfig.GetCustomerGUID())
 
-	if err := interfaces.hostSensorHandler.Init(); err != nil {
-		errMsg := "failed to init host sensor"
-		if scanInfo.VerboseMode {
-			errMsg = fmt.Sprintf("%s: %v", errMsg, err)
-		}
-		cautils.ErrorDisplay(errMsg)
-	} else if len(scanInfo.IncludeNamespaces) == 0 && interfaces.hostSensorHandler.GetNamespace() != "" {
-		scanInfo.ExcludedNamespaces = fmt.Sprintf("%s,%s", scanInfo.ExcludedNamespaces, interfaces.hostSensorHandler)
-		defer func() {
-			if err := interfaces.hostSensorHandler.TearDown(); err != nil {
-				errMsg := "failed to tear down host sensor"
-				if scanInfo.VerboseMode {
-					errMsg = fmt.Sprintf("%s: %v", errMsg, err)
-				}
-				cautils.ErrorDisplay(errMsg)
-			}
-		}()
-	}
-
 	// set policy getter only after setting the customerGUID
 	setPolicyGetter(scanInfo, interfaces.tenantConfig.GetCustomerGUID())
 
+	defer func() {
+		if err := interfaces.hostSensorHandler.TearDown(); err != nil {
+			errMsg := "failed to tear down host sensor"
+			if scanInfo.VerboseMode {
+				errMsg = fmt.Sprintf("%s: %v", errMsg, err)
+			}
+			cautils.ErrorDisplay(errMsg)
+		}
+	}()
+
 	// cli handler setup
 	go func() {
 		// policy handler setup
diff --git a/clihandler/initcliutils.go b/clihandler/initcliutils.go
index 55a35b4e..b7ce4c54 100644
--- a/clihandler/initcliutils.go
+++ b/clihandler/initcliutils.go
@@ -61,7 +61,7 @@ func getHostSensorHandler(scanInfo *cautils.ScanInfo, k8s *k8sinterface.Kubernet
 	}
 	if hostSensorVal := scanInfo.HostSensor.Get(); hostSensorVal != nil && *hostSensorVal {
 		hostSensorHandler, err := hostsensorutils.NewHostSensorHandler(k8s)
-		if err != nil {
+		if err != nil || hostSensorHandler == nil {
 			glog.Errorf("failed to create host sensor: %v", err)
 			return &hostsensorutils.HostSensorHandlerMock{}
 		}
@@ -69,7 +69,6 @@ func getHostSensorHandler(scanInfo *cautils.ScanInfo, k8s *k8sinterface.Kubernet
 	}
 	return &hostsensorutils.HostSensorHandlerMock{}
 }
-
 func getFieldSelector(scanInfo *cautils.ScanInfo) resourcehandler.IFieldSelector {
 	if scanInfo.IncludeNamespaces != "" {
 		return resourcehandler.NewIncludeSelector(scanInfo.IncludeNamespaces)
diff --git a/hostsensorutils/hostsensordeploy.go b/hostsensorutils/hostsensordeploy.go
index 83a6d020..06e1c008 100644
--- a/hostsensorutils/hostsensordeploy.go
+++ b/hostsensorutils/hostsensordeploy.go
@@ -201,5 +201,8 @@ func (hsh *HostSensorHandler) TearDown() error {
 }
 
 func (hsh *HostSensorHandler) GetNamespace() string {
+	if hsh.DaemonSet == nil {
+		return ""
+	}
 	return hsh.DaemonSet.Namespace
 }
diff --git a/hostsensorutils/hostsensorgetfrompod.go b/hostsensorutils/hostsensorgetfrompod.go
index e6e9f480..aa58aae5 100644
--- a/hostsensorutils/hostsensorgetfrompod.go
+++ b/hostsensorutils/hostsensorgetfrompod.go
@@ -8,7 +8,6 @@ import (
 	"github.com/armosec/k8s-interface/k8sinterface"
 	"github.com/armosec/kubescape/cautils"
 	"github.com/armosec/opa-utils/objectsenvelopes/hostsensor"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/yaml"
 )
 
@@ -123,7 +122,7 @@ func (hsh *HostSensorHandler) GetOsReleaseFile() ([]hostsensor.HostSensorDataEnv
 // return list of
 func (hsh *HostSensorHandler) GetKubeletConfigurations() ([]hostsensor.HostSensorDataEnvelope, error) {
 	// loop over pods and port-forward it to each of them
-	res, err := hsh.sendAllPodsHTTPGETRequest("/kubeletConfigurations", "") // empty kind, will be overridden
+	res, err := hsh.sendAllPodsHTTPGETRequest("/kubeletConfigurations", "KubeletConfigurations") // empty kind, will be overridden
 	for resIdx := range res {
 		jsonBytes, err := yaml.YAMLToJSON(res[resIdx].Data)
 		if err != nil {
@@ -131,14 +130,6 @@ func (hsh *HostSensorHandler) GetKubeletConfigurations() ([]hostsensor.HostSenso
 			continue
 		}
 		res[resIdx].SetData(jsonBytes)
-
-		kindDet := metav1.TypeMeta{}
-		if err = json.Unmarshal(jsonBytes, &kindDet); err != nil {
-			fmt.Printf("In GetKubeletConfigurations failed to Unmarshal GroupVersionKind: %v;\n%v", err, jsonBytes)
-			continue
-		}
-		res[resIdx].SetKind(kindDet.Kind)
-		res[resIdx].SetApiVersion(k8sinterface.JoinGroupVersion(kindDet.GroupVersionKind().Group, kindDet.GroupVersionKind().Version))
 	}
 	return res, err
 }