From 21c1c689abf49dceb0f3aa9e23388c104dd059f0 Mon Sep 17 00:00:00 2001
From: Diego Collado <diego_collado@rapid7.com>
Date: Fri, 10 Jun 2022 11:37:59 +0100
Subject: [PATCH 1/7] Add Aruba snmp fingerprints

---
 xml/snmp_sysdescr.xml | 17 ++++++++++++++++-
 xml/snmp_sysobjid.xml | 13 ++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/xml/snmp_sysdescr.xml b/xml/snmp_sysdescr.xml
index 04b0988d..bbc298f7 100644
--- a/xml/snmp_sysdescr.xml
+++ b/xml/snmp_sysdescr.xml
@@ -749,6 +749,21 @@
     <param pos="0" name="os.device" value="WAP"/>
   </fingerprint>
 
+  <!--======================================================================
+                               Aruba
+  =======================================================================-->
+
+  <fingerprint pattern="^Aruba\s(JL\d+A)\s(\d+[A-Z]?)\S+\sSwitch.+ROM\s([A-Z]+(?:\.\d+)+)">
+    <description>HP Aruba Network Switch</description>
+    <example hw.product="JL256A" hw.family="2930F" hw.version="WC.16.01.0010">Aruba JL256A 2930F-48G-PoE+-4SFP+ Switch, revision WC.16.11.0004, ROM WC.16.01.0010</example>
+    <param pos="0" name="hw.device" value="Switch"/>
+    <param pos="0" name="hw.vendor" value="Aruba Networks"/>
+    <param pos="1" name="hw.product"/>
+    <param pos="2" name="hw.family"/>
+    <param pos="3" name="hw.version"/>
+    <param pos="0" name="os.vendor" value="Aruba Networks"/>
+  </fingerprint>
+
   <!--======================================================================
                               Asentria
    =======================================================================-->
@@ -7545,4 +7560,4 @@ Copyright (c) 1995-2005 by Cisco Systems
     <param pos="0" name="os.device" value="Broadband Router"/>
   </fingerprint>
 
-</fingerprints>
\ No newline at end of file
+</fingerprints>
diff --git a/xml/snmp_sysobjid.xml b/xml/snmp_sysobjid.xml
index 72d21e12..4c1b2003 100644
--- a/xml/snmp_sysobjid.xml
+++ b/xml/snmp_sysobjid.xml
@@ -472,4 +472,15 @@
     <param pos="0" name="service.cpe23" value="cpe:/a:net-snmp:net-snmp:-"/>
   </fingerprint>
 
-</fingerprints>
\ No newline at end of file
+  <fingerprint pattern="^1\.3\.6\.1\.4\.1\.11\.2\.3\.7\.11\.181\.21\sAruba\s(JL\d+A)\s(\d+[A-Z]?)\S+\sSwitch.+ROM\s([A-Z]+(?:\.\d+)+)">
+    <description>HP Aruba Network Switch</description>
+    <example hw.product="JL256A" hw.family="2930F" hw.version="WC.16.01.0010">1.3.6.1.4.1.11.2.3.7.11.181.21 Aruba JL256A 2930F-48G-PoE+-4SFP+ Switch, revision WC.16.11.0004, ROM WC.16.01.0010</example>
+    <param pos="0" name="hw.device" value="Switch"/>
+    <param pos="0" name="hw.vendor" value="Aruba Networks"/>
+    <param pos="1" name="hw.product"/>
+    <param pos="2" name="hw.family"/>
+    <param pos="3" name="hw.version"/>
+    <param pos="0" name="os.vendor" value="Aruba Networks"/>
+  </fingerprint>
+
+</fingerprints>

From ded646a1bdcaa0729a676c3819b42ca1b578cd15 Mon Sep 17 00:00:00 2001
From: Diego Collado <85950362+dcollado-r7@users.noreply.github.com>
Date: Fri, 10 Jun 2022 11:55:55 +0100
Subject: [PATCH 2/7] Update snmp_sysdescr.xml


From 887eef975aa6b5c34530612d5811501d6e6f37ad Mon Sep 17 00:00:00 2001
From: Diego Collado <85950362+dcollado-r7@users.noreply.github.com>
Date: Fri, 24 Jun 2022 09:51:53 +0100
Subject: [PATCH 3/7] Update snmp_sysdescr.xml

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

diff --git a/xml/snmp_sysdescr.xml b/xml/snmp_sysdescr.xml
index bbc298f7..a68fd602 100644
--- a/xml/snmp_sysdescr.xml
+++ b/xml/snmp_sysdescr.xml
@@ -756,12 +756,12 @@
   <fingerprint pattern="^Aruba\s(JL\d+A)\s(\d+[A-Z]?)\S+\sSwitch.+ROM\s([A-Z]+(?:\.\d+)+)">
     <description>HP Aruba Network Switch</description>
     <example hw.product="JL256A" hw.family="2930F" hw.version="WC.16.01.0010">Aruba JL256A 2930F-48G-PoE+-4SFP+ Switch, revision WC.16.11.0004, ROM WC.16.01.0010</example>
-    <param pos="0" name="hw.device" value="Switch"/>
+    <param pos="0" name="os.vendor" value="Aruba Networks"/>
     <param pos="0" name="hw.vendor" value="Aruba Networks"/>
-    <param pos="1" name="hw.product"/>
     <param pos="2" name="hw.family"/>
+    <param pos="1" name="hw.product"/>
+    <param pos="0" name="hw.device" value="Switch"/>
     <param pos="3" name="hw.version"/>
-    <param pos="0" name="os.vendor" value="Aruba Networks"/>
   </fingerprint>
 
   <!--======================================================================

From 188c7f8795f9c5048d4eb1bbabb6c10774ed3569 Mon Sep 17 00:00:00 2001
From: Diego Collado <85950362+dcollado-r7@users.noreply.github.com>
Date: Fri, 24 Jun 2022 09:53:31 +0100
Subject: [PATCH 4/7] Update snmp_sysobjid.xml

---
 xml/snmp_sysobjid.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xml/snmp_sysobjid.xml b/xml/snmp_sysobjid.xml
index 4c1b2003..2d426e52 100644
--- a/xml/snmp_sysobjid.xml
+++ b/xml/snmp_sysobjid.xml
@@ -475,12 +475,12 @@
   <fingerprint pattern="^1\.3\.6\.1\.4\.1\.11\.2\.3\.7\.11\.181\.21\sAruba\s(JL\d+A)\s(\d+[A-Z]?)\S+\sSwitch.+ROM\s([A-Z]+(?:\.\d+)+)">
     <description>HP Aruba Network Switch</description>
     <example hw.product="JL256A" hw.family="2930F" hw.version="WC.16.01.0010">1.3.6.1.4.1.11.2.3.7.11.181.21 Aruba JL256A 2930F-48G-PoE+-4SFP+ Switch, revision WC.16.11.0004, ROM WC.16.01.0010</example>
-    <param pos="0" name="hw.device" value="Switch"/>
+    <param pos="0" name="os.vendor" value="Aruba Networks"/>
     <param pos="0" name="hw.vendor" value="Aruba Networks"/>
-    <param pos="1" name="hw.product"/>
     <param pos="2" name="hw.family"/>
+    <param pos="1" name="hw.product"/>
+    <param pos="0" name="hw.device" value="Switch"/>
     <param pos="3" name="hw.version"/>
-    <param pos="0" name="os.vendor" value="Aruba Networks"/>
   </fingerprint>
 
 </fingerprints>

From d16b9589150eb29ac0f5faf0fbbca8a57d281648 Mon Sep 17 00:00:00 2001
From: Diego Collado <85950362+dcollado-r7@users.noreply.github.com>
Date: Mon, 27 Jun 2022 15:14:01 +0100
Subject: [PATCH 5/7] Removed newline


From 975348f48bd7a522946e21fb470b13aa8c721b2b Mon Sep 17 00:00:00 2001
From: Diego Collado <diego_collado@rapid7.com>
Date: Tue, 28 Jun 2022 11:31:28 -0600
Subject: [PATCH 6/7] Updating snmp files to address comments

---
 xml/snmp_sysdescr.xml | 12 ++++++------
 xml/snmp_sysobjid.xml | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/xml/snmp_sysdescr.xml b/xml/snmp_sysdescr.xml
index a68fd602..d28ece6b 100644
--- a/xml/snmp_sysdescr.xml
+++ b/xml/snmp_sysdescr.xml
@@ -750,18 +750,18 @@
   </fingerprint>
 
   <!--======================================================================
-                               Aruba
+                           Aruba Networks
   =======================================================================-->
 
   <fingerprint pattern="^Aruba\s(JL\d+A)\s(\d+[A-Z]?)\S+\sSwitch.+ROM\s([A-Z]+(?:\.\d+)+)">
     <description>HP Aruba Network Switch</description>
-    <example hw.product="JL256A" hw.family="2930F" hw.version="WC.16.01.0010">Aruba JL256A 2930F-48G-PoE+-4SFP+ Switch, revision WC.16.11.0004, ROM WC.16.01.0010</example>
+    <example hw.model="JL256A" hw.product="2930F" os.version="WC.16.01.0010">Aruba JL256A 2930F-48G-PoE+-4SFP+ Switch, revision WC.16.11.0004, ROM WC.16.01.0010</example>
     <param pos="0" name="os.vendor" value="Aruba Networks"/>
+    <param pos="3" name="os.version"/>
     <param pos="0" name="hw.vendor" value="Aruba Networks"/>
-    <param pos="2" name="hw.family"/>
-    <param pos="1" name="hw.product"/>
+    <param pos="2" name="hw.product"/>
+    <param pos="1" name="hw.model"/>
     <param pos="0" name="hw.device" value="Switch"/>
-    <param pos="3" name="hw.version"/>
   </fingerprint>
 
   <!--======================================================================
@@ -7560,4 +7560,4 @@ Copyright (c) 1995-2005 by Cisco Systems
     <param pos="0" name="os.device" value="Broadband Router"/>
   </fingerprint>
 
-</fingerprints>
+</fingerprints>
\ No newline at end of file
diff --git a/xml/snmp_sysobjid.xml b/xml/snmp_sysobjid.xml
index 2d426e52..4d5a34d7 100644
--- a/xml/snmp_sysobjid.xml
+++ b/xml/snmp_sysobjid.xml
@@ -474,13 +474,13 @@
 
   <fingerprint pattern="^1\.3\.6\.1\.4\.1\.11\.2\.3\.7\.11\.181\.21\sAruba\s(JL\d+A)\s(\d+[A-Z]?)\S+\sSwitch.+ROM\s([A-Z]+(?:\.\d+)+)">
     <description>HP Aruba Network Switch</description>
-    <example hw.product="JL256A" hw.family="2930F" hw.version="WC.16.01.0010">1.3.6.1.4.1.11.2.3.7.11.181.21 Aruba JL256A 2930F-48G-PoE+-4SFP+ Switch, revision WC.16.11.0004, ROM WC.16.01.0010</example>
+    <example hw.model="JL256A" hw.product="2930F" os.version="WC.16.01.0010">1.3.6.1.4.1.11.2.3.7.11.181.21 Aruba JL256A 2930F-48G-PoE+-4SFP+ Switch, revision WC.16.11.0004, ROM WC.16.01.0010</example>
     <param pos="0" name="os.vendor" value="Aruba Networks"/>
+    <param pos="3" name="os.version"/>
     <param pos="0" name="hw.vendor" value="Aruba Networks"/>
-    <param pos="2" name="hw.family"/>
-    <param pos="1" name="hw.product"/>
+    <param pos="2" name="hw.product"/>
+    <param pos="1" name="hw.model"/>
     <param pos="0" name="hw.device" value="Switch"/>
-    <param pos="3" name="hw.version"/>
   </fingerprint>
 
-</fingerprints>
+</fingerprints>
\ No newline at end of file

From d860184b85dd48da26f3c1f0ba70ac75e14aca02 Mon Sep 17 00:00:00 2001
From: Diego Collado <diego_collado@rapid7.com>
Date: Tue, 28 Jun 2022 11:39:10 -0600
Subject: [PATCH 7/7] Updating Aruba fingerprint in dhcp_vendor_class.xml

---
 xml/dhcp_vendor_class.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/xml/dhcp_vendor_class.xml b/xml/dhcp_vendor_class.xml
index 33e311db..27e6569e 100644
--- a/xml/dhcp_vendor_class.xml
+++ b/xml/dhcp_vendor_class.xml
@@ -108,16 +108,16 @@
 
   <fingerprint pattern="^Aruba\s(JL\d+A)\s(\d+[A-Z]?)\S+\sSwitch(?:\sdslforum.org)?$">
     <description>HP Aruba Network Switch</description>
-    <example hw.product="JL075A" hw.family="3810M">Aruba JL075A 3810M-16SFP+-2-slot Switch</example>
-    <example hw.product="JL253A" hw.family="2930F">Aruba JL253A 2930F-24G-4SFP+ Switch dslforum.org</example>
-    <example hw.product="JL256A" hw.family="2930F">Aruba JL256A 2930F-48G-PoE+-4SFP+ Switch</example>
-    <example hw.product="JL258A" hw.family="2930F">Aruba JL258A 2930F-8G-PoE+-2SFP+ Switch</example>
-    <example hw.product="JL357A" hw.family="2540">Aruba JL357A 2540-48G-PoE+-4SFP+ Switch</example>
-    <param pos="0" name="hw.device" value="Switch"/>
-    <param pos="0" name="hw.vendor" value="Aruba Networks"/>
-    <param pos="1" name="hw.product"/>
-    <param pos="2" name="hw.family"/>
+    <example hw.model="JL075A" hw.product="3810M">Aruba JL075A 3810M-16SFP+-2-slot Switch</example>
+    <example hw.model="JL253A" hw.product="2930F">Aruba JL253A 2930F-24G-4SFP+ Switch dslforum.org</example>
+    <example hw.model="JL256A" hw.product="2930F">Aruba JL256A 2930F-48G-PoE+-4SFP+ Switch</example>
+    <example hw.model="JL258A" hw.product="2930F">Aruba JL258A 2930F-8G-PoE+-2SFP+ Switch</example>
+    <example hw.model="JL357A" hw.product="2540">Aruba JL357A 2540-48G-PoE+-4SFP+ Switch</example>
     <param pos="0" name="os.vendor" value="Aruba Networks"/>
+    <param pos="0" name="hw.vendor" value="Aruba Networks"/>
+    <param pos="2" name="hw.product"/>
+    <param pos="1" name="hw.model"/>
+    <param pos="0" name="hw.device" value="Switch"/>
   </fingerprint>
 
   <fingerprint pattern="^AXIS,(?:PTZ Dome )?Network Camera,(.*),([\d\.]+)$">