recog 2.3.20 → 2.3.23

data/features/support/hooks.rb

@@ -0,0 +1,9 @@
+require "cucumber/platform"
+
+Before "@requires-ruby-platform-java" do
+ skip_this_scenario unless Cucumber::JRUBY
+end
+  
+Before "@unsupported-on-platform-java" do
+ skip_this_scenario if Cucumber::JRUBY
+end

data/features/verify.feature

@@ -2,47 +2,111 @@ Feature: Verify
   @no-clobber
   Scenario: No tests
     When I run `recog_verify no_tests.xml`
-    Then it should pass with:
+    Then it should pass with exactly:
       """
-      SUMMARY: Test completed with 0 successful, 0 warnings, and 0 failures
+      no_tests.xml: SUMMARY: Test completed with 0 successful, 0 warnings, and 0 failures
       """
 
   @no-clobber
   Scenario: Successful tests
     When I run `recog_verify successful_tests.xml`
-    Then it should pass with:
+    Then it should pass with exactly:
       """
-      SUMMARY: Test completed with 4 successful, 0 warnings, and 0 failures
+      successful_tests.xml: SUMMARY: Test completed with 4 successful, 0 warnings, and 0 failures
       """
 
   @no-clobber
-  Scenario: Tests with warnings, warnings enabled
+  Scenario: Tests with warnings, warnings disabled
+    When I run `recog_verify --no-warnings tests_with_warnings.xml`
+    Then it should pass with exactly:
+      """
+      tests_with_warnings.xml: SUMMARY: Test completed with 1 successful, 0 warnings, and 0 failures
+      """
+ 
+  # These tests vary due to line numbering issues in Nokogiri, so there are different versions
+  # of the same test depending on the ruby runtime. Nokogiri uses libxml under CRuby, and a custom
+  # java-based parser under JRuby. The Java-based parser only approximates line numbers, which are
+  # typically off if XML prolog or comments are present.
+  #
+  # See https://github.com/sparklemotion/nokogiri/issues/2380
+  @no-clobber
+  @unsupported-on-platform-java
+  Scenario: Tests with warnings, warnings enabled (CRuby)
     When I run `recog_verify tests_with_warnings.xml`
     Then it should fail with:
       """
-      WARN: 'Pure-FTPd' has no test cases
-      WARN: 'Pure-FTPd' is missing an example that checks for parameter 'pureftpd.config' messsage which is derived from a capture group
-      SUMMARY: Test completed with 1 successful, 2 warnings, and 0 failures
+      tests_with_warnings.xml:10: WARN: 'Pure-FTPd' has no test cases
+      tests_with_warnings.xml: SUMMARY: Test completed with 1 successful, 1 warnings, and 0 failures
       """
-    And the exit status should be 2
-
+    And the exit status should be 1
+ 
+  # JRuby 9.2.20.1 and 9.3.3.0 differ in how they parse XML, where the latter is more close to libxml
+  # and Nokogiri. We use a regex test to match results from both versions.
   @no-clobber
-  Scenario: Tests with warnings, warnings disabled
-    When I run `recog_verify --no-warnings tests_with_warnings.xml`
-    Then it should pass with:
+  @requires-ruby-platform-java
+  Scenario: Tests with warnings, warnings enabled (JRuby)
+    When I run `recog_verify tests_with_warnings.xml`
+    Then it should fail with regex:
       """
-      SUMMARY: Test completed with 1 successful, 0 warnings, and 0 failures
+      tests_with_warnings.xml:\d+: WARN: 'Pure-FTPd' has no test cases
+      tests_with_warnings.xml: SUMMARY: Test completed with 1 successful, 1 warnings, and 0 failures
       """
+    And the exit status should be 1
 
   @no-clobber
-  Scenario: Tests with failures
+  @unsupported-on-platform-java
+  Scenario: Tests with failures (CRuby)
     When I run `recog_verify tests_with_failures.xml`
     Then it should fail with:
       """
-      FAIL: 'foo test' failed to match "bar" with (?-mix:^foo$)'
-      FAIL: '' failed to match "This almost matches" with (?-mix:^This matches$)'
-      FAIL: 'bar test's os.name is a non-zero pos but specifies a value of 'Bar'
-      FAIL: 'bar test' failed to find expected capture group os.version '5.0'. Result was 1.0
-      SUMMARY: Test completed with 0 successful, 0 warnings, and 4 failures
+      tests_with_failures.xml:3: FAIL: 'foo test' failed to match "bar" with (?-mix:^foo$)'
+      tests_with_failures.xml:8: FAIL: '' failed to match "This almost matches" with (?-mix:^This matches$)'
+      tests_with_failures.xml:13: FAIL: 'bar test's os.name is a non-zero pos but specifies a value of 'Bar'
+      tests_with_failures.xml:13: FAIL: 'bar test' failed to find expected capture group os.version '5.0'. Result was 1.0
+      tests_with_failures.xml:20: FAIL: 'example with untested parameter' is missing an example that checks for parameter 'os.version' which is derived from a capture group
+      tests_with_failures.xml: SUMMARY: Test completed with 1 successful, 0 warnings, and 5 failures
+      """
+    And the exit status should be 5
+ 
+  # JRuby 9.2.20.1 and 9.3.3.0 differ in how they parse XML, where the latter is more close to libxml
+  # and Nokogiri. We use a regex test to match results from both versions.
+  @no-clobber
+  @requires-ruby-platform-java
+  Scenario: Tests with failures (JRuby)
+    When I run `recog_verify tests_with_failures.xml`
+    Then it should fail with regex:
+      """
+      tests_with_failures.xml:\d+: FAIL: 'foo test' failed to match "bar" with \(\?-mix:\^foo\$\)'
+      tests_with_failures.xml:\d+: FAIL: '' failed to match "This almost matches" with \(\?-mix:\^This matches\$\)'
+      tests_with_failures.xml:\d+: FAIL: 'bar test's os\.name is a non-zero pos but specifies a value of 'Bar'
+      tests_with_failures.xml:\d+: FAIL: 'bar test' failed to find expected capture group os\.version '5\.0'. Result was 1\.0
+      tests_with_failures.xml:\d+: FAIL: 'example with untested parameter' is missing an example that checks for parameter 'os\.version' which is derived from a capture group
+      tests_with_failures.xml: SUMMARY: Test completed with 1 successful, 0 warnings, and 5 failures
+      """
+    And the exit status should be 5
+
+  @no-clobber
+  @unsupported-on-platform-java
+  Scenario: recog_verify produces XML errors from the XSD with a malformed XML document (CRuby)
+    When I run `recog_verify --schema-location ../../xml/fingerprints.xsd schema_failure.xml`
+    Then it should fail with:
+      """
+      schema_failure.xml:3: FAIL: 3:0: ERROR: Element 'fingerprint', attribute 'name': The attribute 'name' is not allowed.
+      schema_failure.xml:3: FAIL: 3:0: ERROR: Element 'fingerprint': The attribute 'pattern' is required but missing.
+      schema_failure.xml:3: FAIL: 3:0: ERROR: Element 'fingerprint': Missing child element(s). Expected is ( description ).
+      schema_failure.xml: SUMMARY: Test completed with 0 successful, 0 warnings, and 3 failures
+      """
+    And the exit status should be 3
+
+  @no-clobber
+  @requires-ruby-platform-java
+  Scenario: recog_verify produces XML errors from the XSD with a malformed XML document (JRuby)
+    When I run `recog_verify --schema_location ../../xml/fingerprints.xsd schema_failure.xml`
+    Then it should fail with:
+      """
+      schema_failure.xml:-1: FAIL: -1:-1: ERROR: cvc-complex-type.3.2.2: Attribute 'name' is not allowed to appear in element 'fingerprint'.
+      schema_failure.xml:-1: FAIL: -1:-1: ERROR: cvc-complex-type.4: Attribute 'pattern' must appear on element 'fingerprint'.
+      schema_failure.xml:-1: FAIL: -1:-1: ERROR: cvc-complex-type.2.4.b: The content of element 'fingerprint' is not complete. One of '{description}' is expected.
+      schema_failure.xml: SUMMARY: Test completed with 0 successful, 0 warnings, and 3 failures
       """
-    And the exit status should be 4
+    And the exit status should be 3

data/identifiers/fields.txt

@@ -2,17 +2,16 @@ agilent.serial
 apache.info
 apache.variant
 apache.variant.version
+aptinex.model
 chromecast.capabilities
 chromecast.generation
-chromecast.serial_number
 cisco.imc_model
-cisco.serial_number
+cisco.model
 cookie
 dell.service_tag
+digi.serial_number
 extron.model
-fortinet.serial_number
 host.domain
-host.id
 host.ip
 host.mac
 host.mac_eui64
@@ -25,6 +24,7 @@ hw.device
 hw.family
 hw.model
 hw.product
+hw.serial_number
 hw.series
 hw.vendor
 hw.version
@@ -32,6 +32,7 @@ imail.eval
 jetty.info
 junction.cookie
 junction.name
+lantronix.serial_number
 lenovo.machine_model
 lenovo.machine_type
 linux.kernel.version
@@ -67,7 +68,6 @@ proftpd.server.name
 pureftpd.config
 python.version
 qpopper.version
-ruckus.serial_number
 securetransport.build
 sendmail.config.version
 sendmail.hpux.phne.version
@@ -100,5 +100,6 @@ system.time.millis
 tandberg.model
 thttpd.mx-patch
 tomcat.info
+unify.model
 wd2go.device_id
 zmailer.ident

data/identifiers/hw_device.txt

@@ -25,12 +25,14 @@ Handheld Scanner
 Hypervisor
 IP Camera
 IPS
+IPTV
 Industrial Control
 JTAG Adapter
 KVM
 Laptop
 Light Bulb
 Lights Out Management
+Media Player
 Media Receiver
 Media Server
 Mobile Phone
@@ -42,6 +44,7 @@ Network Audio
 Network Management Device
 PLC
 Power Device
+Power Meter
 Power Relay
 Powerline
 Print Server
@@ -53,6 +56,7 @@ SIP Device
 SIP Gateway
 Scanner
 Security Appliance
+Sensor
 Smart TV
 Storage
 Storage Appliance
@@ -62,17 +66,21 @@ Tablet
 Tape Library
 Telecom
 Test Instrument
+Thin Client
+UPS
 VPN
 Video Conference
 Video Conferencing
 Video Decoder
 Video Encoder
 VoIP
+VoIP Gateway
 VoIP Server
 VoIP Switch
 Voice Appliance
 WAP
 WLAN Repeater
+Web Cam
 Whiteboard
 Wireless Controller
 Wireless Presenter

data/identifiers/hw_family.txt

@@ -9,6 +9,7 @@ Data ONTAP
 DiskStation
 Document Centre
 EDR
+Eurotherm
 Extended Systems ExtendNet
 FRITZ!Box
 FRITZ!Fon
@@ -30,6 +31,7 @@ ILOM
 IMDVR
 ION
 JetDirect
+LX Series
 LaserJet
 LinkCom Xpress
 MGate
@@ -51,6 +53,7 @@ Netscaler
 Network Audio
 Network Security Appliance
 Network Video Door Station
+OpenScape Desk Phone
 Optra
 Orbi
 POWER System
@@ -91,6 +94,7 @@ UniFi
 Unified Security Gateway
 VDX
 VSX
+VVX
 Vigor
 VoIP
 WD2GO
@@ -111,3 +115,7 @@ iPad Air
 iPad Pro
 iPad mini
 iPhone
+iPod
+iSTAR Door Controllers
+imageClass
+imageRunner

data/identifiers/hw_product.txt

@@ -15,20 +15,25 @@ Adaptive Security Appliance
 AirPort Express
 AirPort Extreme
 Alarm Panel
+AmpliFi
 AppDynamics
 Apple TV (2nd generation)
 Apple TV (3rd generation)
 Apple TV (4th generation)
 Apple TV 4K
+Apple TV 4K (2nd generation)
 Appliance
 ArchiveTeam Warrior
 Asset Management
+AutoDome
 AutoVu SharpV
+BlackBox
 BladeSystem Onboard Administrator
 Border GW
 Bridge
 CC EtherNet/IP
 CP
+CU360
 Camera
 Captive Portal
 CarDetector
@@ -39,6 +44,8 @@ Chromecast
 ClearPass Policy Manager
 ClickShare
 CloudKey
+Color Bulb
+CommServer
 CommandPost
 ConnectUPS Web Card
 Crosswork SON Appliance
@@ -48,12 +55,16 @@ DCS-932
 DD OS
 DNA Center
 DSL Router
+DX800A
 Data ONTAP
 Digital Signage Player
 Discover
 Discovery
+DocCam
 Document Centre
+Drone Detector
 DuraFon
+E5810 Gateway Device
 ECOM100
 EDR-G902
 EDR-G903
@@ -67,6 +78,7 @@ EdgeSwitch
 Elevation
 Email Security Gateway
 EqualLogic
+Eternus
 Ethernet Relay Controller
 Ethernet Relay Module
 Excella
@@ -92,10 +104,12 @@ HT812
 HT813
 HT814
 HT818
+Helium Miner
 HiPer Access Router Card
 Home Controller
 Home Gateway
 HomePod
+HomePod mini
 Hue
 HyperFlex Connect
 IA Appliance
@@ -109,6 +123,7 @@ IP2IR
 IPMI
 IVR
 Infinity Controler
+Instreamer
 IntelliSlot Web Card
 Internet Payment Gateway
 Internet Phone Adapter
@@ -119,8 +134,10 @@ J9155A
 JetDirect
 K1000
 KWS-1043N
+KX-NS1000
 Key Management
 Key Management Server
+LORIX ONE
 Lantick Ethernet Relay Controller
 Lencore Sound Manager 2
 MDS 9000
@@ -203,11 +220,15 @@ Mercury
 Mergepoint
 Miniserver
 My Book Live
+N1913A Power Meter
 N5172B Signal Generator
 NAM
 NAS4Free
 NFVIS
 NPort
+NR900
+NTP-2
+NTP-RG-1402G
 NetScaler Gateway
 NetScaler SDX Gateway
 NetScreen
@@ -220,6 +241,7 @@ Network Node
 Network Security Appliance
 Nexus 1000V
 Nexus Player
+Novus UPS
 OfficeConnect Switch
 OnHub
 OpenManage
@@ -227,30 +249,37 @@ OpenManage Switch
 OpenNAC
 Orbi micro
 Orbit IP Camera
+PCoIP Endpoint Device
 PDR M800
 PIAF Virtual Appliance
 PLAY
 PLC-5
 Paragon-100G
 Photonic Switch
+Plug Outdoor
 PoliWall
+PowerLogic Power Meter
 PowerVault 124T
 Prime Collaboration Manager
 Primergy
 Printer
 Prosafe Plus
+Quad Plus Receiver
 R Series
 RT31P2
 RTU
 Rack PDU Card
+RadioLinx
 Raspberry Pi
 ReadyNAS
 RecoverPoint
 ReeCam
 Roku
 Room Alert
+Roomba
 S7 DALI Gateway
 SD-WAN
+SHDSL Router
 SHIELD
 SIP Gateway
 SIParator Firewall
@@ -273,6 +302,7 @@ Site Recovery Manager
 SmartEdge Sensor
 Softswitch
 SolsticePod
+SonicPoint
 SoundPoint
 Spot
 Stealthwatch
@@ -297,9 +327,12 @@ UCM6202
 UCM6204
 UCM6208
 UCS Manager
+UDS
+UPS
 USG20-VPN
 USG40
 USG60
+Ultra Door Controller
 UniFi Cloud Key
 UniFi NVR
 UniFi Security Gateway
@@ -319,6 +352,7 @@ WebBox
 Whiteboard
 Wireless Dock
 Wireless LAN Controller
+Wireless Radio
 Wireless Router
 XCC
 Xfinity Broadband Router
@@ -345,6 +379,7 @@ iMac (21.5-inch, Mid 2010)
 iMac (21.5-inch, Mid 2011)
 iMac (21.5-inch, Mid 2014)
 iMac (24-inch, Early 2009)
+iMac (24-inch, M1, 2021)
 iMac (27-inch, Late 2009)
 iMac (27-inch, Late 2012)
 iMac (27-inch, Late 2013)
@@ -362,12 +397,17 @@ iMac Pro (Retina 5K, Late 2017)
 iPad (4th generation)
 iPad (5th generation)
 iPad (6th generation)
+iPad (7th generation)
+iPad (8th generation)
+iPad (9th generation)
 iPad Air
 iPad Air (3rd generation)
+iPad Air (4th generation)
 iPad Air 2
 iPad Pro (10.5-inch)
 iPad Pro (11-inch)
 iPad Pro (11-inch, 2nd generation)
+iPad Pro (11-inch, 3rd generation)
 iPad Pro (12.9-inch)
 iPad Pro (12.9-inch, 2nd generation)
 iPad Pro (12.9-inch, 3rd generation)
@@ -375,16 +415,22 @@ iPad Pro (12.9-inch, 4th generation)
 iPad Pro (9.7-inch)
 iPad mini
 iPad mini (5th generation)
+iPad mini (6th generation)
 iPad mini 2
 iPad mini 3
 iPad mini 4
 iPhone
+iPhone 11
 iPhone 11 Pro
 iPhone 11 Pro Max
 iPhone 12 5G
 iPhone 12 Mini 5G
 iPhone 12 Pro 5G
 iPhone 12 Pro Max 5G
+iPhone 13
+iPhone 13 Pro
+iPhone 13 Pro Max
+iPhone 13 mini
 iPhone 3G
 iPhone 3GS
 iPhone 4
@@ -406,4 +452,12 @@ iPhone X
 iPhone XR
 iPhone XS
 iPhone XS Max
+iPod Touch (1st generation)
+iPod Touch (2nd generation)
+iPod Touch (3rd generation)
+iPod Touch (4th generation)
+iPod Touch (5th generation)
+iPod Touch (6th generation)
+iPod Touch (7th generation)
+iSTAR Ultra
 vManage

data/identifiers/os_device.txt

@@ -23,6 +23,7 @@ Hypervisor
 IDS
 IP Camera
 IPS
+IPTV
 KVM
 Lights Out Management
 Linux
@@ -67,6 +68,7 @@ VPN
 Video Conferencing
 ViewStation
 VoIP
+VoIP Gateway
 VoIP Switch
 WAN Accelerator
 WAP

data/identifiers/os_family.txt

@@ -185,6 +185,7 @@ System Storage
 T3 Termination
 TASKalfa
 TDS750 Series
+Teradici
 Time Capsule
 TippingPoint
 Total Access
@@ -206,6 +207,7 @@ VRP
 Vantage
 VarioLink
 VarioPrint
+Vigor
 VoIP
 VxWorks
 WAP

data/identifiers/os_product.txt

@@ -81,13 +81,17 @@ Fabric OS
 Fastmark M5
 FaxPress
 Fedora
-Fedora Core Linux
+Fedora Core
+Fermentrack
 Fiery Print Server
 Firepower
 Firewall-1
 Fireware
 FortiOS
 FreeBSD
+FreeNAS Firmware
+Freebox OS
+FreshTomato
 G2 Console Switch
 GAiA OS
 GXP1610 Firmware
@@ -116,13 +120,13 @@ IPReach
 IPSO
 IRIX
 Integrated Lights Out Manager
-Integrated Lights Out Manager firmware
 Irix
 Isilon OneFS OS
 JetDirect
 Junos OS
 Kamikaze
 KeeneticOS
+LORIX OS
 LX
 Linux
 Linux AMI
@@ -136,10 +140,12 @@ Mac OS
 Mac OS X
 Mac OS X Server
 Management Processor
+Media Server
 Meeting Management
 MegaRAC
 Mergepoint
 Meridian 1 Call Server
+Mongoose OS
 NAM
 NAS4Free
 NEO Tape Library
@@ -147,6 +153,8 @@ NET+OS
 NFVIS
 NRG Printer
 NT
+NTP-2 Firmware
+NTP-RG-1402G Firmware
 NX-OS
 NetBSD
 NetCache
@@ -167,6 +175,7 @@ OSSIM
 OfficeConnect Cable Modem
 Onboard Administrator
 OneFS
+Onyx
 OpenBSD
 OpenMediaVault
 OpenServer
@@ -216,6 +225,7 @@ SCO UNIX
 SEHI
 SINIX
 SL2100 Firmware
+SMG Firmware
 SPA112 Firmware
 SPA122 Firmware
 SV8100 Firmware
@@ -225,6 +235,7 @@ ScanFront
 ScreenOS
 Secure Linux
 SecureOS
+Serenity
 SmartEdge OS
 SmartServer
 SmoothWall
@@ -241,6 +252,7 @@ SuperStack 3
 SuperStack 3 Firewall
 SuperStack II
 SureStore Tape Library
+SwOS
 Switch
 TMS zl Module
 TRU64
@@ -251,6 +263,8 @@ Tenable Core
 TetrationOS
 TimOS
 Time Capsule Firmware
+Tomato
+TomatoUSB
 Traverse
 Tru64 Unix
 UCM6202 Firmware
@@ -263,6 +277,7 @@ USG40 firmware
 USG60 firmware
 Ubuntu Linux
 Ultrix
+Unified SIP Phone 3900 Firmware
 UnixWare
 VBrick Rev
 VIDOS-NVR
@@ -338,4 +353,5 @@ ipOS
 tvOS
 vManage
 vSphere Management Assistant
+webOS
 z/OS