recog 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c0a664d63aaf4f4e21495af1bb5b9f9fdd1288b
-  data.tar.gz: 8722579af2ab431ae3daee15f18215c6daa11c31
+  metadata.gz: 73a7056d5f4ac17ab0cc7b504bf9db0055f6a62c
+  data.tar.gz: f390a10a9c915d60ec6b1c3ef9b30b5b446163d1
 SHA512:
-  metadata.gz: c954a0f4fbf3ca03eb92b4b93ae1169515a341967b2a8469711330d82a2e5c0b2e560c54a18a95cc6c56ebefbeacda3c46bf2870800e04149c1325232f5bbafc
-  data.tar.gz: 550a950abb19fb5effa42981ab32bf63e107aba3b49020c3e1ef181988b431988fc1bbf113e496b0a305bb827a6ef9d29971ce9eaba3bb5b29bbcd11458c2e31
+  metadata.gz: b2f5cb872f1149451100f9b22298491af23dcfd41f21f877d4c3c1bc1af18331b7947778bb8548c25a902f0598418ca53f522d163b3d05c6d7b32e01d6a79e9f
+  data.tar.gz: 9cfdd14324588db594181ad36c304aa63fed15a84fde022055967b054d1e660970ebb35849a7551561723c2bdaac4b3e398a989f2d3ef25a7cb691526a058ee2

data/CONTRIBUTING.md

@@ -5,7 +5,7 @@ you can make to the project.  These contributions typically come in the form of
 filed bugs/issues or pull requests (PRs).  These contributions routinely result
 in new versions of the [recog gem](https://rubygems.org/gems/recog) and the
 [recog release](https://github.com/rapid7/recog/releases) to be released.  The
-process for each is outlined below.
+process for everything is described below.
 
 ## Contributing Issues / Bug Reports
 
@@ -73,19 +73,57 @@ 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.
 
+## Landing PRs
+
+(Note: this portion is a work-in-progress.  Please update it as things change)
+
+Much like with the process of submitting PRs, Recog's process for landing PRs
+is very similar to [Metasploit's process for landing
+PRs](https://github.com/rapid7/metasploit-framework/wiki/Landing-Pull-Requests).
+In short:
+
+1. Follow the "Fork and Clone" steps from above
+2. Fetch the latest revisions:
+
+    ```
+    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:
+
+    ```
+    git checkout -b upstream-master --track upstream/master
+    git merge -S --no-ff --edit landing-PR
+    git push upstream upstream-master:master --dry-run # confirm you are pushing what you expect
+    git push upstream upstream-master:master
+    ```
+
 ## Releasing New Versions
 
-Typically this process is reserved for contributors with push permissions to Recog:
+When Recog's critical parts are modified, for example its fingerprints or
+underlying supporting code, a new version should eventually be released.  These
+new releases can then be optionally included in projects such as Metasploit or
+products such as Rapid7's in a controlled manner.
+
+For now, in general any time Recog is modified you should release a version of
+the Gem and the Github release, described below.  Eventually this process may
+change.
 
 ### Release New Gem
 
 1. Get an account on [Rubygems](https://rubygems.org)
-2. Contact one of the Recog project contributors and have them add you to the Recog gem.  They'll need to run:
-```
-gem owner recog -a EMAIL
-```
-Where ```EMAIL``` is the email address you registered on Rubygems.
-3. Edit [lib/recog/version.rb](https://github.com/rapid7/recog/blob/master/lib/recog/version.rb) and increment ```VERSION```.  Commit and push to origin/upstream master.
+2. Contact one of the Recog project contributors (listed [here under OWNERS](https://rubygems.org/gems/recog) and have them add you to the Recog gem.  They'll need to run:
+  ```
+  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```
 
 ### Github Release

data/lib/recog/version.rb

@@ -1,3 +1,3 @@
 module Recog
-  VERSION = '1.0.10'
+  VERSION = '1.0.11'
 end

data/xml/http_servers.xml

@@ -2996,6 +2996,26 @@
       <param pos="1" name="service.version"/>
    </fingerprint>
 
+   <fingerprint pattern="^TornadoServer/((?:\d+\.)*\d+)$" flags="REG_ICASE">
+      <example>TornadoServer/4.0.2</example>
+      <description>Tornado Python web framework and asynchronous networking library.</description>
+      <param pos="0" name="service.vendor" value="Tornado"/>
+      <param pos="0" name="service.product" value="Tornado"/>
+      <param pos="0" name="service.family" value="Tornado"/>
+      <param pos="1" name="service.version"/>
+   </fingerprint>
+
+   <fingerprint pattern="^SimpleHTTP/((?:\d+\.)*\d+)\s*Python/((?:\d+\.)*\d+)$" flags="REG_ICASE">
+      <example>SimpleHTTP/0.6 Python/2.7.6</example>
+      <example>SimpleHTTP/0.6 Python/3.4.0</example>
+      <description>SimpleHTTPRequestHandler Python class is a simple HTTP request handler.</description>
+      <param pos="0" name="service.vendor" value="Python Software Foundation"/>
+      <param pos="0" name="service.product" value="SimpleHTTP"/>
+      <param pos="0" name="service.family" value="Python"/>
+      <param pos="1" name="service.version"/>
+      <param pos="2" name="python.version"/>
+   </fingerprint>
+
    <fingerprint pattern="^HP Web Jetadmin/((?:\d+\.)+\d+)\s*(.*)$">
       <example>HP Web Jetadmin/2.0.50 (Win32) mod_auth_sspi/1.0.1 mod_ssl/2.0.50 OpenSSL/0.9.6m</example>
       <description>Apache variant for web access to HP printers.</description>

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: recog
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Rapid7 Research
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Recog is a framework for identifying products, services, operating systems,
@@ -121,10 +121,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- ".yardopts"
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
@@ -215,17 +215,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Network service fingerprint database, classes, and utilities