From ac085005bac754c7fc18785f6e94063fe4a66407 Mon Sep 17 00:00:00 2001
From: Tom Sellers <Tom_Sellers@rapid7.com>
Date: Tue, 14 Jul 2020 10:39:30 -0500
Subject: [PATCH] SAP Netweaver: Telnet and tweaks (#274)

* Add Netweaver telnet banner

* Revert "Add Netweaver telnet banner"

This reverts commit 8bf24938bbb173b3122f846fd6efa94f17f79b73.

* Netweaver telnet

* Tweak component

* Netweaver adjustments

* NetWeaver
---
 xml/http_servers.xml   | 31 +++++++++++-----
 xml/telnet_banners.xml | 81 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 104 insertions(+), 8 deletions(-)

diff --git a/xml/http_servers.xml b/xml/http_servers.xml
index a49af4d7..1010dcac 100644
--- a/xml/http_servers.xml
+++ b/xml/http_servers.xml
@@ -1584,13 +1584,16 @@
      -->
 
   <fingerprint pattern="^SAP J2EE Engine/(\d+\.\d+)$">
-    <description>SAP NetWeaver Web AS (Application Server)</description>
+    <description>SAP NetWeaver Application Server Java - short version</description>
     <example service.version="7.01">SAP J2EE Engine/7.01</example>
     <param pos="0" name="service.vendor" value="SAP"/>
-    <param pos="0" name="service.product" value="NetWeaver Application Server"/>
+    <param pos="0" name="service.product" value="NetWeaver Application Server Java"/>
     <param pos="0" name="service.family" value="NetWeaver"/>
     <param pos="1" name="service.version"/>
-    <param pos="0" name="service.cpe23" value="cpe:/a:sap:netweaver_application_server:{service.version}"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:sap:netweaver_application_server_java:{service.version}"/>
+    <param pos="0" name="service.component.vendor" value="SAP"/>
+    <param pos="0" name="service.component.product" value="NetWeaver Application Server"/>
+    <param pos="0" name="service.component.cpe23" value="cpe:/a:sap:netweaver_application_server:-"/>
   </fingerprint>
 
   <fingerprint pattern="^SAP NetWeaver Application Server$">
@@ -1604,13 +1607,16 @@
 
   <fingerprint pattern="^SAP NetWeaver Application Server ([\d.]+) / AS Java ([\d.]+)$">
     <description>SAP NetWeaver Application Server Java</description>
-    <example service.version="7.22" service.component.version="7.30">SAP NetWeaver Application Server 7.22 / AS Java 7.30</example>
+    <example service.version="7.30" service.component.version="7.22">SAP NetWeaver Application Server 7.22 / AS Java 7.30</example>
     <param pos="0" name="service.vendor" value="SAP"/>
     <param pos="0" name="service.product" value="NetWeaver Application Server Java"/>
     <param pos="0" name="service.family" value="NetWeaver"/>
-    <param pos="1" name="service.version"/>
+    <param pos="2" name="service.version"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:sap:netweaver_application_server_java:{service.version}"/>
-    <param pos="2" name="service.component.version"/>
+    <param pos="0" name="service.component.vendor" value="SAP"/>
+    <param pos="0" name="service.component.product" value="NetWeaver Application Server"/>
+    <param pos="1" name="service.component.version"/>
+    <param pos="0" name="service.component.cpe23" value="cpe:/a:sap:netweaver_application_server:{service.component.version}"/>
   </fingerprint>
 
   <fingerprint pattern="^SAP NetWeaver Application Server ([\d.]+) / ICM ([\d.]+)$">
@@ -1619,8 +1625,11 @@
     <param pos="0" name="service.vendor" value="SAP"/>
     <param pos="0" name="service.product" value="NetWeaver Internet Communication Manager"/>
     <param pos="0" name="service.family" value="NetWeaver"/>
-    <param pos="1" name="service.version"/>
-    <param pos="2" name="service.component.version"/>
+    <param pos="2" name="service.version"/>
+    <param pos="0" name="service.component.vendor" value="SAP"/>
+    <param pos="0" name="service.component.product" value="NetWeaver Application Server"/>
+    <param pos="1" name="service.component.version"/>
+    <param pos="0" name="service.component.cpe23" value="cpe:/a:sap:netweaver_application_server:{service.component.version}"/>
   </fingerprint>
 
   <fingerprint pattern="^SAP NetWeaver Application Server \(ICM\)$">
@@ -1629,6 +1638,9 @@
     <param pos="0" name="service.vendor" value="SAP"/>
     <param pos="0" name="service.product" value="NetWeaver Internet Communication Manager"/>
     <param pos="0" name="service.family" value="NetWeaver"/>
+    <param pos="0" name="service.component.vendor" value="SAP"/>
+    <param pos="0" name="service.component.product" value="NetWeaver Application Server"/>
+    <param pos="0" name="service.component.cpe23" value="cpe:/a:sap:netweaver_application_server:-"/>
   </fingerprint>
 
   <fingerprint pattern="^SAP NetWeaver Application Server / ABAP ([\d.]+)$">
@@ -1639,6 +1651,9 @@
     <param pos="0" name="service.family" value="NetWeaver"/>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:sap:netweaver_as_abap:{service.version}"/>
+    <param pos="0" name="service.component.vendor" value="SAP"/>
+    <param pos="0" name="service.component.product" value="NetWeaver Application Server"/>
+    <param pos="0" name="service.component.cpe23" value="cpe:/a:sap:netweaver_application_server:-"/>
   </fingerprint>
 
   <fingerprint pattern="^SQLAnywhere/([\d.]+)$">
diff --git a/xml/telnet_banners.xml b/xml/telnet_banners.xml
index 7328bcee..f78441a3 100644
--- a/xml/telnet_banners.xml
+++ b/xml/telnet_banners.xml
@@ -1845,4 +1845,85 @@
     <param pos="1" name="os.version"/>
   </fingerprint>
 
+  <fingerprint pattern="Telnet Administration (?:\r|\n)+   SAP J2EE Engine v([\d.]+)(?:\r|\n)+">
+    <description>SAP NetWeaver Application Server Java telnet service</description>
+    <!-- ***********************************************
+         **********************************************
+         ****###*******####*****#######**************
+         **##***##****##**##****##****##************
+         ***##*******##****##***##****##**********
+         *****##*****########***######***********
+         ******##****##****##***##*************
+         **##***##**##******##**##************
+         ****###****##******##**##**********
+         **********************************
+         ********************************
+         Telnet Administration
+         SAP J2EE Engine v7.00
+      Login:
+    -->
+
+    <example _encoding="base64" service.version="7.00">
+      KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiogCiAgICoqKi
+      oqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiogCiAgICoqKiojIyMq
+      KioqKioqIyMjIyoqKioqIyMjIyMjIyoqKioqKioqKioqKioqIAogICAqKiMjKioqIyMqKioqIy
+      MqKiMjKioqKiMjKioqKiMjKioqKioqKioqKioqIAogICAqKiojIyoqKioqKiojIyoqKiojIyoq
+      KiMjKioqKiMjKioqKioqKioqKiAKICAgKioqKiojIyoqKioqIyMjIyMjIyMqKiojIyMjIyMqKi
+      oqKioqKioqKiAKICAgKioqKioqIyMqKioqIyMqKioqIyMqKiojIyoqKioqKioqKioqKiogCiAg
+      ICoqIyMqKiojIyoqIyMqKioqKiojIyoqIyMqKioqKioqKioqKiogCiAgICoqKiojIyMqKioqIy
+      MqKioqKiojIyoqIyMqKioqKioqKioqIAogICAqKioqKioqKioqKioqKioqKioqKioqKioqKioq
+      KioqKioqIAogICAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiAKCiAgIFRlbG5ldC
+      BBZG1pbmlzdHJhdGlvbiAKICAgU0FQIEoyRUUgRW5naW5lIHY3LjAwCgoKCkxvZ2luOgo=
+    </example>
+    <param pos="0" name="service.vendor" value="SAP"/>
+    <param pos="0" name="service.product" value="NetWeaver Application Server Java"/>
+    <param pos="0" name="service.family" value="NetWeaver"/>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:sap:netweaver_application_server_java:{service.version}"/>
+    <param pos="0" name="service.component.vendor" value="SAP"/>
+    <param pos="0" name="service.component.product" value="NetWeaver Application Server"/>
+    <param pos="0" name="service.component.cpe23" value="cpe:/a:sap:netweaver_application_server:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="Telnet Administration (?:\r|\n)+   SAP Java EE Application Server v([\d.]+)(?:\r|\n)+">
+    <description>SAP NetWeaver Application Server Java telnet service - newer variant</description>
+    <!-- ***********************************************
+         **********************************************
+         ****###*******####*****#######**************
+         **##***##****##**##****##****##************
+         ***##*******##****##***##****##**********
+         *****##*****########***######***********
+         ******##****##****##***##*************
+         **##***##**##******##**##************
+         ****###****##******##**##**********
+         **********************************
+         ********************************
+         Telnet Administration
+         SAP Java EE Application Server v7.50
+      User name:
+    -->
+
+    <example _encoding="base64" service.version="7.50">
+      KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiogCiAgICoqKi
+      oqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiogCiAgICoqKiojIyMq
+      KioqKioqIyMjIyoqKioqIyMjIyMjIyoqKioqKioqKioqKioqIAogICAqKiMjKioqIyMqKioqIy
+      MqKiMjKioqKiMjKioqKiMjKioqKioqKioqKioqIAogICAqKiojIyoqKioqKiojIyoqKiojIyoq
+      KiMjKioqKiMjKioqKioqKioqKiAKICAgKioqKiojIyoqKioqIyMjIyMjIyMqKiojIyMjIyMqKi
+      oqKioqKioqKiAKICAgKioqKioqIyMqKioqIyMqKioqIyMqKiojIyoqKioqKioqKioqKiogCiAg
+      ICoqIyMqKiojIyoqIyMqKioqKiojIyoqIyMqKioqKioqKioqKiogCiAgICoqKiojIyMqKioqIy
+      MqKioqKiojIyoqIyMqKioqKioqKioqIAogICAqKioqKioqKioqKioqKioqKioqKioqKioqKioq
+      KioqKioqIAogICAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiAKCiAgIFRlbG5ldC
+      BBZG1pbmlzdHJhdGlvbiAKICAgU0FQIEphdmEgRUUgQXBwbGljYXRpb24gU2VydmVyIHY3LjUw
+      CgoKVXNlciBuYW1lOgo=
+    </example>
+    <param pos="0" name="service.vendor" value="SAP"/>
+    <param pos="0" name="service.product" value="NetWeaver Application Server Java"/>
+    <param pos="0" name="service.family" value="NetWeaver"/>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:sap:netweaver_application_server_java:{service.version}"/>
+    <param pos="0" name="service.component.vendor" value="SAP"/>
+    <param pos="0" name="service.component.product" value="NetWeaver Application Server"/>
+    <param pos="0" name="service.component.cpe23" value="cpe:/a:sap:netweaver_application_server:-"/>
+  </fingerprint>
+
 </fingerprints>
\ No newline at end of file