recog 2.3.12 → 2.3.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 477c1b984da6788f9acbe0f8868fe07b500c0a6c9b94691a23535befba43b912
4
- data.tar.gz: a23f96a8ae8212ba1521455ccbfbe60f355706eb04fbe309768cd538a5ff90a6
3
+ metadata.gz: bcb38d92e99f80970a8d4eec2abb80816d4c127b4d107106fde5d5c07aabb152
4
+ data.tar.gz: 0da9a345449f4a1ee5d15b707e9e6ca22f9605e18a90bdd4901bccef4e7662bb
5
5
  SHA512:
6
- metadata.gz: b758ee85f8fb433fb2d0ef8ad07e627bb941ad86d5d3f07ebb768ecda8c8a00521e37c0dff81e5e2c3b7065584b7d4bef283fb6ceea0da45c952e57301879d2c
7
- data.tar.gz: d07e8d168442426db1cee39ecaf6d2f7c337b20bf41799115354099185daa2e4696c58df2fddba9d025f05386fd426ce4c15bbc06eea04e47dff01642a86cd95
6
+ metadata.gz: 306dc9d2c908bf80b8db7889a0235b13596c281edd3d2f73dba27e8f061dea75f4ae7db3bf879cce2a8d190e4a8f69343827b94de81888f60dfb761924657c72
7
+ data.tar.gz: ac48ced11b97be9e8074ac55b1fcf2299375a5edd4e7bfe9d5e2403616fe797f8e2a3942e29302cdd4f3d222d6ec16e8b09f2baf8ea72b12ae2062ba4256a25e
@@ -24,6 +24,8 @@ mappings:
24
24
  vendor: centos
25
25
  products:
26
26
  linux: centos
27
+ centos_webpanel:
28
+ vendor: centos-webpanel
27
29
  check_point:
28
30
  vendor: checkpoint
29
31
  cisco:
@@ -1,3 +1,3 @@
1
1
  module Recog
2
- VERSION = '2.3.12'
2
+ VERSION = '2.3.13'
3
3
  end
@@ -506,9 +506,10 @@ more text</example>
506
506
  <example service.version="0.9.54 beta">FileZilla Server 0.9.54 beta</example>
507
507
  <example service.version="0.9.33 beta">FileZilla Server v0.9.33 beta</example>
508
508
  <param pos="0" name="service.vendor" value="Filezilla-Project"/>
509
- <param pos="0" name="service.family" value="FileZilla FTP Server"/>
510
- <param pos="0" name="service.product" value="FileZilla FTP Server"/>
509
+ <param pos="0" name="service.family" value="FileZilla FTP"/>
510
+ <param pos="0" name="service.product" value="FileZilla Server"/>
511
511
  <param pos="1" name="service.version"/>
512
+ <param pos="0" name="service.cpe23" value="cpe:/a:filezilla-project:filezilla_server:{service.version}"/>
512
513
  <param pos="0" name="os.vendor" value="Microsoft"/>
513
514
  <param pos="0" name="os.family" value="Windows"/>
514
515
  <param pos="0" name="os.product" value="Windows"/>
@@ -1339,7 +1340,7 @@ more text</example>
1339
1340
  <param pos="0" name="os.product" value="Tru64 Unix"/>
1340
1341
  <param pos="1" name="host.name"/>
1341
1342
  <param pos="2" name="os.version"/>
1342
- <param pos="0" name="os.cpe23" value="cpe:/o:hp:tru64:{os.version}"/>
1343
+ <param pos="0" name="os.cpe23" value="cpe:/o:hp:tru64_unix:{os.version}"/>
1343
1344
  </fingerprint>
1344
1345
 
1345
1346
  <fingerprint pattern="^(\S+) FTP server \(Digital UNIX Version (\S+)\) ready\.?$">
@@ -1362,9 +1363,11 @@ more text</example>
1362
1363
  <param pos="0" name="os.cpe23" value="cpe:/o:mikrotik:routeros:{os.version}"/>
1363
1364
  </fingerprint>
1364
1365
 
1365
- <fingerprint pattern="^MikroTik FTP server \(MikroTik ([\w.]+)\) ready\.?$">
1366
- <description>MikroTik w/o hostname</description>
1367
- <example os.version="6.0rc14">MikroTik FTP server (MikroTik 6.0rc14) ready</example>
1366
+ <fingerprint pattern="^.* FTP server \(MikroTik (\d\.[\w\.]+)\) ready\.?$">
1367
+ <description>MikroTik with description</description>
1368
+ <example os.version="6.43.16">Super Thing_Place- FTP server (MikroTik 6.43.16) ready</example>
1369
+ <example os.version="6.43.16beta2">Super Thing_Place- FTP server (MikroTik 6.43.16beta2) ready</example>
1370
+ <example os.version="6.43.16rc56">Super Thing_Place- FTP server (MikroTik 6.43.16rc56) ready</example>
1368
1371
  <param pos="0" name="os.vendor" value="MikroTik"/>
1369
1372
  <param pos="0" name="os.product" value="RouterOS"/>
1370
1373
  <param pos="1" name="os.version"/>
@@ -1769,4 +1772,15 @@ more text</example>
1769
1772
  <param pos="0" name="os.device" value="Printer"/>
1770
1773
  </fingerprint>
1771
1774
 
1775
+ <fingerprint pattern="^SurgeFTP ([\S]+) \(Version ([a-f\d.]+)\)$">
1776
+ <description>NetWin SurgeFTP</description>
1777
+ <example service.version="2.3a12">SurgeFTP 192.168.0.0 (Version 2.3a12)</example>
1778
+ <example host.name="foo.bar.baz">SurgeFTP foo.bar.baz (Version 2.2f9)</example>
1779
+ <param pos="0" name="service.vendor" value="NetWin"/>
1780
+ <param pos="0" name="service.product" value="SurgeFTP"/>
1781
+ <param pos="2" name="service.version"/>
1782
+ <param pos="0" name="service.cpe23" value="cpe:/a:netwin:surgeftp:{service.version}"/>
1783
+ <param pos="1" name="host.name"/>
1784
+ </fingerprint>
1785
+
1772
1786
  </fingerprints>
@@ -2,6 +2,26 @@
2
2
  <fingerprints matches="html_title" database_type="service" preference="0.90">
3
3
  <!-- HTML Title elements found in HTTP response bodies are matched against these patterns to fingerprint HTTP servers. -->
4
4
 
5
+ <fingerprint pattern="^301 Moved Permanently$">
6
+ <description>301 Moved Permanently - generic -- assert nothing.</description>
7
+ <example>301 Moved Permanently</example>
8
+ </fingerprint>
9
+
10
+ <fingerprint pattern="^400 Bad Request$">
11
+ <description>400 Bad Request - generic -- assert nothing.</description>
12
+ <example>400 Bad Request</example>
13
+ </fingerprint>
14
+
15
+ <fingerprint pattern="^401 Unauthorized$">
16
+ <description>401 Unauthorized - generic -- assert nothing.</description>
17
+ <example>401 Unauthorized</example>
18
+ </fingerprint>
19
+
20
+ <fingerprint pattern="^404 Not Found$">
21
+ <description>404 Not Found - generic -- assert nothing.</description>
22
+ <example>404 Not Found</example>
23
+ </fingerprint>
24
+
5
25
  <fingerprint pattern="^Index of /">
6
26
  <description>Apache HTTPD indexes</description>
7
27
  <example>Index of /</example>
@@ -20,15 +20,18 @@
20
20
  <param pos="1" name="service.version"/>
21
21
  </fingerprint>
22
22
 
23
+ <!-- CentOS Web Panel is not part of the CentOS project and runs on CentOS,
24
+ RedHat, and CloudLinux.
25
+ -->
26
+
23
27
  <fingerprint pattern="(?i)^cwpsrv$">
24
28
  <description>CentOS Web Panel</description>
25
29
  <example>cwpsrv</example>
26
- <param pos="0" name="service.vendor" value="CentOS"/>
30
+ <param pos="0" name="service.vendor" value="CentOS WebPanel"/>
27
31
  <param pos="0" name="service.product" value="CentOS Web Panel"/>
28
- <param pos="0" name="os.vendor" value="CentOS"/>
32
+ <param pos="0" name="service.cpe23" value="cpe:/a:centos-webpanel:centos_web_panel:-"/>
29
33
  <param pos="0" name="os.family" value="Linux"/>
30
34
  <param pos="0" name="os.product" value="Linux"/>
31
- <param pos="0" name="os.cpe23" value="cpe:/o:centos:centos:-"/>
32
35
  </fingerprint>
33
36
 
34
37
  <fingerprint pattern="^Stronghold/(\d\.\d) Apache/([012][\d.]*)\s*(.*)$">
@@ -1716,7 +1719,8 @@
1716
1719
  <description>OpenVPN Access Server</description>
1717
1720
  <example>OpenVPN-AS</example>
1718
1721
  <param pos="0" name="service.vendor" value="OpenVPN"/>
1719
- <param pos="0" name="service.product" value="Access Server"/>
1722
+ <param pos="0" name="service.product" value="OpenVPN Access Server"/>
1723
+ <param pos="0" name="service.cpe23" value="cpe:/a:openvpn:openvpn_access_server:-"/>
1720
1724
  <param pos="0" name="hw.device" value="VPN"/>
1721
1725
  </fingerprint>
1722
1726
 
@@ -1828,6 +1832,10 @@
1828
1832
  <param pos="0" name="hw.device" value="Printer"/>
1829
1833
  </fingerprint>
1830
1834
 
1835
+ <!-- This section needs to be reworked to extract module / version to make
1836
+ this information useful and mappable to CPE
1837
+ -->
1838
+
1831
1839
  <fingerprint pattern="^HP HTTP Server; (?:Hewlett-Packard )?HP ((\S+) \S+)">
1832
1840
  <description>HP Printer</description>
1833
1841
  <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>
@@ -2045,7 +2053,7 @@
2045
2053
 
2046
2054
  <fingerprint pattern="^NS_(\d\.\d)$">
2047
2055
  <description>Citrix NetScaler</description>
2048
- <example>NS_6.1</example>
2056
+ <example service.version="6.1">NS_6.1</example>
2049
2057
  <param pos="0" name="os.vendor" value="Citrix"/>
2050
2058
  <param pos="0" name="os.family" value="NetScaler"/>
2051
2059
  <param pos="0" name="os.device" value="Network Management Device"/>
@@ -2058,6 +2066,14 @@
2058
2066
  <param pos="0" name="service.cpe23" value="cpe:/a:citrix:netscaler:{service.version}"/>
2059
2067
  </fingerprint>
2060
2068
 
2069
+ <fingerprint pattern="^Citrix-([\d.]+) \'[^']*\'$">
2070
+ <description>Citrix STUN server</description>
2071
+ <example service.version="3.2.5.9">Citrix-3.2.5.9 'Marshal West'</example>
2072
+ <param pos="0" name="service.vendor" value="Citrix"/>
2073
+ <param pos="0" name="service.product" value="STUN Server"/>
2074
+ <param pos="1" name="service.version"/>
2075
+ </fingerprint>
2076
+
2061
2077
  <fingerprint pattern="^Rumpus$">
2062
2078
  <description>Rumpus FTP Server, Web File Manager interface</description>
2063
2079
  <example>Rumpus</example>
@@ -2284,8 +2300,8 @@
2284
2300
 
2285
2301
  <fingerprint pattern="(?i)^SimpleHTTP/((?:\d+\.)*\d+)\s*Python/((?:\d+\.)*\d+)$">
2286
2302
  <description>SimpleHTTPRequestHandler Python class is a simple HTTP request handler.</description>
2287
- <example>SimpleHTTP/0.6 Python/2.7.6</example>
2288
- <example>SimpleHTTP/0.6 Python/3.4.0</example>
2303
+ <example service.version="0.6">SimpleHTTP/0.6 Python/2.7.6</example>
2304
+ <example python.version="3.4.0">SimpleHTTP/0.6 Python/3.4.0</example>
2289
2305
  <param pos="0" name="service.vendor" value="Python Software Foundation"/>
2290
2306
  <param pos="0" name="service.product" value="SimpleHTTP"/>
2291
2307
  <param pos="0" name="service.family" value="Python"/>
@@ -2426,7 +2442,7 @@
2426
2442
  </fingerprint>
2427
2443
 
2428
2444
  <fingerprint pattern="^Sophos Email Appliance$">
2429
- <description>Embedded web server for a rack-mounted email appliance that blocks spam and malware.</description>
2445
+ <description>Sophos - Embedded web server for a rack-mounted email appliance that blocks spam and malware.</description>
2430
2446
  <example>Sophos Email Appliance</example>
2431
2447
  <param pos="0" name="service.vendor" value="Sophos"/>
2432
2448
  <param pos="0" name="service.product" value="Email Appliance"/>
@@ -2457,7 +2473,7 @@
2457
2473
  </fingerprint>
2458
2474
 
2459
2475
  <fingerprint pattern="^mini_httpd/((?:\d+\.)*\d+) \S*$">
2460
- <description>A small HTTP server</description>
2476
+ <description>ACME mini_httpd with version and date</description>
2461
2477
  <example>mini_httpd/1.14 23jun2000</example>
2462
2478
  <example>mini_httpd/1 23jun2000</example>
2463
2479
  <param pos="0" name="service.vendor" value="ACME"/>
@@ -2468,8 +2484,8 @@
2468
2484
  </fingerprint>
2469
2485
 
2470
2486
  <fingerprint pattern="^thin ((?:\d+\.)*\d+) codename .+$">
2471
- <description>A Ruby-based web server.</description>
2472
- <example>thin 1.2.4 codename Flaming Astroboy</example>
2487
+ <description>Marc-André Cournoyer's thin webserver</description>
2488
+ <example service.version="1.2.4">thin 1.2.4 codename Flaming Astroboy</example>
2473
2489
  <example>thin 1 codename Flaming Astroboy</example>
2474
2490
  <param pos="0" name="service.product" value="Thin"/>
2475
2491
  <param pos="0" name="service.family" value="Thin"/>
@@ -2489,11 +2505,13 @@
2489
2505
 
2490
2506
  <fingerprint pattern="^Mongrel ((?:\d+\.)*\d+)$">
2491
2507
  <description>Ruby-based web server and HTTP library.</description>
2492
- <example>Mongrel 1.1.5</example>
2508
+ <example service.version="1.1.5">Mongrel 1.1.5</example>
2493
2509
  <example>Mongrel 1</example>
2510
+ <param pos="0" name="service.vendor" value="Zed Shaw"/>
2494
2511
  <param pos="0" name="service.product" value="Mongrel"/>
2495
2512
  <param pos="0" name="service.family" value="Mongrel"/>
2496
2513
  <param pos="1" name="service.version"/>
2514
+ <param pos="0" name="service.cpe23" value="cpe:/a:zed_shaw:mongrel:{service.version}"/>
2497
2515
  </fingerprint>
2498
2516
 
2499
2517
  <fingerprint pattern="^Microplex emHTTPD/((?:\d+\.)*\d+)$">
@@ -2532,7 +2550,7 @@
2532
2550
 
2533
2551
  <fingerprint pattern="^JC-SHTTPD/((?:\d+\.)*\d+)$">
2534
2552
  <description>An embedded web server.</description>
2535
- <example>JC-SHTTPD/1.17.20</example>
2553
+ <example service.version="1.17.20">JC-SHTTPD/1.17.20</example>
2536
2554
  <example>JC-SHTTPD/1</example>
2537
2555
  <param pos="0" name="service.product" value="JC-SHTTPD"/>
2538
2556
  <param pos="0" name="service.family" value="JC-SHTTPD"/>
@@ -2605,17 +2623,20 @@
2605
2623
 
2606
2624
  <fingerprint pattern="^WEBrick/([\d\.]+) .*$">
2607
2625
  <description>WEBrick default setup</description>
2608
- <example>WEBrick/1.3.1 (Ruby/1.9.3/2013-02-22)</example>
2609
- <param pos="0" name="service.vendor" value="Ruby"/>
2626
+ <example service.version="1.3.1">WEBrick/1.3.1 (Ruby/1.9.3/2013-02-22)</example>
2627
+ <param pos="0" name="service.vendor" value="Ruby-Lang"/>
2610
2628
  <param pos="0" name="service.product" value="WEBrick"/>
2611
2629
  <param pos="1" name="service.version"/>
2630
+ <param pos="0" name="service.cpe23" value="cpe:/a:ruby-lang:webrick:{service.version}"/>
2612
2631
  </fingerprint>
2613
2632
 
2614
2633
  <fingerprint pattern="^Aspen/(\S+)">
2615
2634
  <description>Aspen web server</description>
2616
2635
  <example service.version="0.8">Aspen/0.8</example>
2636
+ <param pos="0" name="service.vendor" value="Aspen"/>
2617
2637
  <param pos="0" name="service.product" value="Aspen"/>
2618
2638
  <param pos="1" name="service.version"/>
2639
+ <param pos="0" name="service.cpe23" value="cpe:/a:aspen:aspen:{service.version}"/>
2619
2640
  </fingerprint>
2620
2641
 
2621
2642
  <fingerprint pattern="^Boa/([\d\.]+\S*)">
@@ -2869,12 +2890,14 @@
2869
2890
  <fingerprint pattern="^Sunny WebBox$">
2870
2891
  <description>Sunny WebBox</description>
2871
2892
  <example>Sunny WebBox</example>
2872
- <param pos="0" name="service.vendor" value="SMA Solar Technology Ag"/>
2893
+ <param pos="0" name="service.vendor" value="SMA"/>
2873
2894
  <param pos="0" name="service.family" value="Sunny"/>
2874
- <param pos="0" name="service.product" value="WebBox"/>
2895
+ <param pos="0" name="service.product" value="Sunny WebBox"/>
2896
+ <param pos="0" name="hw.vendor" value="SMA"/>
2875
2897
  <param pos="0" name="hw.family" value="Sunny"/>
2876
- <param pos="0" name="hw.product" value="WebBox"/>
2898
+ <param pos="0" name="hw.product" value="Sunny WebBox"/>
2877
2899
  <param pos="0" name="hw.device" value="Power device"/>
2900
+ <param pos="0" name="hw.cpe23" value="cpe:/h:sma:sunny_webbox:-"/>
2878
2901
  <param pos="0" name="os.vendor" value="Microsoft"/>
2879
2902
  <param pos="0" name="os.family" value="Windows"/>
2880
2903
  <param pos="0" name="os.product" value="Windows CE"/>
@@ -2988,11 +3011,13 @@
2988
3011
 
2989
3012
  <fingerprint pattern="(?i)^Linux/(\S+) UPnP/[\d\.]+ miniupnpd/([\d\.]+)$">
2990
3013
  <description>Linux MiniUPnPd UPnP Server</description>
2991
- <example>Linux/Cross_compiled UPnP/1.0 miniupnpd/1.0</example>
3014
+ <example service.version="1.0">Linux/Cross_compiled UPnP/1.0 miniupnpd/1.0</example>
2992
3015
  <example>Linux/2.6.29.6-217.2.3.fc11.i686.PAE UPnP/1.0 miniupnpd/1.0</example>
2993
3016
  <example>Linux/2.4.21 UPnP/1.0 miniupnpd/1.0</example>
3017
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
2994
3018
  <param pos="0" name="service.product" value="MiniUPnP"/>
2995
3019
  <param pos="2" name="service.version"/>
3020
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
2996
3021
  <param pos="0" name="os.vendor" value="Linux"/>
2997
3022
  <param pos="0" name="os.product" value="Linux"/>
2998
3023
  <param pos="1" name="os.version"/>
@@ -3001,28 +3026,32 @@
3001
3026
 
3002
3027
  <fingerprint pattern="^Tomato UPnP/\S+ MiniUPnPd/(\S+)$">
3003
3028
  <description>Tomato UPnP Server</description>
3004
- <example>Tomato UPnP/1.0 MiniUPnPd/1.2</example>
3005
- <example>Tomato UPnP/1.0 MiniUPnPd/1.4</example>
3006
- <param pos="0" name="service.vendor" value="Tomato"/>
3029
+ <example service.version="1.2">Tomato UPnP/1.0 MiniUPnPd/1.2</example>
3030
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3007
3031
  <param pos="0" name="service.product" value="MiniUPnP"/>
3008
3032
  <param pos="1" name="service.version"/>
3033
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3009
3034
  </fingerprint>
3010
3035
 
3011
- <fingerprint pattern="(?i)^(RT-\w+) UPnP/\S+ MiniUPnPd/(\S+)$">
3036
+ <fingerprint pattern="(?i)^(RT-\w+) UPnP/\S+ MiniUPnPd/([\d.]+)$">
3012
3037
  <description>Asus WAP UPnP Server</description>
3013
- <example>RT-G32 UPnP/1.0 MiniUPnPd/1.2</example>
3038
+ <example service.version="1.2">RT-G32 UPnP/1.0 MiniUPnPd/1.2</example>
3039
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3014
3040
  <param pos="0" name="service.product" value="MiniUPnP"/>
3015
3041
  <param pos="2" name="service.version"/>
3042
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3016
3043
  <param pos="0" name="os.vendor" value="Asus"/>
3017
3044
  <param pos="1" name="os.product"/>
3018
3045
  <param pos="0" name="os.device" value="WAP"/>
3019
3046
  </fingerprint>
3020
3047
 
3021
- <fingerprint pattern="(?i)^DrayTek/Vigor(\S+) UPnP/\S+ miniupnpd/(\S+)$">
3048
+ <fingerprint pattern="(?i)^DrayTek/Vigor(\S+) UPnP/\S+ miniupnpd/([\d.]+)$">
3022
3049
  <description>DrayTek Vigor router UPnP Server</description>
3023
- <example hw.model="2130">DrayTek/Vigor2130 UPnP/1.0 miniupnpd/1.0</example>
3050
+ <example service.version="1.0" hw.model="2130">DrayTek/Vigor2130 UPnP/1.0 miniupnpd/1.0</example>
3051
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3024
3052
  <param pos="0" name="service.product" value="MiniUPnP"/>
3025
3053
  <param pos="2" name="service.version"/>
3054
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3026
3055
  <param pos="0" name="hw.vendor" value="DrayTek"/>
3027
3056
  <param pos="0" name="hw.product" value="Vigor"/>
3028
3057
  <param pos="1" name="hw.model"/>
@@ -3036,26 +3065,30 @@
3036
3065
  <param pos="0" name="hw.device" value="Broadband router"/>
3037
3066
  </fingerprint>
3038
3067
 
3039
- <fingerprint pattern="(?i)^OpenWRT/kamikaze UPnP/\S+ MiniUPnPd/(\S+)$">
3068
+ <fingerprint pattern="(?i)^OpenWRT/kamikaze UPnP/\S+ MiniUPnPd/([\d.]+)$">
3040
3069
  <description>OpenWRT Kamikaze WAP UPnP Server</description>
3041
- <example>OpenWRT/kamikaze UPnP/1.0 MiniUPnPd/1.5</example>
3042
- <example>OpenWRT/kamikaze UPnP/1.0 MiniUPnPd/1.2</example>
3043
- <example>OpenWRT/kamikaze UPnP/1.0 MiniUPnPd/1.4</example>
3070
+ <example service.version="1.5">OpenWRT/kamikaze UPnP/1.0 MiniUPnPd/1.5</example>
3071
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3044
3072
  <param pos="0" name="service.product" value="MiniUPnP"/>
3045
3073
  <param pos="1" name="service.version"/>
3074
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3046
3075
  <param pos="0" name="os.vendor" value="Linux"/>
3047
3076
  <param pos="0" name="os.family" value="OpenWRT"/>
3048
3077
  <param pos="0" name="os.product" value="Kamikaze"/>
3049
3078
  <param pos="0" name="os.device" value="WAP"/>
3050
3079
  </fingerprint>
3051
3080
 
3052
- <fingerprint pattern="(?i)^Netgear/\S+ UPnP/\S+ miniupnpd/(\S+)$">
3081
+ <fingerprint pattern="(?i)^Netgear/\S+ UPnP/\S+ miniupnpd/([\d.]+)$">
3053
3082
  <description>Netgear DG834G or WNDR3300 WAP UPnP Server</description>
3054
- <example>Netgear/1.0 UPnP/1.0 miniupnpd/1.0</example>
3083
+ <example service.version="1.0">Netgear/1.0 UPnP/1.0 miniupnpd/1.0</example>
3084
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3055
3085
  <param pos="0" name="service.product" value="MiniUPnP"/>
3056
3086
  <param pos="1" name="service.version"/>
3087
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3057
3088
  <param pos="0" name="os.vendor" value="Netgear"/>
3058
3089
  <param pos="0" name="os.device" value="WAP"/>
3090
+ <param pos="0" name="hw.vendor" value="Netgear"/>
3091
+ <param pos="0" name="hw.device" value="WAP"/>
3059
3092
  </fingerprint>
3060
3093
 
3061
3094
  <fingerprint pattern="^[^/]+/(\S+) DLNADOC/\S+ UPnP/\S+ MiniDLNA/(\S+)$">
@@ -3075,8 +3108,10 @@
3075
3108
  <description>miniupnpd on a Debian variant</description>
3076
3109
  <example os.version="wheezy/sid" service.version="1.8">Debian/wheezy/sid UPnP/1.1 MiniUPnPd/1.8</example>
3077
3110
  <example os.version="4.0" service.version="1.0">Debian/4.0 UPnP/1.0 miniupnpd/1.0</example>
3111
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3078
3112
  <param pos="0" name="service.product" value="MiniUPnP"/>
3079
3113
  <param pos="2" name="service.version"/>
3114
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3080
3115
  <param pos="0" name="os.vendor" value="Debian"/>
3081
3116
  <param pos="0" name="os.product" value="Linux"/>
3082
3117
  <param pos="0" name="os.certainty" value="0.5"/>
@@ -3089,8 +3124,10 @@
3089
3124
  <example os.version="10" service.version="1.4">Fedora/10 UPnP/1.0 MiniUPnPd/1.4</example>
3090
3125
  <example os.version="8" service.version="1.0">Fedora/8 UPnP/1.0 miniupnpd/1.0</example>
3091
3126
  <example os.version="6" service.version="1.0">FedoraCore/6 UPnP/1.0 miniupnpd/1.0</example>
3127
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3092
3128
  <param pos="0" name="service.product" value="MiniUPnP"/>
3093
3129
  <param pos="2" name="service.version"/>
3130
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3094
3131
  <param pos="0" name="os.family" value="Linux"/>
3095
3132
  <param pos="0" name="os.vendor" value="Red Hat"/>
3096
3133
  <param pos="0" name="os.product" value="Fedora Core Linux"/>
@@ -3104,8 +3141,10 @@
3104
3141
  <example os.version="10.10" service.version="1.0">Ubuntu/10.10 UPnP/1.0 miniupnpd/1.0</example>
3105
3142
  <example os.version="7.10" service.version="1.0">Ubuntu/7.10 UPnP/1.0 miniupnpd/1.0</example>
3106
3143
  <example os.version="9.04" service.version="1.0">Ubuntu/9.04 UPnP/1.0 miniupnpd/1.0</example>
3144
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3107
3145
  <param pos="0" name="service.product" value="MiniUPnP"/>
3108
3146
  <param pos="2" name="service.version"/>
3147
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3109
3148
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3110
3149
  <param pos="0" name="os.product" value="Linux"/>
3111
3150
  <param pos="1" name="os.version"/>
@@ -3115,8 +3154,10 @@
3115
3154
  <fingerprint pattern="(?i)^Ubuntu\/bionic UPnP/\S+ MiniUPnPd/(\S+)$">
3116
3155
  <description>miniupnpd on an Ubuntu bionic/18.04</description>
3117
3156
  <example os.version="18.04" service.version="1.4">Ubuntu/bionic UPnP/1.0 MiniUPnPd/1.4</example>
3157
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3118
3158
  <param pos="0" name="service.product" value="MiniUPnP"/>
3119
3159
  <param pos="1" name="service.version"/>
3160
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3120
3161
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3121
3162
  <param pos="0" name="os.product" value="Linux"/>
3122
3163
  <param pos="0" name="os.version" value="18.04"/>
@@ -3126,8 +3167,10 @@
3126
3167
  <fingerprint pattern="(?i)^Ubuntu\/yakkety UPnP/\S+ MiniUPnPd/(\S+)$">
3127
3168
  <description>miniupnpd on an Ubuntu yakkety/16.10</description>
3128
3169
  <example os.version="16.10" service.version="1.4">Ubuntu/yakkety UPnP/1.0 MiniUPnPd/1.4</example>
3170
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3129
3171
  <param pos="0" name="service.product" value="MiniUPnP"/>
3130
3172
  <param pos="1" name="service.version"/>
3173
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3131
3174
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3132
3175
  <param pos="0" name="os.product" value="Linux"/>
3133
3176
  <param pos="0" name="os.version" value="16.10"/>
@@ -3137,8 +3180,10 @@
3137
3180
  <fingerprint pattern="(?i)^Ubuntu\/xenial UPnP/\S+ MiniUPnPd/(\S+)$">
3138
3181
  <description>miniupnpd on an Ubuntu xenial/16.04</description>
3139
3182
  <example os.version="16.04" service.version="1.4">Ubuntu/xenial UPnP/1.0 MiniUPnPd/1.4</example>
3183
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3140
3184
  <param pos="0" name="service.product" value="MiniUPnP"/>
3141
3185
  <param pos="1" name="service.version"/>
3186
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3142
3187
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3143
3188
  <param pos="0" name="os.product" value="Linux"/>
3144
3189
  <param pos="0" name="os.version" value="16.04"/>
@@ -3148,8 +3193,10 @@
3148
3193
  <fingerprint pattern="(?i)^Ubuntu\/utopic UPnP/\S+ MiniUPnPd/(\S+)$">
3149
3194
  <description>miniupnpd on an Ubuntu utopic/14.10</description>
3150
3195
  <example os.version="14.10" service.version="1.4">Ubuntu/utopic UPnP/1.0 MiniUPnPd/1.4</example>
3196
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3151
3197
  <param pos="0" name="service.product" value="MiniUPnP"/>
3152
3198
  <param pos="1" name="service.version"/>
3199
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3153
3200
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3154
3201
  <param pos="0" name="os.product" value="Linux"/>
3155
3202
  <param pos="0" name="os.version" value="14.10"/>
@@ -3159,8 +3206,10 @@
3159
3206
  <fingerprint pattern="(?i)^Ubuntu\/trusty UPnP/\S+ MiniUPnPd/(\S+)$">
3160
3207
  <description>miniupnpd on an Ubuntu trusty/14.04</description>
3161
3208
  <example os.version="14.04" service.version="1.4">Ubuntu/trusty UPnP/1.0 MiniUPnPd/1.4</example>
3209
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3162
3210
  <param pos="0" name="service.product" value="MiniUPnP"/>
3163
3211
  <param pos="1" name="service.version"/>
3212
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3164
3213
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3165
3214
  <param pos="0" name="os.product" value="Linux"/>
3166
3215
  <param pos="0" name="os.version" value="14.04"/>
@@ -3170,8 +3219,10 @@
3170
3219
  <fingerprint pattern="(?i)^Ubuntu\/saucy UPnP/\S+ MiniUPnPd/(\S+)$">
3171
3220
  <description>miniupnpd on an Ubuntu saucy/13.10</description>
3172
3221
  <example os.version="13.10" service.version="1.4">Ubuntu/saucy UPnP/1.0 MiniUPnPd/1.4</example>
3222
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3173
3223
  <param pos="0" name="service.product" value="MiniUPnP"/>
3174
3224
  <param pos="1" name="service.version"/>
3225
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3175
3226
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3176
3227
  <param pos="0" name="os.product" value="Linux"/>
3177
3228
  <param pos="0" name="os.version" value="13.10"/>
@@ -3181,8 +3232,10 @@
3181
3232
  <fingerprint pattern="(?i)^Ubuntu\/raring UPnP/\S+ MiniUPnPd/(\S+)$">
3182
3233
  <description>miniupnpd on an Ubuntu raring/13.04</description>
3183
3234
  <example os.version="13.04" service.version="1.4">Ubuntu/raring UPnP/1.0 MiniUPnPd/1.4</example>
3235
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3184
3236
  <param pos="0" name="service.product" value="MiniUPnP"/>
3185
3237
  <param pos="1" name="service.version"/>
3238
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3186
3239
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3187
3240
  <param pos="0" name="os.product" value="Linux"/>
3188
3241
  <param pos="0" name="os.version" value="13.04"/>
@@ -3192,8 +3245,10 @@
3192
3245
  <fingerprint pattern="(?i)^Ubuntu\/quantal UPnP/\S+ MiniUPnPd/(\S+)$">
3193
3246
  <description>miniupnpd on an Ubuntu quantal/12.10</description>
3194
3247
  <example os.version="12.10" service.version="1.4">Ubuntu/quantal UPnP/1.0 MiniUPnPd/1.4</example>
3248
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3195
3249
  <param pos="0" name="service.product" value="MiniUPnP"/>
3196
3250
  <param pos="1" name="service.version"/>
3251
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3197
3252
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3198
3253
  <param pos="0" name="os.product" value="Linux"/>
3199
3254
  <param pos="0" name="os.version" value="12.10"/>
@@ -3203,8 +3258,10 @@
3203
3258
  <fingerprint pattern="(?i)^Ubuntu\/precise UPnP/\S+ MiniUPnPd/(\S+)$">
3204
3259
  <description>miniupnpd on an Ubuntu precise/12.04</description>
3205
3260
  <example os.version="12.04" service.version="1.4">Ubuntu/precise UPnP/1.0 MiniUPnPd/1.4</example>
3261
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3206
3262
  <param pos="0" name="service.product" value="MiniUPnP"/>
3207
3263
  <param pos="1" name="service.version"/>
3264
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3208
3265
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3209
3266
  <param pos="0" name="os.product" value="Linux"/>
3210
3267
  <param pos="0" name="os.version" value="12.04"/>
@@ -3214,8 +3271,10 @@
3214
3271
  <fingerprint pattern="(?i)^Ubuntu\/oneiric UPnP/\S+ MiniUPnPd/(\S+)$">
3215
3272
  <description>miniupnpd on an Ubuntu oneiric/11.10</description>
3216
3273
  <example os.version="11.10" service.version="1.4">Ubuntu/oneiric UPnP/1.0 MiniUPnPd/1.4</example>
3274
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3217
3275
  <param pos="0" name="service.product" value="MiniUPnP"/>
3218
3276
  <param pos="1" name="service.version"/>
3277
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3219
3278
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3220
3279
  <param pos="0" name="os.product" value="Linux"/>
3221
3280
  <param pos="0" name="os.version" value="11.10"/>
@@ -3225,8 +3284,10 @@
3225
3284
  <fingerprint pattern="(?i)^Ubuntu\/natty UPnP/\S+ MiniUPnPd/(\S+)$">
3226
3285
  <description>miniupnpd on an Ubuntu natty/11.04</description>
3227
3286
  <example os.version="11.04" service.version="1.4">Ubuntu/natty UPnP/1.0 MiniUPnPd/1.4</example>
3287
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3228
3288
  <param pos="0" name="service.product" value="MiniUPnP"/>
3229
3289
  <param pos="1" name="service.version"/>
3290
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3230
3291
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3231
3292
  <param pos="0" name="os.product" value="Linux"/>
3232
3293
  <param pos="0" name="os.version" value="11.04"/>
@@ -3236,8 +3297,10 @@
3236
3297
  <fingerprint pattern="(?i)^Ubuntu\/maverick UPnP/\S+ MiniUPnPd/(\S+)$">
3237
3298
  <description>miniupnpd on an Ubuntu maverick/10.10</description>
3238
3299
  <example os.version="10.10" service.version="1.4">Ubuntu/maverick UPnP/1.0 MiniUPnPd/1.4</example>
3300
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3239
3301
  <param pos="0" name="service.product" value="MiniUPnP"/>
3240
3302
  <param pos="1" name="service.version"/>
3303
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3241
3304
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3242
3305
  <param pos="0" name="os.product" value="Linux"/>
3243
3306
  <param pos="0" name="os.version" value="10.10"/>
@@ -3247,8 +3310,10 @@
3247
3310
  <fingerprint pattern="(?i)^Ubuntu\/lucid UPnP/\S+ MiniUPnPd/(\S+)$">
3248
3311
  <description>miniupnpd on an Ubuntu lucid/10.04</description>
3249
3312
  <example os.version="10.04" service.version="1.4">Ubuntu/lucid UPnP/1.0 MiniUPnPd/1.4</example>
3313
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3250
3314
  <param pos="0" name="service.product" value="MiniUPnP"/>
3251
3315
  <param pos="1" name="service.version"/>
3316
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3252
3317
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3253
3318
  <param pos="0" name="os.product" value="Linux"/>
3254
3319
  <param pos="0" name="os.version" value="10.04"/>
@@ -3258,8 +3323,10 @@
3258
3323
  <fingerprint pattern="(?i)^Ubuntu\/karmic UPnP/\S+ MiniUPnPd/(\S+)$">
3259
3324
  <description>miniupnpd on an Ubuntu karmic/9.10</description>
3260
3325
  <example os.version="9.10" service.version="1.4">Ubuntu/karmic UPnP/1.0 MiniUPnPd/1.4</example>
3326
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3261
3327
  <param pos="0" name="service.product" value="MiniUPnP"/>
3262
3328
  <param pos="1" name="service.version"/>
3329
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3263
3330
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3264
3331
  <param pos="0" name="os.product" value="Linux"/>
3265
3332
  <param pos="0" name="os.version" value="9.10"/>
@@ -3269,8 +3336,10 @@
3269
3336
  <fingerprint pattern="(?i)^Ubuntu\/jaunty UPnP/\S+ MiniUPnPd/(\S+)$">
3270
3337
  <description>miniupnpd on an Ubuntu jaunty/9.04</description>
3271
3338
  <example os.version="9.04" service.version="1.4">Ubuntu/jaunty UPnP/1.0 MiniUPnPd/1.4</example>
3339
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3272
3340
  <param pos="0" name="service.product" value="MiniUPnP"/>
3273
3341
  <param pos="1" name="service.version"/>
3342
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3274
3343
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3275
3344
  <param pos="0" name="os.product" value="Linux"/>
3276
3345
  <param pos="0" name="os.version" value="9.04"/>
@@ -3280,8 +3349,10 @@
3280
3349
  <fingerprint pattern="(?i)^Ubuntu\/hardy UPnP/\S+ MiniUPnPd/(\S+)$">
3281
3350
  <description>miniupnpd on an Ubuntu hardy/8.04</description>
3282
3351
  <example os.version="8.04" service.version="1.4">Ubuntu/hardy UPnP/1.0 MiniUPnPd/1.4</example>
3352
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3283
3353
  <param pos="0" name="service.product" value="MiniUPnP"/>
3284
3354
  <param pos="1" name="service.version"/>
3355
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3285
3356
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3286
3357
  <param pos="0" name="os.product" value="Linux"/>
3287
3358
  <param pos="0" name="os.version" value="8.04"/>
@@ -3291,8 +3362,10 @@
3291
3362
  <fingerprint pattern="(?i)^Linux Mips (\S+) UPnP/\S+ MiniUPnPd/(\S+)$">
3292
3363
  <description>Linux MIPS UPnP Server</description>
3293
3364
  <example>Linux Mips 2.4.20 UPnP/1.0 MiniUPnPd/1.2</example>
3365
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3294
3366
  <param pos="0" name="service.product" value="MiniUPnP"/>
3295
3367
  <param pos="2" name="service.version"/>
3368
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3296
3369
  <param pos="0" name="os.vendor" value="Linux"/>
3297
3370
  <param pos="0" name="os.product" value="Linux"/>
3298
3371
  <param pos="1" name="os.version"/>
@@ -3306,8 +3379,10 @@
3306
3379
  <param pos="0" name="os.product" value="SmoothWall"/>
3307
3380
  <param pos="1" name="os.version"/>
3308
3381
  <param pos="0" name="os.cpe23" value="cpe:/o:smoothwall:smoothwall:{os.version}"/>
3382
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3309
3383
  <param pos="0" name="service.product" value="MiniUPnP"/>
3310
3384
  <param pos="2" name="service.version"/>
3385
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3311
3386
  </fingerprint>
3312
3387
 
3313
3388
  <fingerprint pattern="^(\S+) \d+/Service Pack \d+, UPnP/[\d\.]+, TVersity Media Server$">
@@ -3370,25 +3445,13 @@
3370
3445
 
3371
3446
  <fingerprint pattern="^Windows_7-x86-(\S+), UPnP/[\d\.]+, PMS/([\d\.]+)$">
3372
3447
  <description>PlayStation3 Media Server UPnP Server - Windows 7 x86</description>
3373
- <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.20</example>
3448
+ <example service.version="1.20">Windows_7-x86-6.1, UPnP/1.0, PMS/1.20</example>
3374
3449
  <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.22.0</example>
3375
- <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.25.1</example>
3376
- <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.51.0</example>
3377
3450
  <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.20.412</example>
3378
3451
  <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.71.0</example>
3379
3452
  <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.20.409</example>
3380
3453
  <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.72.0</example>
3381
3454
  <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.10.51</example>
3382
- <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.40.0</example>
3383
- <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.53.0</example>
3384
- <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.52.0</example>
3385
- <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.50.1</example>
3386
- <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.30.1</example>
3387
- <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.50.0</example>
3388
- <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.54.0</example>
3389
- <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.52.1</example>
3390
- <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.60.0</example>
3391
- <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.70.1</example>
3392
3455
  <param pos="0" name="service.vendor" value="Sony"/>
3393
3456
  <param pos="0" name="service.product" value="PMS"/>
3394
3457
  <param pos="2" name="service.version"/>
@@ -3494,10 +3557,59 @@
3494
3557
  <param pos="0" name="os.device" value="Router"/>
3495
3558
  </fingerprint>
3496
3559
 
3497
- <fingerprint pattern="^TBS/R2 UPnP/[\d\.]+ MiniUPnPd/[\d\.]+$">
3560
+ <fingerprint pattern="Linux, WEBACCESS/1.0, (DIR-\d+\w*) Ver (\S+)$">
3561
+ <description>D-Link DIR-XXX Router - WEBACCESS variant</description>
3562
+ <example hw.product="DIR-850L">Linux, WEBACCESS/1.0, DIR-850L Ver 1.09</example>
3563
+ <example os.version="1.14WW">Linux, WEBACCESS/1.0, DIR-850L Ver 1.14WW</example>
3564
+ <example os.version="1.04">Linux, WEBACCESS/1.0, DIR-645 Ver 1.04</example>
3565
+ <param pos="0" name="hw.vendor" value="D-Link"/>
3566
+ <param pos="1" name="hw.product"/>
3567
+ <param pos="0" name="hw.device" value="Router"/>
3568
+ <param pos="0" name="os.vendor" value="D-Link"/>
3569
+ <param pos="2" name="os.version"/>
3570
+ <param pos="0" name="os.device" value="Router"/>
3571
+ </fingerprint>
3572
+
3573
+ <fingerprint pattern="Linux, HTTP/1.1, (DIR-\d+\w*) Ver (\S+)$">
3574
+ <description>D-Link DIR-XXX Router - HTTP variant</description>
3575
+ <example hw.product="DIR-815" os.version="1.04">Linux, HTTP/1.1, DIR-815 Ver 1.04</example>
3576
+ <param pos="0" name="hw.vendor" value="D-Link"/>
3577
+ <param pos="1" name="hw.product"/>
3578
+ <param pos="0" name="hw.device" value="Router"/>
3579
+ <param pos="0" name="os.vendor" value="D-Link"/>
3580
+ <param pos="2" name="os.version"/>
3581
+ <param pos="0" name="os.device" value="Router"/>
3582
+ </fingerprint>
3583
+
3584
+ <fingerprint pattern="Linux, WEBACCESS/1.0, (DSL-\d+\w*) Ver (\S+)$">
3585
+ <description>D-Link DSL-XXX Router - WEBACCESS variant</description>
3586
+ <example hw.product="DSL-2890AL" os.version="AU_1.02.10">Linux, WEBACCESS/1.0, DSL-2890AL Ver AU_1.02.10</example>
3587
+ <example hw.product="DSL-2890AL" os.version="1.01">Linux, WEBACCESS/1.0, DSL-2890AL Ver 1.01</example>
3588
+ <param pos="0" name="hw.vendor" value="D-Link"/>
3589
+ <param pos="1" name="hw.product"/>
3590
+ <param pos="0" name="hw.device" value="Router"/>
3591
+ <param pos="0" name="os.vendor" value="D-Link"/>
3592
+ <param pos="2" name="os.version"/>
3593
+ <param pos="0" name="os.device" value="Router"/>
3594
+ </fingerprint>
3595
+
3596
+ <fingerprint pattern="^TBS/R2 UPnP/[\d\.]+ MiniUPnPd/([\d\.]+)$">
3498
3597
  <description>D-Link generic</description>
3499
- <example>TBS/R2 UPnP/1.0 MiniUPnPd/1.2</example>
3598
+ <example service.version="1.2">TBS/R2 UPnP/1.0 MiniUPnPd/1.2</example>
3599
+ <param pos="0" name="hw.vendor" value="D-Link"/>
3600
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3601
+ <param pos="0" name="service.product" value="MiniUPnP"/>
3602
+ <param pos="1" name="service.version"/>
3603
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3604
+ </fingerprint>
3605
+
3606
+ <fingerprint pattern="^alphapd/(\d\.[\d.]+)$">
3607
+ <description>D-Link alphapd - likely DCS series cameras</description>
3608
+ <example service.version="2.1.8">alphapd/2.1.8</example>
3500
3609
  <param pos="0" name="hw.vendor" value="D-Link"/>
3610
+ <param pos="0" name="service.vendor" value="D-Link"/>
3611
+ <param pos="0" name="service.product" value="alphapd"/>
3612
+ <param pos="1" name="service.version"/>
3501
3613
  </fingerprint>
3502
3614
 
3503
3615
  <fingerprint pattern="^ipos/([\d\.]+) UPnP/[\d\.]+ (TL-\w+)/(\S+)$">
@@ -3684,12 +3796,16 @@
3684
3796
  <param pos="1" name="hw.version"/>
3685
3797
  </fingerprint>
3686
3798
 
3687
- <fingerprint pattern="^Roku UPnP/\S+ MiniUPnPd/\S+$">
3799
+ <fingerprint pattern="^Roku UPnP/\S+ MiniUPnPd/([\d\.]+)$">
3688
3800
  <description>Roku without a version</description>
3689
- <example>Roku UPnP/1.0 MiniUPnPd/1.4</example>
3801
+ <example service.version="1.4">Roku UPnP/1.0 MiniUPnPd/1.4</example>
3690
3802
  <param pos="0" name="hw.vendor" value="Roku"/>
3691
3803
  <param pos="0" name="hw.product" value="Roku"/>
3692
3804
  <param pos="0" name="hw.device" value="Media Server"/>
3805
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3806
+ <param pos="0" name="service.product" value="MiniUPnP"/>
3807
+ <param pos="1" name="service.version"/>
3808
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3693
3809
  </fingerprint>
3694
3810
 
3695
3811
  <fingerprint pattern="^UPnP/\S+, DLNADOC/\S+, Platinum/(\S+)$">
@@ -3907,7 +4023,7 @@
3907
4023
 
3908
4024
  <fingerprint pattern="^IX Series IX21\d\d \(magellan-sec\) Software, Version ([^, ]+), (?:MAINTENANCE )?RELEASE SOFTWARE$">
3909
4025
  <description>NEC Univerge Router - enterprise class with VPN, UTM, etc</description>
3910
- <example>IX Series IX2106 (magellan-sec) Software, Version 10.2.20, RELEASE SOFTWARE</example>
4026
+ <example hw.version="10.2.20">IX Series IX2106 (magellan-sec) Software, Version 10.2.20, RELEASE SOFTWARE</example>
3911
4027
  <example>IX Series IX2105 (magellan-sec) Software, Version 9.6.12A, MAINTENANCE RELEASE SOFTWARE</example>
3912
4028
  <param pos="0" name="hw.vendor" value="NEC"/>
3913
4029
  <param pos="0" name="hw.product" value="Univerge"/>
@@ -3916,4 +4032,92 @@
3916
4032
  <param pos="0" name="hw.cpe23" value="cpe:/h:nec:univerge:{hw.version}"/>
3917
4033
  </fingerprint>
3918
4034
 
4035
+ <fingerprint pattern="^Caddy$">
4036
+ <description>CaddyServer Caddy - golang based httpd</description>
4037
+ <example>Caddy</example>
4038
+ <param pos="0" name="service.vendor" value="CaddyServer"/>
4039
+ <param pos="0" name="service.product" value="Caddy"/>
4040
+ <param pos="0" name="service.cpe23" value="cpe:/a:caddyserver:caddy:-"/>
4041
+ </fingerprint>
4042
+
4043
+ <fingerprint pattern="^MoxaHttp/(\d\.\d)$">
4044
+ <description>Moxa devices - service used on multiple families of devices</description>
4045
+ <example service.version="2.3">MoxaHttp/2.3</example>
4046
+ <example>MoxaHttp/2.2</example>
4047
+ <example>MoxaHttp/1.0</example>
4048
+ <param pos="0" name="service.vendor" value="Moxa"/>
4049
+ <param pos="0" name="service.product" value="httpd"/>
4050
+ <param pos="1" name="service.version"/>
4051
+ <param pos="0" name="hw.vendor" value="Moxa"/>
4052
+ <param pos="0" name="os.vendor" value="Moxa"/>
4053
+ </fingerprint>
4054
+
4055
+ <fingerprint pattern="^proxygen-bolt$">
4056
+ <description>Facebook Proxygen httpd software</description>
4057
+ <example>proxygen-bolt</example>
4058
+ <param pos="0" name="service.vendor" value="Facebook"/>
4059
+ <param pos="0" name="service.product" value="Proxygen"/>
4060
+ <param pos="0" name="service.cpe23" value="cpe:/a:facebook:proxygen:-"/>
4061
+ </fingerprint>
4062
+
4063
+ <fingerprint pattern="^Kerio Connect ([\d.]+)(?: patch (\d))?$">
4064
+ <description>GFI Kerio Connect</description>
4065
+ <example service.version="8.2.2">Kerio Connect 8.2.2</example>
4066
+ <example service.version="9.2.12" service.version.version="1">Kerio Connect 9.2.12 patch 1</example>
4067
+ <param pos="0" name="service.vendor" value="GFI"/>
4068
+ <param pos="0" name="service.product" value="Kerio Connect"/>
4069
+ <param pos="1" name="service.version"/>
4070
+ <param pos="2" name="service.version.version"/>
4071
+ </fingerprint>
4072
+
4073
+ <fingerprint pattern="^Kerio Control Embedded Web Server$">
4074
+ <description>GFI Kerio Control - embedded web server</description>
4075
+ <example>Kerio Control Embedded Web Server</example>
4076
+ <param pos="0" name="service.vendor" value="GFI"/>
4077
+ <param pos="0" name="service.product" value="Kerio Control"/>
4078
+ <param pos="0" name="service.cpe23" value="cpe:/a:gfi:kerio_control:-"/>
4079
+ </fingerprint>
4080
+
4081
+ <fingerprint pattern="^Mongoose/([\d.]+)$">
4082
+ <description>Cesanta Mongoose embedded web server / networking library</description>
4083
+ <example service.version="6.7.1">Mongoose/6.7.1</example>
4084
+ <param pos="0" name="service.vendor" value="Cesanta"/>
4085
+ <param pos="0" name="service.product" value="Mongoose"/>
4086
+ <param pos="1" name="service.version"/>
4087
+ <param pos="0" name="service.cpe23" value="cpe:/a:cesanta:mongoose:{service.version}"/>
4088
+ </fingerprint>
4089
+
4090
+ <fingerprint pattern="^kangle/([\d.]+)$">
4091
+ <description>Bangteng Kangle web server</description>
4092
+ <example service.version="3.5.21.9">kangle/3.5.21.9</example>
4093
+ <param pos="0" name="service.vendor" value="Bangteng"/>
4094
+ <param pos="0" name="service.product" value="Kangle"/>
4095
+ <param pos="1" name="service.version"/>
4096
+ </fingerprint>
4097
+
4098
+ <fingerprint pattern="^Werkzeug/([\d.]+) Python/([\d.]+)$">
4099
+ <description>PalletsProjects Werkzeug web server</description>
4100
+ <example service.version="0.14.1" python.version="3.6.9">Werkzeug/0.14.1 Python/3.6.9</example>
4101
+ <param pos="0" name="service.vendor" value="PalletsProjects"/>
4102
+ <param pos="0" name="service.product" value="Werkzeug"/>
4103
+ <param pos="1" name="service.version"/>
4104
+ <param pos="0" name="service.cpe23" value="cpe:/a:palletsprojects:werkzeug:{service.version}"/>
4105
+ <param pos="2" name="python.version"/>
4106
+ </fingerprint>
4107
+
4108
+ <!-- This is a version of ACME mini_httpd where the value 'mini_httpd' has been
4109
+ replaced with a UUID in the Server header AND body of the response. It
4110
+ is likely vendor or product specific.
4111
+ -->
4112
+
4113
+ <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}$">
4114
+ <description>ACME mini_httpd with randomized Server header</description>
4115
+ <example>a74b7cd4-4a4e-4115-7a48-1c7ebb4ae45b</example>
4116
+ <example>f09f73f0-cac6-422-3660-32ac658c5ae7</example>
4117
+ <example>f24ddd9c-e2a6-23c-ec95-4563173bbe</example>
4118
+ <param pos="0" name="service.vendor" value="ACME"/>
4119
+ <param pos="0" name="service.product" value="mini_httpd"/>
4120
+ <param pos="0" name="service.cpe23" value="cpe:/a:acme:mini_httpd:-"/>
4121
+ </fingerprint>
4122
+
3919
4123
  </fingerprints>