recog 2.3.7 → 2.3.8

data/identifiers/vendor.txt

@@ -0,0 +1,405 @@
+2Wire
+3Com
+4D
+ACC
+ACME Laboratories
+Acorn
+Actiontec
+ActiveState
+Adaptec
+ADC
+Adobe
+Adtran
+AIM
+Aironet
+Alcatel
+Allegro Software
+Allied Telesyn
+Alpha Micro
+Alpine
+Alteon
+Alt-N
+Amazon
+AMD
+Amiga
+AnalogX
+Apache
+APC
+Apollo
+Apple
+Aprelium Technologies
+Arescom
+ArGoSoft
+Arlan
+ARM
+ARRIS
+Artifex Software Inc.
+Asante
+Ascend
+Ascom
+Asianux
+Atari
+ATG
+AtheOS
+Atrium Software
+Attachmate
+Auspex
+Avaya
+Avocent
+Axent
+Axis
+Bay Networks
+Be
+BEA
+Bell Labs
+Bintec
+Bitvise
+Blue Coat
+Borderware
+Brix Networks
+Brocade
+Brother
+BSDi
+BT
+Buffalo
+Business Objects
+Cabletron
+Cacheflow
+Canon
+Canonical
+Cantillion
+Capellix
+Castelle
+CastleNet
+Caucho
+Cayman
+CentOS
+Chase
+Check Point
+CherryPy
+Cisco
+Citrix
+Clearswift
+CNET
+CNT
+Cobalt
+Commodore
+Compaq
+Compatible Systems
+Computer Associates
+Computone
+Conectiva
+Conexant
+Convex
+Copper Mountain
+Corega
+Cray
+Critical Path
+CSM
+CyberArk
+CyberGuard
+Cyclades
+Data General
+Datamax
+DataVoice
+Debian
+DEC
+Dell
+Digital Link
+Digital Networks
+DigiTel
+D-Link
+Docker Inc.
+DrayTek
+EasyTel
+Eaton
+Edimax
+Eicon
+Ektron
+ELSA
+Embedthis
+EMC
+EMWAC
+Enterasys
+Epson
+EqualLogic
+Ericsson
+Eudora
+EUSSO
+Exabyte
+exim
+ExtendNet
+Extreme Networks
+F5
+FastComm
+FatWire
+FiberLine
+Floosietek
+FlowPoint
+Fore
+FortiNet
+Foundry
+Foxit Software Inc.
+FreeBSD
+FreeScale
+FreeSCO
+Fujitsu Siemens
+GalactiComm
+Gandalf
+Gauntlet
+Genius
+Gentoo
+Gigamon
+Global Technology Associates
+GlobalScape
+GNet
+GNU
+Google
+Gordano
+Hawking
+Hitachi
+Hospira
+HP
+Huawei
+Hydra
+IBM
+Imagistics
+Innovaphone
+Intel
+Intergraph
+IPCop
+Ipswitch
+Isolation
+IXIA
+Juniper
+KA9Q
+Kaspersky Lab
+Kentrox
+Kerio
+Konica
+Kronos
+Kyocera
+Labtam
+LANCOM Systems
+Lantronix
+Leunig
+Lexmark
+LG Goldstream
+Linksys
+Linux
+Linux Foundation
+Livingston
+LogMeIn
+Lotus
+Lucent
+LWIP
+Lyris
+Macromedia
+Madge
+Magna
+Mail-Max
+Mandrake
+Mandriva
+Maxim IC
+McAfee
+Megabit
+Merak
+Meridian
+MetaInfo
+Microbase
+Microplex
+Microsoft
+MikroTik
+Minix
+Minolta
+Mirapoint
+Mocana
+Moodle
+Mort Bay
+Motorola
+Mozilla
+MRV Communications
+MultiTech
+MySQL
+NAT
+NCD
+NcFTP Software
+NCR
+NEC
+Neoware
+NetApp
+NetBSD
+Netgear
+NetJet
+NetMatrix
+Netopia
+Netscape
+NetScreen
+NetSilicon
+Network Systems
+Nexland
+NeXT
+Nokia
+Nortel
+Norton
+Novell
+NSG
+NTT
+Oce
+Okidata
+Omron
+OpenBSD
+OpenJDK
+OpenSUSE
+Opera Software
+Oracle
+Overland
+Oversee
+ownCloud
+Packet Engines
+Packeteer
+Palm
+Palo Alto Networks
+Panasonic
+Paul Smith Computer Services
+Philips
+PHP
+phpMyAdmin
+Pigtail
+Piriform
+Pitney Bowes
+Plain Black
+Planet
+PLD
+Polycom
+Postgres
+PowerWare
+Pragma Systems
+PreEmptive Solutions
+Process Software
+Proteon
+Proxim
+qmail
+QMS
+QNX
+Qualcomm
+Quanterra
+Quantum
+Racal
+Radionics
+Rapid7
+Raptor
+Rarlab
+RCA
+RealMedia
+Red Hat
+Redback
+Rhino Software
+Ricoh
+Ringdale
+Riverbed Technology
+Riverstone Networks
+RoadLanner
+Rockliffe
+Rockwell
+Roxen
+rPath
+SafeNet
+SAP
+SAR
+Savin
+SBLIM
+Schneider Electric
+SCO
+Seattle Labs
+Secure Computing
+Sega
+Sendmail
+Sequent
+SGI
+Sharp
+Shiva
+Siebel
+Siemens
+Simon Tatham
+Slackware
+SMC
+SmoothWall
+SonicWALL
+SonoSite
+Sony
+Sophos
+Source Technologies
+Sourcefire
+SpeedStream
+Sphera
+SSH Communications Security
+StackTools
+Standard Networks
+StartCom
+Stratus
+Sun
+SUSE
+Sybase
+Symantec
+Symbol
+SysTech
+Tahoe
+Tally
+Tandberg
+Tandem
+Tasman Networks
+Tekelec
+Tektonix
+Telebit
+Telindus
+Telocity
+Teltrend
+Thomson
+TIS
+TOR
+Toshiba
+Trancell
+Trend Micro
+Truetime
+Trustix
+Turbolinux
+Turtle Beach
+Twisted Matrix Labs
+TYPO3
+Ubuntu
+Unica
+UnitedLinux
+US Robotics
+VanDyke Software
+Vanguard
+VersaNet
+VideoLAN
+Vignette
+Vine
+Vircom
+Virtual Access
+VMware
+WatchGuard
+Webmin
+WebTrends
+White Box
+Wind River
+Wireshark
+Wordpress
+WTI
+XCD
+Xerox
+Xitami
+XMach
+XnSoft
+Xylan
+Xylogics
+Xyplex
+Yahoo
+Yamaha
+Zero One
+ZMailer
+Zoom
+ZoomAir
+Zyxel

data/lib/recog/version.rb

@@ -1,3 +1,3 @@
 module Recog
-  VERSION = '2.3.7'
+  VERSION = '2.3.8'
 end

data/spec/lib/fingerprint_self_test_spec.rb

@@ -113,7 +113,7 @@ describe Recog::DB do
               actual_capture_positions = []
               capture_number = 1
               Regexp::Scanner.scan(fp.regex).each do |token_parts|
-                if token_parts.first == :group  && ![:close, :passive, :options].include?(token_parts[1])
+                if token_parts.first == :group  && ![:close, :passive, :options, :options_switch].include?(token_parts[1])
                   actual_capture_positions << capture_number
                   capture_number += 1
                 end

data/spec/lib/recog/fingerprint/regexp_factory_spec.rb

@@ -26,7 +26,7 @@ describe Recog::Fingerprint::RegexpFactory do
     subject { described_class.build_options(flags) }
 
     let(:flags) { [ ] }
-    it { is_expected.to be_a(Fixnum) }
+    it { is_expected.to be_a(Integer) }
 
     context 'without any explicit flags' do
       let(:flags) { [ ] }

data/update_cpes.py

@@ -67,7 +67,7 @@ def update_cpes(xml_file, cpe_vp_map, r7_vp_map):
                 if not fp_type in params:
                     params[fp_type] = {}
                 if name in params[fp_type]:
-                    raise ValueError('Duplicated fingerprint named {} in {}'.format(name, fingerprint.attrib['pattern']))
+                    raise ValueError('Duplicated fingerprint named {} in fingerprint {} in file {}'.format(name, fingerprint.attrib['pattern'], xml_file))
                 params[fp_type][name] = param
 
 

data/xml/apache_os.xml

@@ -10,6 +10,7 @@
     <param pos="0" name="os.vendor" value="IBM"/>
     <param pos="0" name="os.family" value="OS/400"/>
     <param pos="0" name="os.product" value="OS/400"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:ibm:os_400:-"/>
   </fingerprint>
   <fingerprint pattern=".*\(Mandrake Linux/\d+\.\d+\.92mdk\).*">
     <description>Mandriva (formerly Mandrake) Linux 9.2</description>
@@ -144,6 +145,14 @@
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:redhat:linux:-"/>
   </fingerprint>
+  <fingerprint pattern=".*\(Red Hat Enterprise (?:Linux)?\).*">
+    <description>Apache OS: Red Hat Enterprise Linux</description>
+    <example os.vendor="Red Hat">Apache/2.4.6 (Red Hat Enterprise Linux) OpenSSL/1.0.2k-fips</example>
+    <param pos="0" name="os.vendor" value="Red Hat"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Enterprise Linux"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:redhat:enterprise_linux:-"/>
+  </fingerprint>
   <fingerprint pattern=".*Debian(?:[/ ]GNU)?(?:/Linux)?.*">
     <description>Debian Linux</description>
     <param pos="0" name="os.vendor" value="Debian"/>