recog 2.3.12 → 2.3.17

data/xml/http_cookies.xml

@@ -156,10 +156,13 @@
   <fingerprint pattern="^DSSignInURL=/">
     <description>Pulse Secure VPN</description>
     <example>DSSignInURL=/; path=/; secure</example>
+    <param pos="0" name="service.vendor" value="Pulse Secure"/>
+    <param pos="0" name="service.product" value="Pulse Connect Secure"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:pulsesecure:pulse_connect_secure:-"/>
     <param pos="0" name="os.vendor" value="Pulse Secure"/>
     <param pos="0" name="os.family" value="SSL-VPN"/>
     <param pos="0" name="os.device" value="SSL-VPN"/>
-    <param pos="0" name="os.product" value="SSL-VPN"/>
+    <param pos="0" name="os.product" value="Pulse Connect Secure"/>
   </fingerprint>
 
   <fingerprint pattern="^(EktGUID|ecm)=.*">

data/xml/http_servers.xml

@@ -20,15 +20,18 @@
     <param pos="1" name="service.version"/>
   </fingerprint>
 
+  <!-- CentOS Web Panel is not part of the CentOS project and runs on CentOS,
+       RedHat, and CloudLinux.
+  -->
+
   <fingerprint pattern="(?i)^cwpsrv$">
     <description>CentOS Web Panel</description>
     <example>cwpsrv</example>
-    <param pos="0" name="service.vendor" value="CentOS"/>
+    <param pos="0" name="service.vendor" value="CentOS WebPanel"/>
     <param pos="0" name="service.product" value="CentOS Web Panel"/>
-    <param pos="0" name="os.vendor" value="CentOS"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:centos-webpanel:centos_web_panel:-"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:centos:centos:-"/>
   </fingerprint>
 
   <fingerprint pattern="^Stronghold/(\d\.\d) Apache/([012][\d.]*)\s*(.*)$">
@@ -437,7 +440,7 @@
     <param pos="0" name="service.component.vendor" value="Red Hat"/>
     <param pos="0" name="service.component.product" value="JBossWeb"/>
     <param pos="2" name="service.component.version"/>
-    <param pos="0" name="service.component.cpe23" value="cpe:/a:redhat:jboss_web_framework_kit:{service.component.version}"/>
+    <param pos="0" name="service.component.cpe23" value="cpe:/a:redhat:jbossweb:{service.component.version}"/>
   </fingerprint>
 
   <fingerprint pattern="^Servlet\/[\d\.]+; JBossAS-(.*)$">
@@ -960,14 +963,14 @@
     <example>ReeCam IP Camera</example>
     <param pos="0" name="hw.vendor" value="Shenzhen Reecam Tech. Ltd."/>
     <param pos="0" name="hw.product" value="ReeCam"/>
-    <param pos="0" name="hw.device" value="Web cam"/>
+    <param pos="0" name="hw.device" value="IP Camera"/>
   </fingerprint>
 
   <fingerprint pattern="^Netwave IP Camera$">
     <description>Netwave cameras</description>
     <example>Netwave IP Camera</example>
     <param pos="0" name="hw.vendor" value="Netwave"/>
-    <param pos="0" name="hw.device" value="Web cam"/>
+    <param pos="0" name="hw.device" value="IP Camera"/>
   </fingerprint>
 
   <fingerprint pattern="^Cougar/([0-9.]*)$">
@@ -1010,7 +1013,7 @@
     <example>camera</example>
     <example>IPCamera Login</example>
     <example>Mini Dome IP Camera</example>
-    <param pos="0" name="hw.device" value="Web cam"/>
+    <param pos="0" name="hw.device" value="IP Camera"/>
   </fingerprint>
 
   <fingerprint pattern="^ASP.NET$">
@@ -1493,6 +1496,7 @@
     <param pos="0" name="service.product" value="Abyss Web Server X1"/>
     <param pos="0" name="service.family" value="Abyss Web Server"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:aprelium:abyss_web_server_x1:{service.version}"/>
     <param pos="0" name="os.vendor" value="Microsoft"/>
     <param pos="0" name="os.family" value="Windows"/>
     <param pos="0" name="os.product" value="Windows"/>
@@ -1505,6 +1509,7 @@
     <param pos="0" name="service.product" value="Abyss Web Server X1"/>
     <param pos="0" name="service.family" value="Abyss Web Server"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:aprelium:abyss_web_server_x1:{service.version}"/>
     <param pos="0" name="os.vendor" value="Microsoft"/>
     <param pos="0" name="os.family" value="Windows"/>
     <param pos="0" name="os.product" value="Windows"/>
@@ -1690,6 +1695,7 @@
     <example>SAP Internet Graphics Server</example>
     <param pos="0" name="service.vendor" value="SAP"/>
     <param pos="0" name="service.product" value="Internet Graphics Server"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:sap:internet_graphics_server:-"/>
     <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:-"/>
@@ -1716,11 +1722,12 @@
     <description>OpenVPN Access Server</description>
     <example>OpenVPN-AS</example>
     <param pos="0" name="service.vendor" value="OpenVPN"/>
-    <param pos="0" name="service.product" value="Access Server"/>
+    <param pos="0" name="service.product" value="OpenVPN Access Server"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:openvpn:openvpn_access_server:-"/>
     <param pos="0" name="hw.device" value="VPN"/>
   </fingerprint>
 
-  <fingerprint pattern="^SonicWALL (SSL-?VPN(?: (?:\d+))?) Web Server\.?$">
+  <fingerprint pattern="^SonicWALL SSL-?VPN Web Server$">
     <description>SonicWALL SSL-VPN device</description>
     <example>SonicWALL SSLVPN Web Server</example>
     <example>SonicWALL SSL-VPN Web Server</example>
@@ -1730,7 +1737,8 @@
     <param pos="0" name="os.vendor" value="SonicWall"/>
     <param pos="0" name="os.device" value="VPN"/>
     <param pos="0" name="os.family" value="SSL-VPN"/>
-    <param pos="1" name="os.product"/>
+    <param pos="0" name="os.product" value="SonicOS"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:sonicwall:sonicos:-"/>
     <param pos="0" name="hw.vendor" value="SonicWall"/>
     <param pos="0" name="hw.device" value="VPN"/>
   </fingerprint>
@@ -1741,6 +1749,12 @@
     <param pos="0" name="service.vendor" value="SonicWall"/>
     <param pos="0" name="service.product" value="HTTP"/>
     <param pos="0" name="os.vendor" value="SonicWall"/>
+    <param pos="0" name="os.device" value="VPN"/>
+    <param pos="0" name="os.family" value="SSL-VPN"/>
+    <param pos="0" name="os.product" value="SonicOS"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:sonicwall:sonicos:-"/>
+    <param pos="0" name="hw.vendor" value="SonicWall"/>
+    <param pos="0" name="hw.device" value="VPN"/>
   </fingerprint>
 
   <fingerprint pattern="^NetCache appliance \(NetApp/+(\d+\.\d+[\w.]+)\)$">
@@ -1756,7 +1770,7 @@
     <param pos="0" name="service.product" value="NetCache"/>
     <param pos="1" name="service.version"/>
     <param pos="0" name="os.vendor" value="Blue Coat"/>
-    <param pos="0" name="os.device" value="Web proxy"/>
+    <param pos="0" name="os.device" value="Web Proxy"/>
     <param pos="0" name="os.family" value="NetCache"/>
     <param pos="0" name="os.product" value="NetCache"/>
   </fingerprint>
@@ -1770,7 +1784,7 @@
     <param pos="0" name="os.vendor" value="NetApp"/>
     <param pos="0" name="os.family" value="Data ONTAP"/>
     <param pos="0" name="os.product" value="Data ONTAP"/>
-    <param pos="0" name="os.device" value="File server"/>
+    <param pos="0" name="os.device" value="File Server"/>
     <param pos="1" name="os.version"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:netapp:data_ontap:{os.version}"/>
   </fingerprint>
@@ -1779,7 +1793,7 @@
     <description>Blue Coat security appliance</description>
     <example>BlueCoat-Security-Appliance</example>
     <param pos="0" name="os.vendor" value="Blue Coat"/>
-    <param pos="0" name="os.device" value="Web proxy"/>
+    <param pos="0" name="os.device" value="Web Proxy"/>
     <param pos="0" name="os.family" value="Blue Coat"/>
     <param pos="0" name="os.product" value="Appliance"/>
   </fingerprint>
@@ -1828,6 +1842,10 @@
     <param pos="0" name="hw.device" value="Printer"/>
   </fingerprint>
 
+  <!-- This section needs to be reworked to extract module / version to make
+       this information useful and mappable to CPE
+  -->
+
   <fingerprint pattern="^HP HTTP Server; (?:Hewlett-Packard )?HP ((\S+) \S+)">
     <description>HP Printer</description>
     <example os.product="Photosmart C309a" os.family="Photosmart">HP HTTP Server; HP Photosmart C309a series - CC335A; Serial Number: abc123; Vader Built:Wed Apr 15, 2009 11:40:58AM {abc123, ASIC id 0x00280004}</example>
@@ -1953,6 +1971,26 @@
     <param pos="0" name="hw.cpe23" value="cpe:/h:cisco:adaptive_security_appliance:-"/>
   </fingerprint>
 
+  <fingerprint pattern="^CE_E$">
+    <description>Cisco Expressway-E (Edge)</description>
+    <example>CE_E</example>
+    <param pos="0" name="service.vendor" value="Cisco"/>
+    <param pos="0" name="service.product" value="Expressway"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:cisco:expressway:-"/>
+    <param pos="0" name="hw.vendor" value="Cisco"/>
+    <param pos="0" name="hw.device" value="VoIP"/>
+  </fingerprint>
+
+  <fingerprint pattern="^CE_C$">
+    <description>Cisco Expressway-C (Core)</description>
+    <example>CE_C</example>
+    <param pos="0" name="service.vendor" value="Cisco"/>
+    <param pos="0" name="service.product" value="Expressway"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:cisco:expressway:-"/>
+    <param pos="0" name="hw.vendor" value="Cisco"/>
+    <param pos="0" name="hw.device" value="VoIP"/>
+  </fingerprint>
+
   <fingerprint pattern="^CradlepointHTTPService/([\d\.]+)$">
     <description>Cradlepoint HTTP service</description>
     <example service.version="1.0.0">CradlepointHTTPService/1.0.0</example>
@@ -2045,7 +2083,7 @@
 
   <fingerprint pattern="^NS_(\d\.\d)$">
     <description>Citrix NetScaler</description>
-    <example>NS_6.1</example>
+    <example service.version="6.1">NS_6.1</example>
     <param pos="0" name="os.vendor" value="Citrix"/>
     <param pos="0" name="os.family" value="NetScaler"/>
     <param pos="0" name="os.device" value="Network Management Device"/>
@@ -2058,6 +2096,14 @@
     <param pos="0" name="service.cpe23" value="cpe:/a:citrix:netscaler:{service.version}"/>
   </fingerprint>
 
+  <fingerprint pattern="^Citrix-([\d.]+) \'[^']*\'$">
+    <description>Citrix STUN server</description>
+    <example service.version="3.2.5.9">Citrix-3.2.5.9 'Marshal West'</example>
+    <param pos="0" name="service.vendor" value="Citrix"/>
+    <param pos="0" name="service.product" value="STUN Server"/>
+    <param pos="1" name="service.version"/>
+  </fingerprint>
+
   <fingerprint pattern="^Rumpus$">
     <description>Rumpus FTP Server, Web File Manager interface</description>
     <example>Rumpus</example>
@@ -2110,7 +2156,7 @@
   <fingerprint pattern="^D-Link MiniAVServer$">
     <description>D-Link embedded web server for web cams</description>
     <param pos="0" name="os.vendor" value="D-Link"/>
-    <param pos="0" name="os.device" value="Web cam"/>
+    <param pos="0" name="os.device" value="IP Camera"/>
   </fingerprint>
 
   <fingerprint pattern="^ListManagerWeb/(\S+) .*$">
@@ -2132,12 +2178,44 @@
     <param pos="0" name="os.cpe23" value="cpe:/o:linux:linux_kernel:-"/>
   </fingerprint>
 
-  <fingerprint pattern="^RealVNC/(?:\S+)$">
+  <fingerprint pattern="^VNC Server (Enterprise|Personal) Edition/(?:E|P)([\d.]+) \(r([\d.]+)\)$">
+    <description>RealVNC built-in webserver - Enterprise edition</description>
+    <example service.version="4.5.1" service.version.version="27892">VNC Server Enterprise Edition/E4.5.1 (r27892)</example>
+    <example service.edition="Personal">VNC Server Personal Edition/P4.5.3 (r39012)</example>
+    <param pos="0" name="service.vendor" value="RealVNC Ltd."/>
+    <param pos="0" name="service.product" value="RealVNC"/>
+    <param pos="1" name="service.edition"/>
+    <param pos="2" name="service.version"/>
+    <param pos="3" name="service.version.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:realvnc:realvnc:{service.version}"/>
+  </fingerprint>
+
+  <fingerprint pattern="^RealVNC/E([\d.]+)$">
+    <description>RealVNC built-in webserver - Enterprise edition, short variant</description>
+    <example service.version="4">RealVNC/E4</example>
+    <param pos="0" name="service.vendor" value="RealVNC Ltd."/>
+    <param pos="0" name="service.product" value="RealVNC"/>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.version.version" value="Enterprise"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:realvnc:realvnc:{service.version}"/>
+  </fingerprint>
+
+  <fingerprint pattern="^RealVNC/([\d.]+)$">
     <description>RealVNC built-in webserver</description>
-    <example>RealVNC/4.0</example>
+    <example service.version="4.0">RealVNC/4.0</example>
     <param pos="0" name="service.vendor" value="RealVNC Ltd."/>
     <param pos="0" name="service.product" value="RealVNC"/>
-    <param pos="0" name="service.cpe23" value="cpe:/a:realvnc:realvnc:-"/>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:realvnc:realvnc:{service.version}"/>
+  </fingerprint>
+
+  <fingerprint pattern="^TigerVNC/([\d.]+)$">
+    <description>TigerVNC built-in webserver</description>
+    <example service.version="4.0">TigerVNC/4.0</example>
+    <param pos="0" name="service.vendor" value="TigerVNC"/>
+    <param pos="0" name="service.product" value="TigerVNC"/>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:tigervnc:tigervnc:{service.version}"/>
   </fingerprint>
 
   <fingerprint pattern="^SecureTransport (\d+[\d\.]+) \(build: (\d+)\)$">
@@ -2284,8 +2362,8 @@
 
   <fingerprint pattern="(?i)^SimpleHTTP/((?:\d+\.)*\d+)\s*Python/((?:\d+\.)*\d+)$">
     <description>SimpleHTTPRequestHandler Python class is a simple HTTP request handler.</description>
-    <example>SimpleHTTP/0.6 Python/2.7.6</example>
-    <example>SimpleHTTP/0.6 Python/3.4.0</example>
+    <example service.version="0.6">SimpleHTTP/0.6 Python/2.7.6</example>
+    <example python.version="3.4.0">SimpleHTTP/0.6 Python/3.4.0</example>
     <param pos="0" name="service.vendor" value="Python Software Foundation"/>
     <param pos="0" name="service.product" value="SimpleHTTP"/>
     <param pos="0" name="service.family" value="Python"/>
@@ -2426,7 +2504,7 @@
   </fingerprint>
 
   <fingerprint pattern="^Sophos Email Appliance$">
-    <description>Embedded web server for a rack-mounted email appliance that blocks spam and malware.</description>
+    <description>Sophos - Embedded web server for a rack-mounted email appliance that blocks spam and malware.</description>
     <example>Sophos Email Appliance</example>
     <param pos="0" name="service.vendor" value="Sophos"/>
     <param pos="0" name="service.product" value="Email Appliance"/>
@@ -2457,7 +2535,7 @@
   </fingerprint>
 
   <fingerprint pattern="^mini_httpd/((?:\d+\.)*\d+) \S*$">
-    <description>A small HTTP server</description>
+    <description>ACME mini_httpd with version and date</description>
     <example>mini_httpd/1.14 23jun2000</example>
     <example>mini_httpd/1 23jun2000</example>
     <param pos="0" name="service.vendor" value="ACME"/>
@@ -2468,8 +2546,8 @@
   </fingerprint>
 
   <fingerprint pattern="^thin ((?:\d+\.)*\d+) codename .+$">
-    <description>A Ruby-based web server.</description>
-    <example>thin 1.2.4 codename Flaming Astroboy</example>
+    <description>Marc-André Cournoyer's thin webserver</description>
+    <example service.version="1.2.4">thin 1.2.4 codename Flaming Astroboy</example>
     <example>thin 1 codename Flaming Astroboy</example>
     <param pos="0" name="service.product" value="Thin"/>
     <param pos="0" name="service.family" value="Thin"/>
@@ -2489,11 +2567,13 @@
 
   <fingerprint pattern="^Mongrel ((?:\d+\.)*\d+)$">
     <description>Ruby-based web server and HTTP library.</description>
-    <example>Mongrel 1.1.5</example>
+    <example service.version="1.1.5">Mongrel 1.1.5</example>
     <example>Mongrel 1</example>
+    <param pos="0" name="service.vendor" value="Zed Shaw"/>
     <param pos="0" name="service.product" value="Mongrel"/>
     <param pos="0" name="service.family" value="Mongrel"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:zed_shaw:mongrel:{service.version}"/>
   </fingerprint>
 
   <fingerprint pattern="^Microplex emHTTPD/((?:\d+\.)*\d+)$">
@@ -2506,7 +2586,7 @@
     <param pos="0" name="service.family" value="emHTTPD"/>
     <param pos="1" name="service.version"/>
     <param pos="0" name="os.vendor" value="Microplex"/>
-    <param pos="0" name="os.device" value="Print server"/>
+    <param pos="0" name="os.device" value="Print Server"/>
   </fingerprint>
 
   <fingerprint pattern="^UPS_Server/((?:\d+\.)*\d+)$">
@@ -2532,7 +2612,7 @@
 
   <fingerprint pattern="^JC-SHTTPD/((?:\d+\.)*\d+)$">
     <description>An embedded web server.</description>
-    <example>JC-SHTTPD/1.17.20</example>
+    <example service.version="1.17.20">JC-SHTTPD/1.17.20</example>
     <example>JC-SHTTPD/1</example>
     <param pos="0" name="service.product" value="JC-SHTTPD"/>
     <param pos="0" name="service.family" value="JC-SHTTPD"/>
@@ -2605,17 +2685,20 @@
 
   <fingerprint pattern="^WEBrick/([\d\.]+) .*$">
     <description>WEBrick default setup</description>
-    <example>WEBrick/1.3.1 (Ruby/1.9.3/2013-02-22)</example>
-    <param pos="0" name="service.vendor" value="Ruby"/>
+    <example service.version="1.3.1">WEBrick/1.3.1 (Ruby/1.9.3/2013-02-22)</example>
+    <param pos="0" name="service.vendor" value="Ruby-Lang"/>
     <param pos="0" name="service.product" value="WEBrick"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:ruby-lang:webrick:{service.version}"/>
   </fingerprint>
 
   <fingerprint pattern="^Aspen/(\S+)">
     <description>Aspen web server</description>
     <example service.version="0.8">Aspen/0.8</example>
+    <param pos="0" name="service.vendor" value="Aspen"/>
     <param pos="0" name="service.product" value="Aspen"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:aspen:aspen:{service.version}"/>
   </fingerprint>
 
   <fingerprint pattern="^Boa/([\d\.]+\S*)">
@@ -2711,7 +2794,7 @@
     <param pos="0" name="service.vendor" value="Akamai"/>
     <param pos="0" name="service.product" value="GHost"/>
     <param pos="0" name="os.vendor" value="Akamai"/>
-    <param pos="0" name="os.device" value="Web proxy"/>
+    <param pos="0" name="os.device" value="Web Proxy"/>
   </fingerprint>
 
   <fingerprint pattern="^gws$">
@@ -2845,6 +2928,7 @@
     <param pos="0" name="service.product" value="Intel(R) Active Management Technology"/>
     <param pos="0" name="service.family" value="Intel(R) Active Management Technology"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:intel:active_management_technology:{service.version}"/>
   </fingerprint>
 
   <fingerprint pattern="^(?:AMT|Intel\(R\) Active Management Technology)$">
@@ -2854,6 +2938,7 @@
     <param pos="0" name="service.vendor" value="Intel"/>
     <param pos="0" name="service.product" value="Intel(R) Active Management Technology"/>
     <param pos="0" name="service.family" value="Intel(R) Active Management Technology"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:intel:active_management_technology:-"/>
   </fingerprint>
 
   <fingerprint pattern="^Intel\(R\) Standard Manageability\s(\d+\.\d+\.\d+\.\d+|\d+\.\d+\.\d+|\d+\.\d+)">
@@ -2864,17 +2949,20 @@
     <param pos="0" name="service.product" value="Intel(R) Standard Manageability"/>
     <param pos="0" name="service.family" value="Intel(R) Active Management Technology"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:intel:standard_manageability:{service.version}"/>
   </fingerprint>
 
   <fingerprint pattern="^Sunny WebBox$">
     <description>Sunny WebBox</description>
     <example>Sunny WebBox</example>
-    <param pos="0" name="service.vendor" value="SMA Solar Technology Ag"/>
+    <param pos="0" name="service.vendor" value="SMA"/>
     <param pos="0" name="service.family" value="Sunny"/>
-    <param pos="0" name="service.product" value="WebBox"/>
+    <param pos="0" name="service.product" value="Sunny WebBox"/>
+    <param pos="0" name="hw.vendor" value="SMA"/>
     <param pos="0" name="hw.family" value="Sunny"/>
-    <param pos="0" name="hw.product" value="WebBox"/>
-    <param pos="0" name="hw.device" value="Power device"/>
+    <param pos="0" name="hw.product" value="Sunny WebBox"/>
+    <param pos="0" name="hw.device" value="Power Device"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:sma:sunny_webbox:-"/>
     <param pos="0" name="os.vendor" value="Microsoft"/>
     <param pos="0" name="os.family" value="Windows"/>
     <param pos="0" name="os.product" value="Windows CE"/>
@@ -2886,7 +2974,7 @@
     <example>EnergyICT RTU 101-F25CE1-1524</example>
     <param pos="0" name="hw.family" value="Honeywell"/>
     <param pos="0" name="hw.product" value="RTU"/>
-    <param pos="0" name="hw.device" value="Power device"/>
+    <param pos="0" name="hw.device" value="Power Device"/>
   </fingerprint>
 
   <fingerprint pattern="^AV-TECH AV787 Video Web Server$">
@@ -2988,11 +3076,13 @@
 
   <fingerprint pattern="(?i)^Linux/(\S+) UPnP/[\d\.]+ miniupnpd/([\d\.]+)$">
     <description>Linux MiniUPnPd UPnP Server</description>
-    <example>Linux/Cross_compiled UPnP/1.0 miniupnpd/1.0</example>
+    <example service.version="1.0">Linux/Cross_compiled UPnP/1.0 miniupnpd/1.0</example>
     <example>Linux/2.6.29.6-217.2.3.fc11.i686.PAE UPnP/1.0 miniupnpd/1.0</example>
     <example>Linux/2.4.21 UPnP/1.0 miniupnpd/1.0</example>
+    <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
     <param pos="0" name="service.product" value="MiniUPnP"/>
     <param pos="2" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
     <param pos="0" name="os.vendor" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="1" name="os.version"/>
@@ -3001,28 +3091,32 @@
 
   <fingerprint pattern="^Tomato UPnP/\S+ MiniUPnPd/(\S+)$">
     <description>Tomato UPnP Server</description>
-    <example>Tomato UPnP/1.0 MiniUPnPd/1.2</example>
-    <example>Tomato UPnP/1.0 MiniUPnPd/1.4</example>
-    <param pos="0" name="service.vendor" value="Tomato"/>
+    <example service.version="1.2">Tomato UPnP/1.0 MiniUPnPd/1.2</example>
+    <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
     <param pos="0" name="service.product" value="MiniUPnP"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
   </fingerprint>
 
-  <fingerprint pattern="(?i)^(RT-\w+) UPnP/\S+ MiniUPnPd/(\S+)$">
+  <fingerprint pattern="(?i)^(RT-\w+) UPnP/\S+ MiniUPnPd/([\d.]+)$">
     <description>Asus WAP UPnP Server</description>
-    <example>RT-G32 UPnP/1.0 MiniUPnPd/1.2</example>
+    <example service.version="1.2">RT-G32 UPnP/1.0 MiniUPnPd/1.2</example>
+    <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
     <param pos="0" name="service.product" value="MiniUPnP"/>
     <param pos="2" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
     <param pos="0" name="os.vendor" value="Asus"/>
     <param pos="1" name="os.product"/>
     <param pos="0" name="os.device" value="WAP"/>
   </fingerprint>
 
-  <fingerprint pattern="(?i)^DrayTek/Vigor(\S+) UPnP/\S+ miniupnpd/(\S+)$">
+  <fingerprint pattern="(?i)^DrayTek/Vigor(\S+) UPnP/\S+ miniupnpd/([\d.]+)$">
     <description>DrayTek Vigor router UPnP Server</description>
-    <example hw.model="2130">DrayTek/Vigor2130 UPnP/1.0 miniupnpd/1.0</example>
+    <example service.version="1.0" hw.model="2130">DrayTek/Vigor2130 UPnP/1.0 miniupnpd/1.0</example>
+    <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
     <param pos="0" name="service.product" value="MiniUPnP"/>
     <param pos="2" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
     <param pos="0" name="hw.vendor" value="DrayTek"/>
     <param pos="0" name="hw.product" value="Vigor"/>
     <param pos="1" name="hw.model"/>
@@ -3033,29 +3127,33 @@
     <description>Huawei Echolife / Home Gateway (and possibly other) devices with UPnP</description>
     <example>Linux UPnP/1.0 Huawei-ATP-IGD</example>
     <param pos="0" name="hw.vendor" value="Huawei"/>
-    <param pos="0" name="hw.device" value="Broadband router"/>
+    <param pos="0" name="hw.device" value="Broadband Router"/>
   </fingerprint>
 
-  <fingerprint pattern="(?i)^OpenWRT/kamikaze UPnP/\S+ MiniUPnPd/(\S+)$">
+  <fingerprint pattern="(?i)^OpenWRT/kamikaze UPnP/\S+ MiniUPnPd/([\d.]+)$">
     <description>OpenWRT Kamikaze WAP UPnP Server</description>
-    <example>OpenWRT/kamikaze UPnP/1.0 MiniUPnPd/1.5</example>
-    <example>OpenWRT/kamikaze UPnP/1.0 MiniUPnPd/1.2</example>
-    <example>OpenWRT/kamikaze UPnP/1.0 MiniUPnPd/1.4</example>
+    <example service.version="1.5">OpenWRT/kamikaze UPnP/1.0 MiniUPnPd/1.5</example>
+    <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
     <param pos="0" name="service.product" value="MiniUPnP"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
     <param pos="0" name="os.vendor" value="Linux"/>
     <param pos="0" name="os.family" value="OpenWRT"/>
     <param pos="0" name="os.product" value="Kamikaze"/>
     <param pos="0" name="os.device" value="WAP"/>
   </fingerprint>
 
-  <fingerprint pattern="(?i)^Netgear/\S+ UPnP/\S+ miniupnpd/(\S+)$">
+  <fingerprint pattern="(?i)^Netgear/\S+ UPnP/\S+ miniupnpd/([\d.]+)$">
     <description>Netgear DG834G or WNDR3300 WAP UPnP Server</description>
-    <example>Netgear/1.0 UPnP/1.0 miniupnpd/1.0</example>
+    <example service.version="1.0">Netgear/1.0 UPnP/1.0 miniupnpd/1.0</example>
+    <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
     <param pos="0" name="service.product" value="MiniUPnP"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
     <param pos="0" name="os.vendor" value="Netgear"/>
     <param pos="0" name="os.device" value="WAP"/>
+    <param pos="0" name="hw.vendor" value="Netgear"/>
+    <param pos="0" name="hw.device" value="WAP"/>
   </fingerprint>
 
   <fingerprint pattern="^[^/]+/(\S+) DLNADOC/\S+ UPnP/\S+ MiniDLNA/(\S+)$">
@@ -3075,8 +3173,10 @@
     <description>miniupnpd on a Debian variant</description>
     <example os.version="wheezy/sid" service.version="1.8">Debian/wheezy/sid UPnP/1.1 MiniUPnPd/1.8</example>
     <example os.version="4.0" service.version="1.0">Debian/4.0 UPnP/1.0 miniupnpd/1.0</example>
+    <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
     <param pos="0" name="service.product" value="MiniUPnP"/>
     <param pos="2" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
     <param pos="0" name="os.vendor" value="Debian"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.certainty" value="0.5"/>
@@ -3089,8 +3189,10 @@
     <example os.version="10" service.version="1.4">Fedora/10 UPnP/1.0 MiniUPnPd/1.4</example>
     <example os.version="8" service.version="1.0">Fedora/8 UPnP/1.0 miniupnpd/1.0</example>
     <example os.version="6" service.version="1.0">FedoraCore/6 UPnP/1.0 miniupnpd/1.0</example>
+    <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
     <param pos="0" name="service.product" value="MiniUPnP"/>
     <param pos="2" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.vendor" value="Red Hat"/>
     <param pos="0" name="os.product" value="Fedora Core Linux"/>
@@ -3104,8 +3206,10 @@
     <example os.version="10.10" service.version="1.0">Ubuntu/10.10 UPnP/1.0 miniupnpd/1.0</example>
     <example os.version="7.10" service.version="1.0">Ubuntu/7.10 UPnP/1.0 miniupnpd/1.0</example>
     <example os.version="9.04" service.version="1.0">Ubuntu/9.04 UPnP/1.0 miniupnpd/1.0</example>
+    <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
     <param pos="0" name="service.product" value="MiniUPnP"/>
     <param pos="2" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
     <param pos="0" name="os.vendor" value="Ubuntu"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="1" name="os.version"/>
@@ -3115,8 +3219,10 @@
   <fingerprint pattern="(?i)^Ubuntu\/bionic UPnP/\S+ MiniUPnPd/(\S+)$">
     <description>miniupnpd on an Ubuntu bionic/18.04</description>
     <example os.version="18.04" service.version="1.4">Ubuntu/bionic UPnP/1.0 MiniUPnPd/1.4</example>
+    <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
     <param pos="0" name="service.product" value="MiniUPnP"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
     <param pos="0" name="os.vendor" value="Ubuntu"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.version" value="18.04"/>
@@ -3126,8 +3232,10 @@
   <fingerprint pattern="(?i)^Ubuntu\/yakkety UPnP/\S+ MiniUPnPd/(\S+)$">
     <description>miniupnpd on an Ubuntu yakkety/16.10</description>
     <example os.version="16.10" service.version="1.4">Ubuntu/yakkety UPnP/1.0 MiniUPnPd/1.4</example>
+    <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
     <param pos="0" name="service.product" value="MiniUPnP"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
     <param pos="0" name="os.vendor" value="Ubuntu"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.version" value="16.10"/>
@@ -3137,8 +3245,10 @@
   <fingerprint pattern="(?i)^Ubuntu\/xenial UPnP/\S+ MiniUPnPd/(\S+)$">
     <description>miniupnpd on an Ubuntu xenial/16.04</description>
     <example os.version="16.04" service.version="1.4">Ubuntu/xenial UPnP/1.0 MiniUPnPd/1.4</example>
+    <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
     <param pos="0" name="service.product" value="MiniUPnP"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
     <param pos="0" name="os.vendor" value="Ubuntu"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.version" value="16.04"/>
@@ -3148,8 +3258,10 @@
   <fingerprint pattern="(?i)^Ubuntu\/utopic UPnP/\S+ MiniUPnPd/(\S+)$">
     <description>miniupnpd on an Ubuntu utopic/14.10</description>
     <example os.version="14.10" service.version="1.4">Ubuntu/utopic UPnP/1.0 MiniUPnPd/1.4</example>
+    <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
     <param pos="0" name="service.product" value="MiniUPnP"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
     <param pos="0" name="os.vendor" value="Ubuntu"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.version" value="14.10"/>
@@ -3159,8 +3271,10 @@
   <fingerprint pattern="(?i)^Ubuntu\/trusty UPnP/\S+ MiniUPnPd/(\S+)$">
     <description>miniupnpd on an Ubuntu trusty/14.04</description>
     <example os.version="14.04" service.version="1.4">Ubuntu/trusty UPnP/1.0 MiniUPnPd/1.4</example>
+    <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
     <param pos="0" name="service.product" value="MiniUPnP"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
     <param pos="0" name="os.vendor" value="Ubuntu"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.version" value="14.04"/>
@@ -3170,8 +3284,10 @@
   <fingerprint pattern="(?i)^Ubuntu\/saucy UPnP/\S+ MiniUPnPd/(\S+)$">
     <description>miniupnpd on an Ubuntu saucy/13.10</description>
     <example os.version="13.10" service.version="1.4">Ubuntu/saucy UPnP/1.0 MiniUPnPd/1.4</example>
+    <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
     <param pos="0" name="service.product" value="MiniUPnP"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
     <param pos="0" name="os.vendor" value="Ubuntu"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.version" value="13.10"/>
@@ -3181,8 +3297,10 @@
   <fingerprint pattern="(?i)^Ubuntu\/raring UPnP/\S+ MiniUPnPd/(\S+)$">
     <description>miniupnpd on an Ubuntu raring/13.04</description>
     <example os.version="13.04" service.version="1.4">Ubuntu/raring UPnP/1.0 MiniUPnPd/1.4</example>
+    <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
     <param pos="0" name="service.product" value="MiniUPnP"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
     <param pos="0" name="os.vendor" value="Ubuntu"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.version" value="13.04"/>
@@ -3192,8 +3310,10 @@
   <fingerprint pattern="(?i)^Ubuntu\/quantal UPnP/\S+ MiniUPnPd/(\S+)$">
     <description>miniupnpd on an Ubuntu quantal/12.10</description>
     <example os.version="12.10" service.version="1.4">Ubuntu/quantal UPnP/1.0 MiniUPnPd/1.4</example>
+    <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
     <param pos="0" name="service.product" value="MiniUPnP"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
     <param pos="0" name="os.vendor" value="Ubuntu"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.version" value="12.10"/>
@@ -3203,8 +3323,10 @@
   <fingerprint pattern="(?i)^Ubuntu\/precise UPnP/\S+ MiniUPnPd/(\S+)$">
     <description>miniupnpd on an Ubuntu precise/12.04</description>
     <example os.version="12.04" service.version="1.4">Ubuntu/precise UPnP/1.0 MiniUPnPd/1.4</example>
+    <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
     <param pos="0" name="service.product" value="MiniUPnP"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
     <param pos="0" name="os.vendor" value="Ubuntu"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.version" value="12.04"/>
@@ -3214,8 +3336,10 @@
   <fingerprint pattern="(?i)^Ubuntu\/oneiric UPnP/\S+ MiniUPnPd/(\S+)$">
     <description>miniupnpd on an Ubuntu oneiric/11.10</description>
     <example os.version="11.10" service.version="1.4">Ubuntu/oneiric UPnP/1.0 MiniUPnPd/1.4</example>
+    <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
     <param pos="0" name="service.product" value="MiniUPnP"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
     <param pos="0" name="os.vendor" value="Ubuntu"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.version" value="11.10"/>
@@ -3225,8 +3349,10 @@
   <fingerprint pattern="(?i)^Ubuntu\/natty UPnP/\S+ MiniUPnPd/(\S+)$">
     <description>miniupnpd on an Ubuntu natty/11.04</description>
     <example os.version="11.04" service.version="1.4">Ubuntu/natty UPnP/1.0 MiniUPnPd/1.4</example>
+    <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
     <param pos="0" name="service.product" value="MiniUPnP"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
     <param pos="0" name="os.vendor" value="Ubuntu"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.version" value="11.04"/>
@@ -3236,8 +3362,10 @@
   <fingerprint pattern="(?i)^Ubuntu\/maverick UPnP/\S+ MiniUPnPd/(\S+)$">
     <description>miniupnpd on an Ubuntu maverick/10.10</description>
     <example os.version="10.10" service.version="1.4">Ubuntu/maverick UPnP/1.0 MiniUPnPd/1.4</example>
+    <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
     <param pos="0" name="service.product" value="MiniUPnP"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
     <param pos="0" name="os.vendor" value="Ubuntu"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.version" value="10.10"/>
@@ -3247,8 +3375,10 @@
   <fingerprint pattern="(?i)^Ubuntu\/lucid UPnP/\S+ MiniUPnPd/(\S+)$">
     <description>miniupnpd on an Ubuntu lucid/10.04</description>
     <example os.version="10.04" service.version="1.4">Ubuntu/lucid UPnP/1.0 MiniUPnPd/1.4</example>
+    <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
     <param pos="0" name="service.product" value="MiniUPnP"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
     <param pos="0" name="os.vendor" value="Ubuntu"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.version" value="10.04"/>
@@ -3258,8 +3388,10 @@
   <fingerprint pattern="(?i)^Ubuntu\/karmic UPnP/\S+ MiniUPnPd/(\S+)$">
     <description>miniupnpd on an Ubuntu karmic/9.10</description>
     <example os.version="9.10" service.version="1.4">Ubuntu/karmic UPnP/1.0 MiniUPnPd/1.4</example>
+    <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
     <param pos="0" name="service.product" value="MiniUPnP"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
     <param pos="0" name="os.vendor" value="Ubuntu"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.version" value="9.10"/>
@@ -3269,8 +3401,10 @@
   <fingerprint pattern="(?i)^Ubuntu\/jaunty UPnP/\S+ MiniUPnPd/(\S+)$">
     <description>miniupnpd on an Ubuntu jaunty/9.04</description>
     <example os.version="9.04" service.version="1.4">Ubuntu/jaunty UPnP/1.0 MiniUPnPd/1.4</example>
+    <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
     <param pos="0" name="service.product" value="MiniUPnP"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
     <param pos="0" name="os.vendor" value="Ubuntu"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.version" value="9.04"/>
@@ -3280,8 +3414,10 @@
   <fingerprint pattern="(?i)^Ubuntu\/hardy UPnP/\S+ MiniUPnPd/(\S+)$">
     <description>miniupnpd on an Ubuntu hardy/8.04</description>
     <example os.version="8.04" service.version="1.4">Ubuntu/hardy UPnP/1.0 MiniUPnPd/1.4</example>
+    <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
     <param pos="0" name="service.product" value="MiniUPnP"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
     <param pos="0" name="os.vendor" value="Ubuntu"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.version" value="8.04"/>
@@ -3291,8 +3427,10 @@
   <fingerprint pattern="(?i)^Linux Mips (\S+) UPnP/\S+ MiniUPnPd/(\S+)$">
     <description>Linux MIPS UPnP Server</description>
     <example>Linux Mips 2.4.20 UPnP/1.0 MiniUPnPd/1.2</example>
+    <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
     <param pos="0" name="service.product" value="MiniUPnP"/>
     <param pos="2" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
     <param pos="0" name="os.vendor" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="1" name="os.version"/>
@@ -3306,8 +3444,10 @@
     <param pos="0" name="os.product" value="SmoothWall"/>
     <param pos="1" name="os.version"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:smoothwall:smoothwall:{os.version}"/>
+    <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
     <param pos="0" name="service.product" value="MiniUPnP"/>
     <param pos="2" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
   </fingerprint>
 
   <fingerprint pattern="^(\S+) \d+/Service Pack \d+, UPnP/[\d\.]+, TVersity Media Server$">
@@ -3370,25 +3510,13 @@
 
   <fingerprint pattern="^Windows_7-x86-(\S+), UPnP/[\d\.]+, PMS/([\d\.]+)$">
     <description>PlayStation3 Media Server UPnP Server - Windows 7 x86</description>
-    <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.20</example>
+    <example service.version="1.20">Windows_7-x86-6.1, UPnP/1.0, PMS/1.20</example>
     <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.22.0</example>
-    <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.25.1</example>
-    <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.51.0</example>
     <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.20.412</example>
     <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.71.0</example>
     <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.20.409</example>
     <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.72.0</example>
     <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.10.51</example>
-    <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.40.0</example>
-    <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.53.0</example>
-    <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.52.0</example>
-    <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.50.1</example>
-    <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.30.1</example>
-    <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.50.0</example>
-    <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.54.0</example>
-    <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.52.1</example>
-    <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.60.0</example>
-    <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.70.1</example>
     <param pos="0" name="service.vendor" value="Sony"/>
     <param pos="0" name="service.product" value="PMS"/>
     <param pos="2" name="service.version"/>
@@ -3494,10 +3622,59 @@
     <param pos="0" name="os.device" value="Router"/>
   </fingerprint>
 
-  <fingerprint pattern="^TBS/R2 UPnP/[\d\.]+ MiniUPnPd/[\d\.]+$">
+  <fingerprint pattern="Linux, WEBACCESS/1.0, (DIR-\d+\w*) Ver (\S+)$">
+    <description>D-Link DIR-XXX Router - WEBACCESS variant</description>
+    <example hw.product="DIR-850L">Linux, WEBACCESS/1.0, DIR-850L Ver 1.09</example>
+    <example os.version="1.14WW">Linux, WEBACCESS/1.0, DIR-850L Ver 1.14WW</example>
+    <example os.version="1.04">Linux, WEBACCESS/1.0, DIR-645 Ver 1.04</example>
+    <param pos="0" name="hw.vendor" value="D-Link"/>
+    <param pos="1" name="hw.product"/>
+    <param pos="0" name="hw.device" value="Router"/>
+    <param pos="0" name="os.vendor" value="D-Link"/>
+    <param pos="2" name="os.version"/>
+    <param pos="0" name="os.device" value="Router"/>
+  </fingerprint>
+
+  <fingerprint pattern="Linux, HTTP/1.1, (DIR-\d+\w*) Ver (\S+)$">
+    <description>D-Link DIR-XXX Router - HTTP variant</description>
+    <example hw.product="DIR-815" os.version="1.04">Linux, HTTP/1.1, DIR-815 Ver 1.04</example>
+    <param pos="0" name="hw.vendor" value="D-Link"/>
+    <param pos="1" name="hw.product"/>
+    <param pos="0" name="hw.device" value="Router"/>
+    <param pos="0" name="os.vendor" value="D-Link"/>
+    <param pos="2" name="os.version"/>
+    <param pos="0" name="os.device" value="Router"/>
+  </fingerprint>
+
+  <fingerprint pattern="Linux, WEBACCESS/1.0, (DSL-\d+\w*) Ver (\S+)$">
+    <description>D-Link DSL-XXX Router - WEBACCESS variant</description>
+    <example hw.product="DSL-2890AL" os.version="AU_1.02.10">Linux, WEBACCESS/1.0, DSL-2890AL Ver AU_1.02.10</example>
+    <example hw.product="DSL-2890AL" os.version="1.01">Linux, WEBACCESS/1.0, DSL-2890AL Ver 1.01</example>
+    <param pos="0" name="hw.vendor" value="D-Link"/>
+    <param pos="1" name="hw.product"/>
+    <param pos="0" name="hw.device" value="Router"/>
+    <param pos="0" name="os.vendor" value="D-Link"/>
+    <param pos="2" name="os.version"/>
+    <param pos="0" name="os.device" value="Router"/>
+  </fingerprint>
+
+  <fingerprint pattern="^TBS/R2 UPnP/[\d\.]+ MiniUPnPd/([\d\.]+)$">
     <description>D-Link generic</description>
-    <example>TBS/R2 UPnP/1.0 MiniUPnPd/1.2</example>
+    <example service.version="1.2">TBS/R2 UPnP/1.0 MiniUPnPd/1.2</example>
     <param pos="0" name="hw.vendor" value="D-Link"/>
+    <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
+    <param pos="0" name="service.product" value="MiniUPnP"/>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
+  </fingerprint>
+
+  <fingerprint pattern="^alphapd/(\d\.[\d.]+)$">
+    <description>D-Link alphapd - likely DCS series cameras</description>
+    <example service.version="2.1.8">alphapd/2.1.8</example>
+    <param pos="0" name="hw.vendor" value="D-Link"/>
+    <param pos="0" name="service.vendor" value="D-Link"/>
+    <param pos="0" name="service.product" value="alphapd"/>
+    <param pos="1" name="service.version"/>
   </fingerprint>
 
   <fingerprint pattern="^ipos/([\d\.]+) UPnP/[\d\.]+ (TL-\w+)/(\S+)$">
@@ -3537,7 +3714,7 @@
     <description>Steinsvik Orbit IP Camera (Truen TCAM Rebrand)</description>
     <example>Linux/2.6.28.9-Mozart-8G, UPnP/1.0, Portable SDK for UPnP devices/1.6.6</example>
     <param pos="0" name="hw.vendor" value="Steinsvik"/>
-    <param pos="0" name="hw.device" value="Web cam"/>
+    <param pos="0" name="hw.device" value="IP Camera"/>
     <param pos="0" name="hw.product" value="Orbit IP Camera"/>
     <param pos="0" name="os.vendor" value="Steinsvik"/>
     <param pos="0" name="os.family" value="Linux"/>
@@ -3567,9 +3744,9 @@
     <description>Axis Network Camera</description>
     <example>Linux/4.9.94-axis5, UPnP/1.0, Portable SDK for UPnP devices/1.6.22</example>
     <param pos="0" name="hw.vendor" value="AXIS"/>
-    <param pos="0" name="hw.device" value="Web cam"/>
+    <param pos="0" name="hw.device" value="IP Camera"/>
     <param pos="0" name="os.vendor" value="AXIS"/>
-    <param pos="0" name="os.device" value="Web cam"/>
+    <param pos="0" name="os.device" value="IP Camera"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="1" name="os.version"/>
@@ -3684,12 +3861,16 @@
     <param pos="1" name="hw.version"/>
   </fingerprint>
 
-  <fingerprint pattern="^Roku UPnP/\S+ MiniUPnPd/\S+$">
+  <fingerprint pattern="^Roku UPnP/\S+ MiniUPnPd/([\d\.]+)$">
     <description>Roku without a version</description>
-    <example>Roku UPnP/1.0 MiniUPnPd/1.4</example>
+    <example service.version="1.4">Roku UPnP/1.0 MiniUPnPd/1.4</example>
     <param pos="0" name="hw.vendor" value="Roku"/>
     <param pos="0" name="hw.product" value="Roku"/>
     <param pos="0" name="hw.device" value="Media Server"/>
+    <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
+    <param pos="0" name="service.product" value="MiniUPnP"/>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
   </fingerprint>
 
   <fingerprint pattern="^UPnP/\S+, DLNADOC/\S+, Platinum/(\S+)$">
@@ -3812,7 +3993,7 @@
     <description>ANNKE IP Camera</description>
     <example>MWS 0.01</example>
     <param pos="0" name="hw.vendor" value="ANNKE"/>
-    <param pos="0" name="hw.device" value="Web cam"/>
+    <param pos="0" name="hw.device" value="IP Camera"/>
     <param pos="0" name="hw.product" value="IP Camera"/>
   </fingerprint>
 
@@ -3902,12 +4083,12 @@
     <example>Xfinity Broadband Router Server</example>
     <param pos="0" name="hw.vendor" value="Comcast"/>
     <param pos="0" name="hw.product" value="Xfinity Broadband Router"/>
-    <param pos="0" name="hw.device" value="Broadband router"/>
+    <param pos="0" name="hw.device" value="Broadband Router"/>
   </fingerprint>
 
   <fingerprint pattern="^IX Series IX21\d\d \(magellan-sec\) Software, Version ([^, ]+), (?:MAINTENANCE )?RELEASE SOFTWARE$">
     <description>NEC Univerge Router - enterprise class with VPN, UTM, etc</description>
-    <example>IX Series IX2106 (magellan-sec) Software, Version 10.2.20, RELEASE SOFTWARE</example>
+    <example hw.version="10.2.20">IX Series IX2106 (magellan-sec) Software, Version 10.2.20, RELEASE SOFTWARE</example>
     <example>IX Series IX2105 (magellan-sec) Software, Version 9.6.12A, MAINTENANCE RELEASE SOFTWARE</example>
     <param pos="0" name="hw.vendor" value="NEC"/>
     <param pos="0" name="hw.product" value="Univerge"/>
@@ -3916,4 +4097,92 @@
     <param pos="0" name="hw.cpe23" value="cpe:/h:nec:univerge:{hw.version}"/>
   </fingerprint>
 
+  <fingerprint pattern="^Caddy$">
+    <description>CaddyServer Caddy - golang based httpd</description>
+    <example>Caddy</example>
+    <param pos="0" name="service.vendor" value="CaddyServer"/>
+    <param pos="0" name="service.product" value="Caddy"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:caddyserver:caddy:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^MoxaHttp/(\d\.\d)$">
+    <description>Moxa devices - service used on multiple families of devices</description>
+    <example service.version="2.3">MoxaHttp/2.3</example>
+    <example>MoxaHttp/2.2</example>
+    <example>MoxaHttp/1.0</example>
+    <param pos="0" name="service.vendor" value="Moxa"/>
+    <param pos="0" name="service.product" value="httpd"/>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="hw.vendor" value="Moxa"/>
+    <param pos="0" name="os.vendor" value="Moxa"/>
+  </fingerprint>
+
+  <fingerprint pattern="^proxygen-bolt$">
+    <description>Facebook Proxygen httpd software</description>
+    <example>proxygen-bolt</example>
+    <param pos="0" name="service.vendor" value="Facebook"/>
+    <param pos="0" name="service.product" value="Proxygen"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:facebook:proxygen:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Kerio Connect ([\d.]+)(?: patch (\d))?$">
+    <description>GFI Kerio Connect</description>
+    <example service.version="8.2.2">Kerio Connect 8.2.2</example>
+    <example service.version="9.2.12" service.version.version="1">Kerio Connect 9.2.12 patch 1</example>
+    <param pos="0" name="service.vendor" value="GFI"/>
+    <param pos="0" name="service.product" value="Kerio Connect"/>
+    <param pos="1" name="service.version"/>
+    <param pos="2" name="service.version.version"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Kerio Control Embedded Web Server$">
+    <description>GFI Kerio Control - embedded web server</description>
+    <example>Kerio Control Embedded Web Server</example>
+    <param pos="0" name="service.vendor" value="GFI"/>
+    <param pos="0" name="service.product" value="Kerio Control"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:gfi:kerio_control:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Mongoose/([\d.]+)$">
+    <description>Cesanta Mongoose embedded web server / networking library</description>
+    <example service.version="6.7.1">Mongoose/6.7.1</example>
+    <param pos="0" name="service.vendor" value="Cesanta"/>
+    <param pos="0" name="service.product" value="Mongoose"/>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:cesanta:mongoose:{service.version}"/>
+  </fingerprint>
+
+  <fingerprint pattern="^kangle/([\d.]+)$">
+    <description>Bangteng Kangle web server</description>
+    <example service.version="3.5.21.9">kangle/3.5.21.9</example>
+    <param pos="0" name="service.vendor" value="Bangteng"/>
+    <param pos="0" name="service.product" value="Kangle"/>
+    <param pos="1" name="service.version"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Werkzeug/([\d.]+) Python/([\d.]+)$">
+    <description>PalletsProjects Werkzeug web server</description>
+    <example service.version="0.14.1" python.version="3.6.9">Werkzeug/0.14.1 Python/3.6.9</example>
+    <param pos="0" name="service.vendor" value="PalletsProjects"/>
+    <param pos="0" name="service.product" value="Werkzeug"/>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:palletsprojects:werkzeug:{service.version}"/>
+    <param pos="2" name="python.version"/>
+  </fingerprint>
+
+  <!-- This is a version of ACME mini_httpd where the value 'mini_httpd' has been
+      replaced with a UUID in the Server header AND body of the response. It
+      is likely vendor or product specific.
+  -->
+
+  <fingerprint pattern="^[a-f\d]{7,8}-[a-f\d]{3,4}-[a-f\d]{3,4}-[a-f\d]{3,4}-[a-f\d]{10,12}$">
+    <description>ACME mini_httpd with randomized Server header</description>
+    <example>a74b7cd4-4a4e-4115-7a48-1c7ebb4ae45b</example>
+    <example>f09f73f0-cac6-422-3660-32ac658c5ae7</example>
+    <example>f24ddd9c-e2a6-23c-ec95-4563173bbe</example>
+    <param pos="0" name="service.vendor" value="ACME"/>
+    <param pos="0" name="service.product" value="mini_httpd"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:acme:mini_httpd:-"/>
+  </fingerprint>
+
 </fingerprints>