From 5edb5c119bedb473bcdc9b460c3b6f2a34b25f7b Mon Sep 17 00:00:00 2001
From: Anastassiya Torovik <anastassiya_torovik@rapid7.com>
Date: Fri, 13 Sep 2024 10:59:07 +0200
Subject: [PATCH 1/7] Add Cisco CE fingerprinter

---
 identifiers/os_product.txt |  1 +
 xml/snmp_sysdescr.xml      | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/identifiers/os_product.txt b/identifiers/os_product.txt
index 008565a0..96a7ac9a 100644
--- a/identifiers/os_product.txt
+++ b/identifiers/os_product.txt
@@ -44,6 +44,7 @@ Chrome OS
 CloudKey
 CoBox
 Cobalt RaQ
+Collaboration Endpoint
 CommandPost
 Comware
 ConnectUPS
diff --git a/xml/snmp_sysdescr.xml b/xml/snmp_sysdescr.xml
index 5988ee49..3bb0e82e 100644
--- a/xml/snmp_sysdescr.xml
+++ b/xml/snmp_sysdescr.xml
@@ -1564,6 +1564,20 @@
     <param pos="2" name="hw.product"/>
   </fingerprint>
 
+  <fingerprint pattern="^ce\d+\S*$">
+    <description>Cisco/Tandberg TelePresence</description>
+    <example os.version="ce9.15.0.d97b604b745">ce9.15.0.d97b604b745</example>
+    <param pos="0" name="os.vendor" value="Cisco"/>
+    <param pos="0" name="os.family" value="TelePresence"/>
+    <param pos="0" name="os.product" value="Collaboration Endpoint"/>
+    <param pos="0" name="os.device" value="Video Conferencing"/>
+    <param pos="1" name="os.version"/>
+    <param pos="0" name="hw.vendor" value="Cisco"/>
+    <param pos="0" name="hw.family" value="TelePresence"/>
+    <param pos="0" name="hw.device" value="Video Conferencing"/>
+  </fingerprint>
+  <!-- NEC -->
+
   <fingerprint pattern="^Cisco TelePresence ((?:HD )?MCU(?: MSE)? \d+)">
     <description>Cisco TelePresence w/Model</description>
     <example hw.product="MCU 4205">Cisco TelePresence MCU 4205</example>
@@ -1620,6 +1634,8 @@
     <param pos="1" name="hw.product"/>
   </fingerprint>
 
+
+
   <fingerprint pattern="^Cisco Adaptive Security Appliance Version (\d+\.\d+\(\d+\)\d*)">
     <description>Cisco Adaptive Security Appliance</description>
     <example os.version="8.0(2)">Cisco Adaptive Security Appliance Version 8.0(2)</example>

From a2f514815223c0ec6cc2f972f95cfe40c6b9b159 Mon Sep 17 00:00:00 2001
From: Anastassiya Torovik <anastassiya_torovik@rapid7.com>
Date: Fri, 13 Sep 2024 16:01:19 +0200
Subject: [PATCH 2/7] Add capturing group Cisco CE

---
 xml/snmp_sysdescr.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xml/snmp_sysdescr.xml b/xml/snmp_sysdescr.xml
index 3bb0e82e..dff63fd8 100644
--- a/xml/snmp_sysdescr.xml
+++ b/xml/snmp_sysdescr.xml
@@ -1564,7 +1564,7 @@
     <param pos="2" name="hw.product"/>
   </fingerprint>
 
-  <fingerprint pattern="^ce\d+\S*$">
+  <fingerprint pattern="^(ce\d+\S*)$">
     <description>Cisco/Tandberg TelePresence</description>
     <example os.version="ce9.15.0.d97b604b745">ce9.15.0.d97b604b745</example>
     <param pos="0" name="os.vendor" value="Cisco"/>

From 1d2d0e01aaff050fa496ef16a9dfbcb01fe7ee35 Mon Sep 17 00:00:00 2001
From: Anastassiya Torovik <anastassiya_torovik@rapid7.com>
Date: Wed, 18 Sep 2024 12:16:11 +0200
Subject: [PATCH 3/7] Make regex more precise for Cisco CE snmp fingerprinter

---
 xml/snmp_sysdescr.xml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/xml/snmp_sysdescr.xml b/xml/snmp_sysdescr.xml
index dff63fd8..f9d985ea 100644
--- a/xml/snmp_sysdescr.xml
+++ b/xml/snmp_sysdescr.xml
@@ -1564,17 +1564,21 @@
     <param pos="2" name="hw.product"/>
   </fingerprint>
 
-  <fingerprint pattern="^(ce\d+\S*)$">
-    <description>Cisco/Tandberg TelePresence</description>
-    <example os.version="ce9.15.0.d97b604b745">ce9.15.0.d97b604b745</example>
+  <fingerprint pattern="SoftW:\s+(ce\d+\S*)$$">
+    <description>Cisco TelePresence Collaboration Endpoint (RoomOS)</description>
+    <example os.version="ce9.15.0.d97b604b745">SNMP:
+  Uptime: 840410
+  Description: Cisco Codec
+SoftW: ce9.15.0.11.aec227943ed
+MCU: Cisco Webex Room Kit
+Date: 2021-01-28
+S/N: FOC2236NA6V</example>
     <param pos="0" name="os.vendor" value="Cisco"/>
     <param pos="0" name="os.family" value="TelePresence"/>
     <param pos="0" name="os.product" value="Collaboration Endpoint"/>
-    <param pos="0" name="os.device" value="Video Conferencing"/>
     <param pos="1" name="os.version"/>
     <param pos="0" name="hw.vendor" value="Cisco"/>
     <param pos="0" name="hw.family" value="TelePresence"/>
-    <param pos="0" name="hw.device" value="Video Conferencing"/>
   </fingerprint>
   <!-- NEC -->
 

From 20bd01c2d9f7ebfc03297c8f4a078b38a5455aa7 Mon Sep 17 00:00:00 2001
From: Anastassiya Torovik <anastassiya_torovik@rapid7.com>
Date: Wed, 18 Sep 2024 13:24:25 +0200
Subject: [PATCH 4/7] Fix expected value for the test

---
 xml/snmp_sysdescr.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xml/snmp_sysdescr.xml b/xml/snmp_sysdescr.xml
index f9d985ea..069924bd 100644
--- a/xml/snmp_sysdescr.xml
+++ b/xml/snmp_sysdescr.xml
@@ -1566,7 +1566,7 @@
 
   <fingerprint pattern="SoftW:\s+(ce\d+\S*)$$">
     <description>Cisco TelePresence Collaboration Endpoint (RoomOS)</description>
-    <example os.version="ce9.15.0.d97b604b745">SNMP:
+    <example os.version="ce9.15.0.11.aec227943ed">SNMP:
   Uptime: 840410
   Description: Cisco Codec
 SoftW: ce9.15.0.11.aec227943ed

From b2e8c00b066f6410774a988bb53ae2139e25cce3 Mon Sep 17 00:00:00 2001
From: Anastassiya Torovik <anastassiya_torovik@rapid7.com>
Date: Wed, 18 Sep 2024 13:28:33 +0200
Subject: [PATCH 5/7] Fix regex pattern for Cisco CE

---
 xml/snmp_sysdescr.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xml/snmp_sysdescr.xml b/xml/snmp_sysdescr.xml
index 069924bd..d4ae5b5c 100644
--- a/xml/snmp_sysdescr.xml
+++ b/xml/snmp_sysdescr.xml
@@ -1564,7 +1564,7 @@
     <param pos="2" name="hw.product"/>
   </fingerprint>
 
-  <fingerprint pattern="SoftW:\s+(ce\d+\S*)$$">
+  <fingerprint pattern="SoftW:\s+(ce\d+\S*)$">
     <description>Cisco TelePresence Collaboration Endpoint (RoomOS)</description>
     <example os.version="ce9.15.0.11.aec227943ed">SNMP:
   Uptime: 840410

From 66fe64b5082a225b45935e89af5bb795bbda27e4 Mon Sep 17 00:00:00 2001
From: Anastassiya Torovik <anastassiya_torovik@rapid7.com>
Date: Wed, 18 Sep 2024 13:43:55 +0200
Subject: [PATCH 6/7] Fix regex for Cisco CE

---
 xml/snmp_sysdescr.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xml/snmp_sysdescr.xml b/xml/snmp_sysdescr.xml
index d4ae5b5c..6a67c4f7 100644
--- a/xml/snmp_sysdescr.xml
+++ b/xml/snmp_sysdescr.xml
@@ -1564,7 +1564,7 @@
     <param pos="2" name="hw.product"/>
   </fingerprint>
 
-  <fingerprint pattern="SoftW:\s+(ce\d+\S*)$">
+  <fingerprint pattern="SoftW:\s+(ce\d+\S*)">
     <description>Cisco TelePresence Collaboration Endpoint (RoomOS)</description>
     <example os.version="ce9.15.0.11.aec227943ed">SNMP:
   Uptime: 840410

From 53c53cb88e6d6ee3097c63fa07b91c370cae35cc Mon Sep 17 00:00:00 2001
From: Anastassiya Torovik <anastassiya_torovik@rapid7.com>
Date: Wed, 18 Sep 2024 14:48:09 +0200
Subject: [PATCH 7/7] Extend the regex for Cisco CE snmp to also extract the hw
 model

---
 xml/snmp_sysdescr.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/xml/snmp_sysdescr.xml b/xml/snmp_sysdescr.xml
index 6a67c4f7..fb5132b0 100644
--- a/xml/snmp_sysdescr.xml
+++ b/xml/snmp_sysdescr.xml
@@ -1564,9 +1564,9 @@
     <param pos="2" name="hw.product"/>
   </fingerprint>
 
-  <fingerprint pattern="SoftW:\s+(ce\d+\S*)">
+  <fingerprint pattern="SoftW:\s+(ce\d+\S*)[\s\S]*?MCU:\s+([^\n]+)">
     <description>Cisco TelePresence Collaboration Endpoint (RoomOS)</description>
-    <example os.version="ce9.15.0.11.aec227943ed">SNMP:
+    <example os.version="ce9.15.0.11.aec227943ed" hw.model="Cisco Webex Room Kit">SNMP:
   Uptime: 840410
   Description: Cisco Codec
 SoftW: ce9.15.0.11.aec227943ed
@@ -1579,6 +1579,7 @@ S/N: FOC2236NA6V</example>
     <param pos="1" name="os.version"/>
     <param pos="0" name="hw.vendor" value="Cisco"/>
     <param pos="0" name="hw.family" value="TelePresence"/>
+    <param pos="2" name="hw.model"/>
   </fingerprint>
   <!-- NEC -->