Merge pull request #6081 from sinKettu/more_flexible_tomcat_manager_exposed_panel_template

Tomcat Manager Exposed Panel: more flexible and accurate template

default-logins/apache/tomcat-default-login.yaml

@@ -2,7 +2,7 @@ id: tomcat-default-login
 
 info:
   name: Apache Tomcat Manager Default Login
-  author: pdteam
+  author: pdteam,sinKettu
   severity: high
   description: Apache Tomcat Manager default login credentials were discovered. This template checks for multiple variations.
   reference:
@@ -68,9 +68,21 @@ requests:
         words:
           - "Apache Tomcat"
           - "Server Information"
-          - "Hostname"
         condition: and
 
+      - type: word
+        part: body
+        words:
+          - "Tomcat Version"
+          - "JVM Version"
+          - "JVM Vendor"
+          - "OS Name"
+          - "OS Version"
+          - "OS Architecture"
+          - "Hostname"
+          - "IP Address"
+        condition: or
+
       - type: status
         status:
           - 200