recog 1.0.27 → 1.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e3437ddc17e235ff393ca2c8c8bb973fdd45c3f
-  data.tar.gz: 052a49d19e317e031c5e3a94fc5eb773bcde98ce
+  metadata.gz: 9d5ab28de34e37dfd534c111efd74fcd2d1887f5
+  data.tar.gz: e876bf5c36028c977941722378691b21ca55aa87
 SHA512:
-  metadata.gz: 0d009b086d32a85d7126df08695d9c4885296bf2e2a0010810dc78b20d53a827d97547be2df36bf36506ddbb0e121e4cae02cf9ef37d7eeca92b2e0809e11596
-  data.tar.gz: 29ff97387a57abea24e6e47e114caa53c11a336607f902b90bd5ab18ca535fbb94d4c88fb6486f116c49ed35f94fc47c524a10a223e1bdf1163b84a20798884b
+  metadata.gz: dd3a2972b313e6da47acb8c55a027843fa717a953285ce937b9083bf916999637efcb1c975491d8733a2c37758681393285bb474dc6bbd3a7f67a9ecb5c7f793
+  data.tar.gz: 4d53ea5fd12d2234aff9d2a8d20da9e692992fe75c55bf316dd5766f82b4bccee3a3d6f5945dde8fbf701d368d1caf7b1c5259f5170b2f60bcc2c82e65fea967

data/CONTRIBUTING.md

@@ -88,13 +88,13 @@ In short:
     ```
     git fetch --all
     ```
-    
+
 3. Checkout and branch the PR for testing.  Replace ```PR``` below with the actual PR # in question:
 
     ```
     git checkout -b landing-PR upstream/pr/PR
     ```
-    
+
 4. Test the PR, which typically involves running ```rspec```.
 5. Merge with master, re-test, validate and push:
 
@@ -124,10 +124,11 @@ When a new version of Recog is released, you _must_ do so in two different place
   gem owner recog -a EMAIL
   ```
 3. Edit [lib/recog/version.rb](https://github.com/rapid7/recog/blob/master/lib/recog/version.rb) and increment ```VERSION```.  Commit and push to rapid7/recog master.
-4. Run ```rake release```
+4. Run `rake release`.  Among other things, this creates the new gem, uploads it to Rubygems and tags the release with a tag like `v<VERSION>`, where `<VERSION>` is replaced with the version from `version.rb`.  For example, if you release version 1.2.3 of the gem, the tag will be `v1.2.3`.
+5. If your default remote repository is not `rapid7/recog`, you must ensure that the tags created in the previous step are also pushed to the right location(s).  For example, if `origin` is your fork of recog and `upstream` is `rapid7/master`, you should run `git push --tags --dry-run upstream` to confirm what tags will be pushed and then `git push --tags upstream` to push the tags.
 
 ### Github Release
 
-Some users may prefer to consume recog in a manner other than using git itself.  For that reason, Github offers [Releases](https://github.com/blog/1547-release-your-software).  Whenever a new version of the software is to be released, be kind and also create a new [Release](https://github.com/rapid7/recog/releases), using a versioning scheme identical to that used for the gem
+Some users may prefer to consume recog in a manner other than using git itself.  For that reason, Github offers [Releases](https://github.com/blog/1547-release-your-software).  Whenever a new version of the software is to be released, be kind and also create a new [Release](https://github.com/rapid7/recog/releases), using a versioning scheme identical to that used for the gem.  More specifically, you should use the tag created during the releasing of the gem in the previous section (do *not* create a new tag) and a version that is identical to the tag -- the description of the release should just describe what is going into it.
 
 

data/bin/recog_match

@@ -9,12 +9,12 @@ require 'recog/matcher_factory'
 options = OpenStruct.new(color: false, detail: false, fail_fast: false)
 
 option_parser = OptionParser.new do |opts|
-  opts.banner = "Usage: #{$0} [options] XML_FINGERPRINT_FILE <BANNERS_FILE>"
-  opts.separator "Identifies the matches and misses between the fingerprints and the banners file."
+  opts.banner = "Usage: #{$0} [options] XML_FINGERPRINT_FILE [BANNERS_FILE]"
+  opts.separator "Identifies the matches and misses between the fingerprints and the banners file or STDIN"
   opts.separator ""
   opts.separator "Options"
 
-  opts.on("-f", "--format FORMATTER", 
+  opts.on("-f", "--format FORMATTER",
           "Choose a formatter.",
           "  [s]ummary (default - failure/match msgs)",
           "  [d]etail  (msgs with total counts)") do |format|
@@ -40,9 +40,9 @@ option_parser = OptionParser.new do |opts|
 end
 option_parser.parse!(ARGV)
 
-if ARGV.count != 2
+if ARGV.count != 1 && ARGV.count != 2
   puts option_parser
-  exit
+  exit(1)
 end
 
 ndb = Recog::DB.new(ARGV.shift)

data/lib/recog/version.rb

@@ -1,3 +1,3 @@
 module Recog
-  VERSION = '1.0.27'
+  VERSION = '1.0.28'
 end

data/xml/ftp_banners.xml

@@ -797,16 +797,11 @@ against these patterns to fingerprint FTP servers.
     <param pos="1" name="os.product"/>
     <param pos="2" name="os.version"/>
   </fingerprint>
-  <fingerprint pattern="^(\S+) FTP server \(Version (\S+) \w+ \w+ \d{1,2} \d{1,2}:\d{1,2}:\d{1,2} [A-Z]+ (?:1|2)\d{3}\) ready\.?$">
-    <description>IBM AIX FTP Server</description>
-    <example host.name="ibmoz.tor.rapid7.com" service.version="4.1">ibmoz.tor.rapid7.com FTP server (Version 4.1 Sat Sep 7 14:31:53 CDT 2002) ready.</example>
-    <example>ibmoz.tor.rapid7.com FTP server (Version 5.3 Sat Jan 10 14:01:03 CDT 2012) ready</example>
-    <param pos="0" name="os.vendor" value="IBM"/>
-    <param pos="0" name="os.product" value="AIX"/>
-    <param pos="0" name="service.vendor" value="AIX"/>
-    <param pos="0" name="service.product" value="AIX FTP Server"/>
+  <fingerprint pattern="^(\S+) FTP server \(Version \S+ \w+ \w+ \d{1,2} \d{1,2}:\d{1,2}:\d{1,2} [A-Z]+ (?:1|2)\d{3}\) ready\.?$">
+    <description>Generic/unknown FTP Server found on HP-UX and AIX systems</description>
+    <example host.name="host.example.com">host.example.com FTP server (Version 4.1 Sat Sep 7 14:31:53 CDT 2002) ready.</example>
+    <example host.name="host.example.com">host.example.com FTP server (Version 5.3 Sat Jan 10 14:01:03 CDT 2012) ready</example>
     <param pos="1" name="host.name"/>
-    <param pos="2" name="service.version"/>
   </fingerprint>
   <fingerprint pattern="^Welcome to the (?:Cisco )?(?:TelePresence) ([a-zA-Z\s]*?) ((?:MSE )?\d+), version (\d+.\d+\(\d+.\d+\)).*?" flags="REG_ICASE">
     <description>Cisco TelePresence</description>

data/xml/mysql_banners.xml

@@ -1071,7 +1071,7 @@
     <param pos="0" name="service.product" value="MySQL"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:[^+]+)?\+tld\d">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-\d{1,2}\.\d{1,3}\.\h{1,3})?\+tld\d">
     <example service.version="5.0.91">5.0.91+tld0-log</example>
     <example service.version="5.1.57">5.1.57-5.1.57+tld2-log</example>
     <description>Oracle MySQL packaged by TLD Linux</description>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: recog
 version: !ruby/object:Gem::Version
-  version: 1.0.27
+  version: 1.0.28
 platform: ruby
 authors:
 - Rapid7 Research
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2015-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec