recog 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11aff7826c38e379d719a70b39406f4d861f8d3f
-  data.tar.gz: 98f54e902871cb73ddcffbb7e0f72be5b21bf143
+  metadata.gz: 3dae72d67109cf15c20e6558c44ad5f738c87804
+  data.tar.gz: 8cc293a78015095182401d7683cb6af9e6ebdb9e
 SHA512:
-  metadata.gz: 398dc88dfda3030d5d0e8da3c0774fc95ec99c2506f9f15ba528ef5ec930591f02f43d313ec5ed06cb4b7bb28798ef71bf53a539a6b50b8158a7f0b69877e0ed
-  data.tar.gz: 19bf9ddccb4031ade9bf5d94feb4516df400816eaf81a894b24716e06ef7e5d5a2400bd0424d55875b38451fcad83edb7f99f7b00ac1e38fa059447682f17d0a
+  metadata.gz: cedc1ee373b890001b36169dad53ecd92566c2ee307e66d28d46c094ece296e73527a7b6d464182ad4ecdb665d35c55b7d5a129646c4d3eedaeeafdc44892f1b
+  data.tar.gz: 58f1a2f88709b31d1edc8c028f6848ac581f4c597c11d137eff2538b4d43ee65189c5c36ffdc7848077e2f32662618384d7b172195f8a9e34fd846de541c4bce

data/lib/recog/fingerprint.rb

@@ -108,8 +108,11 @@ class Fingerprint
     return if params.empty?
     params.each do |param_name, pos_value|
       pos, value = pos_value
-      next unless pos != 0 && !value.to_s.empty?
-      yield :fail, "'#{@name}'s #{param_name} is a non-zero pos but specifies a value of '#{value}'"
+      if pos > 0 && !value.to_s.empty?
+        yield :fail, "'#{@name}'s #{param_name} is a non-zero pos but specifies a value of '#{value}'"
+      elsif pos == 0 && value.to_s.empty?
+        yield :fail, "'#{@name}'s #{param_name} is not a capture (pos=0) but doesn't specify a value"
+      end
     end
   end
 

data/lib/recog/version.rb

@@ -1,3 +1,3 @@
 module Recog
-  VERSION = '2.1.0'
+  VERSION = '2.1.1'
 end

data/spec/lib/fingerprint_self_test_spec.rb

@@ -31,6 +31,23 @@ describe Recog::DB do
       db.fingerprints.each_index do |i|
         fp = db.fingerprints[i]
 
+        context "#{fp.name}" do
+          fp.params.each do |param_name, pos_value|
+            pos, value = pos_value
+            it "doesn't have param values for capture params" do
+              if pos > 0 && !value.to_s.empty?
+                fail "'#{fp.name}'s #{param_name} is a non-zero pos but specifies a value of '#{value}'"
+              end
+            end
+
+            it "doesn't omit values for non-capture params" do
+              if pos == 0 && value.to_s.empty?
+                fail "'#{fp.name}'s #{param_name} is not a capture (pos=0) but doesn't specify a value"
+              end
+            end
+          end
+        end
+
         context "#{fp.regex}" do
 
           it "has a name" do

data/xml/ftp_banners.xml

@@ -308,8 +308,7 @@ more text</example>
     <example>OOPS: vsftpd: root is not mounted.</example>
     <example>OOPS: cannot read user list file:/etc/vsftpd.user_list</example>
     <param pos="0" name="service.family" value="vsFTPd"/>
-    <param pos="0" name="service.product" value="vsFTPd Extended"/>
-    <param pos="0" name="service.version"/>
+    <param pos="0" name="service.product" value="vsFTPd"/>
   </fingerprint>
   <fingerprint pattern="^FileZilla Server(?: version)? (?:v)?(\d\.[\w.]+(?: beta)?).*$">
     <description>FileZilla FTP Server</description>
@@ -1070,7 +1069,7 @@ more text</example>
     <param pos="0" name="service.vendor" value="GNU"/>
     <param pos="1" name="service.version"/>
     <param pos="0" name="hw.vendor" value="ZyXEL"/>
-    <param pos="1" name="hw.family" value="WiMax"/>
+    <param pos="0" name="hw.family" value="WiMax"/>
     <param pos="0" name="hw.device" value="WAP"/>
   </fingerprint>
   <fingerprint pattern="^Speedport W ?(\S+) (?:Typ [A|B] )?FTP Server v([\d.]+) ready$$">
@@ -1080,7 +1079,7 @@ more text</example>
     <example hw.product="722V" os.version="1.18.000">Speedport W722V FTP Server v1.18.000 ready</example>
     <param pos="0" name="hw.vendor" value="Deutsche Telekom"/>
     <param pos="0" name="hw.device" value="WAP"/>
-    <param pos="1" name="hw.family" value="Speedport"/>
+    <param pos="0" name="hw.family" value="Speedport"/>
     <param pos="1" name="hw.product"/>
     <param pos="2" name="os.version"/>
   </fingerprint>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: recog
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Rapid7 Research
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-22 00:00:00.000000000 Z
+date: 2016-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -237,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Network service fingerprint database, classes, and utilities
@@ -268,4 +268,3 @@ test_files:
 - spec/lib/recog/nizer_spec.rb
 - spec/lib/recog/verify_reporter_spec.rb
 - spec/spec_helper.rb
-has_rdoc: