recog 2.0.8 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccdc187cc96b70c8813cac26d08fb01058f2f72f
-  data.tar.gz: 463cc3f770b600319662f99661a7be4a59fbc8db
+  metadata.gz: 7d1785649ccc5bd00c514b2963c659413584e803
+  data.tar.gz: 7f48e11585c4af802e79a1dedb68b504d54f6142
 SHA512:
-  metadata.gz: 9306e8a742f0d62b7bc5b9cd05ddd59281e53e2eff690ad9deff6a8e20563b1ab5ceda9876b5c0c72776898e22a5180748b3012f137a142368ba098a3a974771
-  data.tar.gz: e859cef083196033c6a46b287c96c46331c7e17fdbd58a3c132db61bbbbe1cf2d6dc49911e7a00d5f0f5eeef11dc034b2eec84e650dc9c2b16c8930d56a2bc4a
+  metadata.gz: 4a6b6a0648b32bc35a1c56c581c0f906ab0fef35e53e44d139aa1e3eaa8b0e04e3b4e26bc84df356937cce15bfd50d18c9dab59e7badc750f38de968de0a9eed
+  data.tar.gz: 9228765a199a1f24b1d001177cf77192de63bd03bb6989864f354b4be9bdddf4eda1af0240a4b4e498847ef0cad17b82ede5ab44ac44783363a3f876e80119ea

data/CONTRIBUTING.md

@@ -45,7 +45,7 @@ git fetch --all
 If you have a contribution to make, first create a branch to contain your
 work.  The name is yours to choose, however generally it should roughly
 describe what you are doing.  In this example, and from here on out, the
-branch will be FOO, but you should obviously change this
+branch will be FOO, but you should obviously change this:
 
 ```
 git fetch --all
@@ -54,13 +54,7 @@ git rebase upstream/master
 git checkout -b FOO
 ```
 
-Now, make your changes, committing as necessary, using useful commit messages:
-
-```
-vim CONTRIBUTING.md
-git add CONTRIBUTING.md
-git commit -m "Add a document on how to contribute to recog" -a
-```
+Now, make your changes, commit as necessary with useful commit messages. 
 
 Please note that changes to [lib/recog/version.rb](https://github.com/rapid7/recog/blob/master/lib/recog/version.rb) in PRs are almost never necessary.
 
@@ -72,6 +66,10 @@ git push origin FOO
 
 Finally, submit the PR.  Navigate to ```https://github.com/<your-github-username>/recog/compare/FOO```, fill in the details and submit.
 
+### Testing
+
+When your PR is submitted, it will be automatically subjected to the full run of tests in [Travis](https://travis-ci.org/rapid7/recog/), however you are encourage to perform testing _before_ submitting the PR.  To do this, simply run `rake tests`.
+
 ## Landing PRs
 
 (Note: this portion is a work-in-progress.  Please update it as things change)
@@ -100,7 +98,7 @@ In short:
     ```
     git checkout -b landing-PR upstream/pr/PR
     ```
-5. Test the PR, which typically involves running ```rspec```.
+5. Test the PR (see the Testing section above)
 6. Merge with master, re-test, validate and push:
 
     ```

data/COPYING

@@ -0,0 +1,23 @@
+Copyright (c) 2014-2015, Rapid7
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice, this
+  list of conditions and the following disclaimer in the documentation and/or
+  other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/LICENSE

@@ -1,23 +1,7 @@
-Copyright (c) 2014-2015, Rapid7
-All rights reserved.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: https://github.com/rapid7/recog
 
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
+Files: *
+Copyright: 2014-2015, Rapid7, Inc.
+License: BSD-2-clause
 
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice, this
-  list of conditions and the following disclaimer in the documentation and/or
-  other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/lib/recog/version.rb

@@ -1,3 +1,3 @@
 module Recog
-  VERSION = '2.0.8'
+  VERSION = '2.0.9'
 end

data/xml/ftp_banners.xml

@@ -904,4 +904,12 @@ against these patterns to fingerprint FTP servers.
     <example>FTP Server Ready</example>
     <example>FTP service ready.</example>
   </fingerprint>
+
+  <fingerprint pattern="^Welcom to ProRat Ftp Server$">
+     <description>The FTP server of the ProRat malware</description>
+     <example>Welcom to ProRat Ftp Server</example>
+     <param pos="0" name="service.vendor" value="Pro Group"/>
+     <param pos="0" name="service.product" value="ProRat"/>
+  </fingerprint>
+
 </fingerprints>

data/xml/http_servers.xml

@@ -1781,6 +1781,14 @@
       <param pos="0" name="service.product" value="Oracle Application Server Containers"/>
       <param pos="0" name="service.family" value="Oracle"/>
       <param pos="1" name="service.version"/>
+    </fingerprint>
+
+   <fingerprint pattern="^Oracle Containers for J2EE$">
+      <example>Oracle Containers for J2EE</example>
+      <description>Oracle Application Server Containers for J2EE</description>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.product" value="Oracle Application Server Containers"/>
+      <param pos="0" name="service.family" value="Oracle"/>
    </fingerprint>
 
    <fingerprint pattern="^Oracle Application Server/10g \(([\d.]+)\) Apache/([12][\d.]+)\s*(.*)$">
@@ -3376,6 +3384,13 @@
       <param pos="1" name="service.version"/>
    </fingerprint>
 
+   <fingerprint pattern="^Aspen/(\S+)">
+      <description>Aspen web server</description>
+      <example service.version="0.8">Aspen/0.8</example>
+      <param pos="0" name="service.product" value="Aspen"/>
+      <param pos="1" name="service.version"/>
+    </fingerprint>
+
    <fingerprint pattern="^Boa/([\d\.]+\S*)">
       <description>Boa web server</description>
       <example service.version="0.94.14rc21">Boa/0.94.14rc21</example>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: recog
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
 platform: ruby
 authors:
 - Rapid7 Research
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-15 00:00:00.000000000 Z
+date: 2015-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -126,6 +126,7 @@ files:
 - ".travis.yml"
 - ".yardopts"
 - CONTRIBUTING.md
+- COPYING
 - Gemfile
 - LICENSE
 - README.md