Handle content-type weirdness from Anemone

 Fixes rapid7#5515
 MSP-12834

Author: trevrosen

Gemfile

@@ -24,8 +24,6 @@ group :development do
   gem 'pry'
 end
 
-gem 'metasploit_data_models', git: '[email protected]:rapid7/metasploit_data_models', branch:'bug/MSP-12834/crawler-choke-on-save'
-
 group :development, :test do
   # automatically include factories from spec/factories
   gem 'factory_girl_rails', '~> 4.5.0'

Gemfile.lock

@@ -1,19 +1,3 @@
-GIT
-  remote: [email protected]:rapid7/metasploit_data_models
-  revision: c36c800866d42187c21c1308a9bac5f3278d8aa3
-  branch: bug/MSP-12834/crawler-choke-on-save
-  specs:
-    metasploit_data_models (1.2.4)
-      activerecord (>= 4.0.9, < 4.1.0)
-      activesupport (>= 4.0.9, < 4.1.0)
-      arel-helpers
-      metasploit-concern (~> 1.0)
-      metasploit-model (~> 1.0)
-      pg
-      postgres_ext
-      railties (>= 4.0.9, < 4.1.0)
-      recog (~> 2.0)
-
 PATH
   remote: .
   specs:
@@ -40,6 +24,7 @@ PATH
       activerecord (>= 4.0.9, < 4.1.0)
       metasploit-credential (~> 1.0)
       metasploit-framework (= 4.11.0.pre.dev)
+      metasploit_data_models (~> 1.2)
       pg (>= 0.11)
     metasploit-framework-pcap (4.11.0.pre.dev)
       metasploit-framework (= 4.11.0.pre.dev)
@@ -139,6 +124,16 @@ GEM
       activesupport (>= 4.0.9, < 4.1.0)
       railties (>= 4.0.9, < 4.1.0)
     metasploit-payloads (1.0.2)
+    metasploit_data_models (1.2.5)
+      activerecord (>= 4.0.9, < 4.1.0)
+      activesupport (>= 4.0.9, < 4.1.0)
+      arel-helpers
+      metasploit-concern (~> 1.0)
+      metasploit-model (~> 1.0)
+      pg
+      postgres_ext
+      railties (>= 4.0.9, < 4.1.0)
+      recog (~> 2.0)
     method_source (0.8.2)
     mime-types (2.4.3)
     mini_portile (0.6.2)
@@ -161,7 +156,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.5.3)
+    rack (1.5.5)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.0.13)
@@ -179,7 +174,7 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
     rb-readline-r7 (0.5.2.0)
-    recog (2.0.5)
+    recog (2.0.6)
       nokogiri
     redcarpet (3.2.3)
     rkelly-remix (0.0.6)
@@ -243,7 +238,6 @@ DEPENDENCIES
   metasploit-framework!
   metasploit-framework-db!
   metasploit-framework-pcap!
-  metasploit_data_models!
   pry
   rake (>= 10.0.0)
   redcarpet

metasploit-framework-db.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   # Metasploit::Credential database models
   spec.add_runtime_dependency 'metasploit-credential', '~> 1.0'
   # Database models shared between framework and Pro.
-  #spec.add_runtime_dependency 'metasploit_data_models', '~> 1.2'
+  spec.add_runtime_dependency 'metasploit_data_models', '~> 1.2'
   # depend on metasploit-framewrok as the optional gems are useless with the actual code
   spec.add_runtime_dependency 'metasploit-framework', "= #{spec.version}"
   # Needed for module caching in Mdm::ModuleDetails