recog-intrigue 2.3.7 → 2.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ce6e9357161c0d9ccd4a78a1b29c32ad316d5ebdbc36d1c14c83e7642a4ee87
-  data.tar.gz: 55a033985a85110154d9eb1fda16a4a860ee6f4490cb162ed8e5ed5bdb8d8c8f
+  metadata.gz: 58547f0ee3dd0397d724499e035f9549e9d8bcc4dd0fc656db8ffb270d66189d
+  data.tar.gz: 93215d90b016f8828d2ec8eb900ec9a757ca3d64ed6175227755765186a4c5bb
 SHA512:
-  metadata.gz: 625729df058c4a85767187b2244edc45a6b7f038f5cd620d7f986adb62744479cf9a4592b827dae962158b32dab3cd97463d237b25425016d87263e596dad304
-  data.tar.gz: ccfdfed40b6691f9477f29d311a1e41273a85cbb481693f4377ab0547ba0fed8ddf765d00c5a6348b9bef673205bf4afbdbc8a27b32fd25b01e82b11ff5a412c
+  metadata.gz: 81bc16e8cdf1aa637847548f66fed86793c55f1a6aa3d05940f12e5e8bdc6dfa50f8934738c37f4601737a72b305949b37e3d615118c8717c1c73bc258261c74
+  data.tar.gz: ad7213eda987963e0dbbd96867c98868ebe46a27b04a01cc1627dd11b70472b6c040b9c81da01ee26fa13200eb864bd525f0409de63ba79280792711b9c8a600

data/.github/SECURITY.md

@@ -0,0 +1,35 @@
+# Reporting security issues
+
+Thanks for your interest in making Recog more secure! If you feel
+that you have found a security issue involving Metasploit, Meterpreter,
+Recog, or any other Rapid7 open source project, you are welcome to let
+us know in the way that's most comfortable for you.
+
+## Via ZenDesk
+
+You can click on the big blue button at [Rapid7's Vulnerability
+Disclosure][r7-vulns] page, which will get you to our general
+vulnerability reporting system. While this does require a (free) ZenDesk
+account to use, you'll get regular updates on your issue as our software
+support teams work through it. As it happens [that page][r7-vulns] also
+will tell you what to expect when it comes to reporting vulns, how fast
+we'll fix and respond, and all the rest, so it's a pretty good read
+regardless.
+
+## Via email
+
+If you're more of a traditionalist, you can email your finding to
+security@rapid7.com. If you like, you can use our [PGP key][pgp] to
+encrypt your messages, but we certainly don't mind cleartext reports
+over email.
+
+## NOT via GitHub Issues
+
+Please don't! Disclosing security vulnerabilities to public bug trackers
+is kind of mean, even when it's well-intentioned, since you end up
+dropping 0-day on pretty much everyone right out of the gate. We'd prefer
+you didn't!
+
+[r7-vulns]:https://www.rapid7.com/security/disclosure/
+[pgp]:https://keybase.io/rapid7/pgp_keys.asc?fingerprint=9a90aea0576cbcafa39c502ba5e16807959d3eda
+

data/.gitignore

@@ -6,9 +6,18 @@ pkg/
 
 /Gemfile.lock
 
+#Python specific
+venv
+
 # IDE specific
 .vscode/
 .idea
 
 # Misc
 **/.DS_Store
+
+# CPE XML
+official-cpe-dictionary*.xml
+
+# CPE Remap Errors
+errors.txt

data/CONTRIBUTING.md

@@ -3,9 +3,24 @@
 The users and maintainers of Recog would greatly appreciate any contributions
 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) to be
+in new versions of the [recog gem](https://rubygems.org/gems/recog) being
 released.  The process for everything is described below.
 
+## Table of Contents
+
+1. [Contributing Issues / Bug Reports](#contributing-issues-/-bug-reports)
+1. [Contributing Code](#contributing-code)
+    1. [Fork and Clone](#fork-and-clone)
+    1. [Branch and Improve](#branch-and-improve)
+    1. [Testing](#testing)
+1. [Fingerprints](#fingerprints)
+    1. [Best Practices](#best-practices)
+    1. [Fingerprint Testing](#fingerprint-testing)
+    1. [Updating CPEs](#updating-cpes)
+1. [Project Operations](#project-operations)
+    1. [Landing PRs](#landing-prs)
+    1. [Releasing New Versions](#releasing-new-versions)
+
 ## Contributing Issues / Bug Reports
 
 If you encounter any bugs or problems with Recog, please file them
@@ -14,6 +29,8 @@ possible.  If the bug is straight-forward enough and you understand the fix for
 the bug well enough, you may take the simpler, less-paperwork route and simply
 fill a PR with the fix and the necessary details.
 
+[^back to top](#contributing-to-recog)
+
 ## Contributing Code
 
 Recog uses a model nearly identical to that of
@@ -26,33 +43,39 @@ this document.
 
 On the other hand, if you haven't, read on!
 
+[^back to top](#contributing-to-recog)
+
 ### Fork and Clone
 
 Generally, this should only need to be done once, or if you need to start over.
 
 1. Fork Recog: Visit https://github.com/rapid7/recog and click Fork,
    selecting your github account if prompted
-2.  Clone ```git@github.com:<your-github-username>/recog.git```, replacing
-```<your-github-username>``` with, you guessed it, your Github username.
-3.  Add the master Recog repository as your upstream:
-
- ```
-   git remote add upstream git://github.com/rapid7/recog.git
- ```
-4. Update your `.git/config` to ensure that the `remote ["upstream"]` section is configured to pull both branches and PRs from upstream.  It should look something like the following, in particular the second `fetch` option:
+1. Clone `git@github.com:<your-github-username>/recog.git`, replacing
+`<your-github-username>` with, you guessed it, your Github username.
+1. Add the master Recog repository as your upstream:
 
+     ```bash
+    git remote add upstream git://github.com/rapid7/recog.git
     ```
+
+1. Update your `.git/config` to ensure that the `remote ["upstream"]` section is configured to pull both branches and PRs from upstream.  It should look something like the following, in particular the second `fetch` option:
+
+    ```bash
      [remote "upstream"]
       url = git@github.com:rapid7/recog.git
       fetch = +refs/heads/*:refs/remotes/upstream/*
       fetch = +refs/pull/*/head:refs/remotes/upstream/pr/*
      ```
-5. Fetch the latest revisions, including PRs:
 
-    ```
+1. Fetch the latest revisions, including PRs:
+
+    ```bash
     git fetch --all
     ```
 
+[^back to top](#contributing-to-recog)
+
 ### Branch and Improve
 
 If you have a contribution to make, first create a branch to contain your
@@ -60,7 +83,7 @@ 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:
 
-```
+```bash
 git fetch --all
 git checkout master
 git rebase upstream/master
@@ -73,17 +96,66 @@ Please note that changes to [lib/recog/version.rb](https://github.com/rapid7/rec
 
 Now push your changes to your fork:
 
-```
+```bash
 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.
 
+[^back to top](#contributing-to-recog)
+
 ### 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`.
 
-## Updating CPEs
+[^back to top](#contributing-to-recog)
+
+## Fingerprints
+
+### Best Practices
+
+* Create a single fingerprint for each product as long as the pattern remains clear and readable. If that is not possible, the pattern should be logically decomposed into additional fingerprints.
+
+* Create regular expressions that allow for flexible version number matching. This ensures greater probability of matching a product. For example, all known public releases of a product report either `major.minor` or `major.minor.build` format version numbers. If the fingerprint strictly matches this version number format, it would fail to match a modified build of the product that reports only a `major` version number format.
+
+[^back to top](#contributing-to-recog)
+
+### Fingerprint Testing
+
+Once a fingerprint has been added, the `example` entries can be tested by executing `bin/recog_verify` against the fingerprint file:
+
+```shell
+bin/recog_verify xml/ssh_banners.xml
+```
+
+Matches can be tested on the command-line in a similar fashion:
+
+```shell
+$ echo 'OpenSSH_6.6p1 Ubuntu-2ubuntu1' | bin/recog_match xml/ssh_banners.xml -
+MATCH: {"matched"=>"OpenSSH running on Ubuntu 14.04", "service.version"=>"6.6p1", "openssh.comment"=>"Ubuntu-2ubuntu1", "service.vendor"=>"OpenBSD", "service.family"=>"OpenSSH", "service.product"=>"OpenSSH", "os.vendor"=>"Ubuntu", "os.device"=>"General", "os.family"=>"Linux", "os.product"=>"Linux", "os.version"=>"14.04", "service.protocol"=>"ssh", "fingerprint_db"=>"ssh.banner", "data"=>"OpenSSH_6.6p1 Ubuntu-2ubuntu1"}
+```
+
+[^back to top](#contributing-to-recog)
+
+
+### Standardizing Vendors, Products, and Services
+
+Given the number of fingerprints in Recog, it can be common for specific products, vendors, or services to be identified with different spellings and casing.
+To limit the creep of slightly-different-names, the `bin/recog_standardize` script can be used to extract all identifiers and merge them into the known lists.
+
+To get started, run the `recog_standardize` tool:
+```shell
+ruby bin/recog_standardize
+```
+
+Review any new additions to the text files under `identifiers/`. If any of these names are close to an existing name, update the offending fingerprint to use
+the existing name instead. Once the fingerprints are fixed, removed the "extra" names from the identifiers files, and run the tool again.
+
+
+[^back to top](#contributing-to-recog)
+
+
+### Updating CPEs
 
 There exists some automation to update the CPEs that might be asserted with
 some recog fingerprints.  This should be run periodically to ensure that all
@@ -91,30 +163,47 @@ fingerprints that could have CPEs do, etc.
 
 First, setup a python3 venv:
 
-  ```
+  ```bash
   python3 -m venv venv
-  source venv/bin/activate
+  source venv/{bin,Scripts}/activate
   pip install -r requirements.txt
   ```
 
 Download the latest CPE 2.3 dictionary:
 
-  ```
-  wget https://nvd.nist.gov/feeds/xml/cpe/dictionary/official-cpe-dictionary_v2.3.xml.gz
-  ````
+```bash
+curl -o official-cpe-dictionary_v2.3.xml.gz https://nvd.nist.gov/feeds/xml/cpe/dictionary/official-cpe-dictionary_v2.3.xml.gz && \
+gunzip official-cpe-dictionary_v2.3.xml.gz
+```
 
-Run the CPE automation against every XML file, using GNU `parallel` to speed things up:
+Run the CPE automation against every XML file:
 
-  ```
-  ls xml/*.xml | parallel --gnu "./update_cpes.py {} official-cpe-dictionary_v2.3.xml cpe-remap.yaml && xmllint --format --noblanks {} > {}.bak &&  mv {}.bak {} || echo {}" 2> errors.txt
-  ```
+```bash
+# Update the CPEs (sequentially)
+ls xml/*.xml | xargs -i python update_cpes.py {} official-cpe-dictionary_v2.3.xml cpe-remap.yaml 2>>errors.txt
+```
+
+You may want to use GNU `parallel` to speed things up:
+```bash
+# Update the CPEs (with GNU Parallel)
+ls xml/*.xml | parallel --gnu "python update_cpes.py {} official-cpe-dictionary_v2.3.xml cpe-remap.yaml"  2>>errors.txt
+```
+
+Clean up the whitespace across all fingerprints:
+```bash
+ruby bin/recog_cleanup
+```
 
 Any mismatched fingerprints will be listed in `errors.txt` for eventual
 maintenance.  The `cpe-remap.yaml` file can be used to map between
 vendor/product/etc differences between Recog and CPE, or to work around bugs in
 either.
 
-## Landing PRs
+[^back to top](#contributing-to-recog)
+
+## Project Operations
+
+### Landing PRs
 
 (Note: this portion is a work-in-progress.  Please update it as things change)
 
@@ -126,46 +215,56 @@ In short:
 1. Follow the "Fork and Clone" steps from above
 2. Update your `.git/config` to ensure that the `remote ["upstream"]` section is configured to pull both branches and PRs from upstream.  It should look something like the following, in particular the second `fetch` option:
 
-    ```
+    ```bash
      [remote "upstream"]
       url = git@github.com:rapid7/recog.git
       fetch = +refs/heads/*:refs/remotes/upstream/*
       fetch = +refs/pull/*/head:refs/remotes/upstream/pr/*
      ```
+
 3. Fetch the latest revisions, including PRs:
 
-    ```
+    ```bash
     git fetch --all
     ```
+
 4. Checkout and branch the PR for testing.  Replace ```PR``` below with the actual PR # in question:
 
-    ```
+    ```bash
     git checkout -b landing-PR upstream/pr/PR
     ```
+
 5. Test the PR (see the Testing section above)
 6. Merge with master, re-test, validate and push:
 
-    ```
+    ```bash
     git checkout -b upstream-master --track upstream/master
     git merge -S --no-ff --edit landing-PR # merge the PR into upstream-master
+
     # re-test if/as necessary
     git push upstream upstream-master:master --dry-run # confirm you are pushing what you expect
+
     git push upstream upstream-master:master # push upstream-master to upstream:master
     ```
+
 7. If applicable, release a new version (see next section)
 
-## Releasing New Versions
+[^back to top](#contributing-to-recog)
+
+### Releasing New Versions
 
 When Recog's critical parts are modified, for example its fingerprints or underlying supporting code, a new version _must_ eventually be released.  These new releases can then be optionally included in projects such as Metasploit or products such as Rapid7's Nexpose in a controlled manner.  Releases for non-functional updates such as updates to documentation are not necessary.
 
 When a new version of Recog is to be released, you _must_ follow the instructions below.
 
 1. If are not already a Recog project contributor for the Recog gem (you'd be listed [here under OWNERS](https://rubygems.org/gems/recog)), become one:
-  1. Get an account on [Rubygems](https://rubygems.org)
-  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
-    ```
-2. 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.
-3. 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`.
-4. 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.
+   1. Get an account on [Rubygems](https://rubygems.org)
+   1. 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`
+
+1. 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.
+
+1. 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`.
+
+1. 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.
+
+[^back to top](#contributing-to-recog)

data/README.md

@@ -1,4 +1,5 @@
 # Recog: A Recognition Framework
+
 [![Gem Version](https://badge.fury.io/rb/recog.svg)](http://badge.fury.io/rb/recog)
 [![Build Status](https://travis-ci.org/rapid7/recog.svg?branch=master)](https://travis-ci.org/rapid7/recog)
 
@@ -7,6 +8,13 @@ Recog is a framework for identifying products, services, operating systems, and
 
 Recog is open source, please see the [LICENSE](https://raw.githubusercontent.com/rapid7/recog/master/LICENSE) file for more information.
 
+## Table of Contents
+
+1. [Installation](#installation)
+1. [Maturity](#maturity)
+1. [Fingerprints](#fingerprints)
+1. [Contributing](#contributing)
+
 ## Installation
 
 Recog consists of both XML fingerprint files and an assortment of code, mostly in Ruby, that makes it easy to develop, test, and use the contained fingerprints. In order to use the included ruby code, a recent version of Ruby (2.31+) is required, along with Rubygems and the `bundler` gem. Once these dependencies are in place, use the following commands to grab the latest source code and install any additional dependencies.
@@ -17,10 +25,14 @@ $ cd recog
 $ bundle install
 ```
 
+[^back to top](#recog-a-recognition-framework)
+
 ## Maturity
 
 Please note that while the XML fingerprints themselves are quite stable and well-tested, the Ruby codebase in Recog is still fairly new and subject to change quickly. Please contact us (research[at]rapid7.com) before leveraging the Recog code within any production projects.
 
+[^back to top](#recog-a-recognition-framework)
+
 ## Fingerprints
 
 The fingerprints within Recog are stored in XML files, each of which is designed to match a specific protocol response string or field. For example, the file [ssh_banners.xml](https://github.com/rapid7/recog/blob/master/xml/ssh_banners.xml) can determine the os, vendor, and sometimes hardware product by matching the initial SSH daemon banner string.
@@ -64,22 +76,12 @@ The `example` string can be base64 encoded to permit the use of unprintable char
 </example>
 ````
 
-### Testing
-
-Once a fingerprint has been added, the `example` entries can be tested by executing `bin/recog_verify` against the fingerprint file:
+[^back to top](#recog-a-recognition-framework)
 
-```shell
-$ bin/recog_verify xml/ssh_banners.xml
-```
-
-Matches can be tested on the command-line in a similar fashion:
-
-```shell
-$ echo 'OpenSSH_6.6p1 Ubuntu-2ubuntu1' | bin/recog_match xml/ssh_banners.xml -
-MATCH: {"matched"=>"OpenSSH running on Ubuntu 14.04", "service.version"=>"6.6p1", "openssh.comment"=>"Ubuntu-2ubuntu1", "service.vendor"=>"OpenBSD", "service.family"=>"OpenSSH", "service.product"=>"OpenSSH", "os.vendor"=>"Ubuntu", "os.device"=>"General", "os.family"=>"Linux", "os.product"=>"Linux", "os.version"=>"14.04", "service.protocol"=>"ssh", "fingerprint_db"=>"ssh.banner", "data"=>"OpenSSH_6.6p1 Ubuntu-2ubuntu1"}
-```
+## Contributing
 
-### Best Practices
+The users and maintainers of Recog would greatly appreciate any contributions
+you can make to the project. For guidelines and instructions please see
+[CONTRIBUTING.MD](CONTRIBUTING.md)
 
-* Create a single fingerprint for each product as long as the pattern remains clear and readable. If that is not possible, the pattern should be logically decomposed into additional fingerprints.
-* Create regular expressions that allow for flexible version number matching. This ensures greater probability of matching a product. For example, all known public releases of a product report either `major.minor` or `major.minor.build` format version numbers. If the fingerprint strictly matches this version number format, it would fail to match a modified build of the product that reports only a `major` version number format.
+[^back to top](#recog-a-recognition-framework)

data/bin/recog_cleanup

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
+require 'optparse'
+require 'ostruct'
+require 'recog'
+
+# Cleanup trailing whitespace around fingerprints
+Dir[ File.expand_path(File.join(File.dirname(__FILE__), "..", "xml")) + "/*.xml" ].each do |f|
+    data = File.read(f).
+        gsub(/\s+$/, '').                           # Trailing whitespace and empty lines
+        gsub("</fingerprint>", "</fingerprint>\n"). # Every fingerprint should have an empty line after it
+        gsub("-->", "-->\n")                        # Every comment should have an empty line after it
+
+    File.write(f, data)
+end

data/bin/recog_standardize

@@ -18,7 +18,7 @@ def write_identifiers(vals, path)
   vals.each_pair do |k,v|
     res = res.push(k)
   end
-  res = res.sort.uniq
+  res = res.map{|x| x.strip}.select{|x| x.length > 0}.sort.uniq
   File.write(path, res.join("\n") + "\n")
 end
 
@@ -54,9 +54,13 @@ os_arch = load_identifiers(File.join(bdir, "os_architecture.txt"))
 os_prod = load_identifiers(File.join(bdir, "os_product.txt"))
 os_family = load_identifiers(File.join(bdir, "os_family.txt"))
 os_device = load_identifiers(File.join(bdir, "os_device.txt"))
+hw_prod = load_identifiers(File.join(bdir, "hw_product.txt"))
+hw_family = load_identifiers(File.join(bdir, "hw_family.txt"))
+hw_device = load_identifiers(File.join(bdir, "hw_device.txt"))
 svc_prod = load_identifiers(File.join(bdir, "service_product.txt"))
 svc_family = load_identifiers(File.join(bdir, "service_family.txt"))
 
+
 ARGV.each do |arg|
   Dir.glob(arg).each do |file|
     ndb = Recog::DB.new(file)
@@ -64,21 +68,23 @@ ARGV.each do |arg|
       f.params.each do |k,v|
         paramIndex, val = v
         next if paramIndex != 0
+        next if val.index("{") != -1
+        next if val.strip == ""
         case k
         when "os.vendor", "service.vendor", "service.component.vendor", "hw.vendor"
           if ! vendors[val]
             puts "VENDOR MISSING: #{val}"
             vendors[val] = true
           end
-        when "os.product"
-          if ! os_prod[val]
-            puts "OS PRODUCT MISSING: #{val}"
-            os_prod[val] = true
-          end
         when "os.arch"
           if ! os_arch[val]
             puts "OS ARCH MISSING: #{val}"
             os_arch[val] = true
+          end          
+        when "os.product"
+          if ! os_prod[val]
+            puts "OS PRODUCT MISSING: #{val}"
+            os_prod[val] = true
           end
         when "os.family"
           if ! os_family[val]
@@ -90,6 +96,21 @@ ARGV.each do |arg|
             puts "OS DEVICE MISSING: #{val}"
             os_device[val] = true
           end
+        when "hw.product"
+          if ! hw_prod[val]
+            puts "HW PRODUCT MISSING: #{val}"
+            hw_prod[val] = true
+          end
+        when "hw.family"
+          if ! hw_family[val]
+            puts "HW FAMILY MISSING: #{val}"
+            hw_family[val] = true
+          end
+        when "hw.device"
+          if ! hw_device[val]
+            puts "HW DEVICE MISSING: #{val}"
+            hw_device[val] = true
+          end          
         when "service.product"
           if ! svc_prod[val]
             puts "SERVICE PRODUCT MISSING: #{val}"
@@ -114,5 +135,8 @@ write_identifiers(os_arch, File.join(bdir, "os_architecture.txt"))
 write_identifiers(os_prod, File.join(bdir, "os_product.txt"))
 write_identifiers(os_family, File.join(bdir, "os_family.txt"))
 write_identifiers(os_device, File.join(bdir, "os_device.txt"))
+write_identifiers(hw_prod, File.join(bdir, "hw_product.txt"))
+write_identifiers(hw_family, File.join(bdir, "hw_family.txt"))
+write_identifiers(hw_device, File.join(bdir, "hw_device.txt"))
 write_identifiers(svc_prod, File.join(bdir, "service_product.txt"))
 write_identifiers(svc_family, File.join(bdir, "service_family.txt"))