Fixes #19537: Add Kali Linux to the list of recognized OS

Normation · Jul 19, 2021 · a1207fb · a1207fb
1 parent 2afbbb7
commit a1207fb
Show file tree

Hide file tree

Showing 7 changed files with 85 additions and 0 deletions.
diff --git a/...inventory/inventory-api/src/main/scala/com/normation/inventory/domain/NodeInventory.scala b/...inventory/inventory-api/src/main/scala/com/normation/inventory/domain/NodeInventory.scala
@@ -186,6 +186,7 @@ object LinuxType {
   val allKnownTypes = (
        Debian
     :: Ubuntu
+    :: Kali
     :: Redhat
     :: Centos
     :: Fedora
@@ -203,6 +204,7 @@ object LinuxType {
 
 final case object UnknownLinuxType extends LinuxType { val name = "UnknownLinux" }
 final case object Debian           extends LinuxType { val name = "Debian"       }
+final case object Kali             extends LinuxType { val name = "Kali"         }
 final case object Ubuntu           extends LinuxType { val name = "Ubuntu"       }
 final case object Redhat           extends LinuxType { val name = "Redhat"       }
 final case object Centos           extends LinuxType { val name = "Centos"       }

diff --git a/...src/main/scala/com/normation/inventory/provisioning/fusion/FusionReportUnmarshaller.scala b/...src/main/scala/com/normation/inventory/provisioning/fusion/FusionReportUnmarshaller.scala
@@ -722,6 +722,7 @@ class FusionReportUnmarshaller(
         case ("linux"  , x ) =>
           if     (x contains "debian"      ) Debian
           else if(x contains "ubuntu"      ) Ubuntu
+          else if(x contains "kali"        ) Kali
           else if(x contains "redhat"      ) Redhat
           else if(x contains "centos"      ) Centos
           else if(x contains "fedora"      ) Fedora

diff --git a/...ventory-repository/src/main/scala/com/normation/inventory/ldap/core/InventoryMapper.scala b/...ventory-repository/src/main/scala/com/normation/inventory/ldap/core/InventoryMapper.scala
@@ -724,6 +724,7 @@ class InventoryMapper(
         val linux = dit.NODES.NODE.linuxModel(server.main.id)
         os match {
           case Debian      => linux.addValues(A_OS_NAME, A_OS_DEBIAN)
+          case Kali        => linux.addValues(A_OS_NAME, A_OS_KALI)
           case Ubuntu      => linux.addValues(A_OS_NAME, A_OS_UBUNTU)
           case Redhat      => linux.addValues(A_OS_NAME, A_OS_REDHAT)
           case Centos      => linux.addValues(A_OS_NAME, A_OS_CENTOS)
@@ -894,6 +895,7 @@ class InventoryMapper(
                         } else if(entry.isA(OC_LINUX_NODE)) {
                           val os = osName match {
                             case A_OS_DEBIAN        => Debian
+                            case A_OS_KALI          => Kali
                             case A_OS_UBUNTU        => Ubuntu
                             case A_OS_REDHAT        => Redhat
                             case A_OS_CENTOS        => Centos

diff --git a/...inventory-repository/src/main/scala/com/normation/inventory/ldap/core/LDAPConstants.scala b/...inventory-repository/src/main/scala/com/normation/inventory/ldap/core/LDAPConstants.scala
@@ -200,6 +200,7 @@ object LDAPConstants {
   val A_OS_WIN_2019 = "Windows2019"
   val A_OS_UNKNOWN_LINUX = "Unknown Linux version"
   val A_OS_DEBIAN = "Debian"
+  val A_OS_KALI   = "Kali"
   val A_OS_UBUNTU = "Ubuntu"
   val A_OS_REDHAT = "Redhat"
   val A_OS_CENTOS = "Centos"

diff --git a/webapp/sources/rudder/rudder-web/src/main/resources/ldapObjectAndAttributes.properties b/webapp/sources/rudder/rudder-web/src/main/resources/ldapObjectAndAttributes.properties
@@ -86,6 +86,7 @@ ldap.object.group = Groups
 
 # OS names
 os.name.Debian=Debian
+os.name.Kali=Kali
 os.name.Ubuntu=Ubuntu
 os.name.Redhat=Red Hat
 os.name.Centos=CentOS

diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/os/kali-logo.svg b/webapp/sources/rudder/rudder-web/src/main/webapp/images/os/kali-logo.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/style/rudder/rudder-node.css b/webapp/sources/rudder/rudder-web/src/main/webapp/style/rudder/rudder-node.css
@@ -251,6 +251,9 @@
 .id-card .card-img.debian{
   background-image: url(../../images/os/debian-logo.svg);
 }
+.id-card .card-img.kali{
+  background-image: url(../../images/os/kali-logo.svg);
+}
 .id-card .card-img.ubuntu{
   background-image: url(../../images/os/ubuntu-logo.svg);
 }