metasploit_data_models 0.16.5-java → 0.16.6-java

data/README.md

@@ -45,21 +45,9 @@ only if the user wants to use the database.
 
 ### Elsewhere
 
-__NOTE: This isn't in RubyGems yet.  Using a Gemfile entry pointing to this repo (i.e., using
-[Bundler](http://gembundler.com)) is the suggested option for now.__
-
-Usage outside of Rapid7 is still alpha, as reflected in the pre-1.0.0 version, and we're not making many promises.  That
-being said, usage is easy:
-
-    connection_info = YAML.load_file("path/to/rails-style/db_config_file")
-    ActiveRecord::Base.establish_connection(connection_info['development'])
-    MetasploitDataModels.require_models
-
-Basically you need to do the following things:
-
-1. Establish an ActiveRecord connection.  A Rails __config/database.yml__ is ideal for this.
-2. `MetasploitDataModels.require_models`
+In Metasploit Pro, MDM is loaded via the metasploit_data_models gem: https://rubygems.org/gems/metasploit_data_models
 
+An MRI and JRuby implementation is generated for all substantial updates.
 
 ## Developer Info
 

data/app/models/mdm/web_vuln.rb

@@ -123,7 +123,6 @@ class Mdm::WebVuln < ActiveRecord::Base
   validates :name, :presence => true
   validates :params, :parameters => true
   validates :path, :presence => true
-  validates :pname, :presence => true
   validates :proof, :presence => true
   validates :risk,
             :inclusion => {

data/db/migrate/20130717150737_remove_pname_validation.rb

@@ -0,0 +1,7 @@
+class RemovePnameValidation < ActiveRecord::Migration
+
+  def change
+		change_column :web_vulns, :pname, :text, :null => true
+  end
+
+end

data/lib/metasploit_data_models/version.rb

@@ -4,5 +4,5 @@ module MetasploitDataModels
   # metasploit-framework/data/sql/migrate to db/migrate in this project, not all models have specs that verify the
   # migrations (with have_db_column and have_db_index) and certain models may not be shared between metasploit-framework
   # and pro, so models may be removed in the future.  Because of the unstable API the version should remain below 1.0.0
-  VERSION = '0.16.5'
+  VERSION = '0.16.6'
 end

data/spec/app/models/mdm/web_vuln_spec.rb

@@ -68,7 +68,7 @@ describe Mdm::WebVuln do
       it { should have_db_column(:params).of_type(:text).with_options(:null => false) }
       it { should have_db_column(:path).of_type(:text).with_options(:null => false) }
       it { should have_db_column(:payload).of_type(:text) }
-      it { should have_db_column(:pname).of_type(:text).with_options(:null => false) }
+      it { should have_db_column(:pname).of_type(:text) }
       it { should have_db_column(:proof).of_type(:binary).with_options(:null => false) }
       it { should have_db_column(:query).of_type(:text) }
       it { should have_db_column(:request).of_type(:binary) }
@@ -278,7 +278,6 @@ describe Mdm::WebVuln do
       end
     end
 
-    it { should validate_presence_of :pname }
     it { should validate_presence_of :proof }
     it { should ensure_inclusion_of(:risk).in_range(risk_range) }
     it { should validate_presence_of :web_site }

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130604145732) do
+ActiveRecord::Schema.define(:version => 20130717150737) do
 
   create_table "api_keys", :force => true do |t|
     t.text     "token"
@@ -546,7 +546,7 @@ ActiveRecord::Schema.define(:version => 20130604145732) do
     t.text     "path",                        :null => false
     t.string   "method",      :limit => 1024, :null => false
     t.text     "params",                      :null => false
-    t.text     "pname",                       :null => false
+    t.text     "pname"
     t.integer  "risk",                        :null => false
     t.string   "name",        :limit => 1024, :null => false
     t.text     "query"

metadata

@@ -2,7 +2,7 @@
 name: metasploit_data_models
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.16.5
+  version: 0.16.6
 platform: java
 authors:
 - Samuel Huckins
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2013-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -336,6 +336,7 @@ files:
 - db/migrate/20130525212420_drop_table_imported_creds.rb
 - db/migrate/20130531144949_making_host_tags_a_real_ar_model.rb
 - db/migrate/20130604145732_create_task_sessions.rb
+- db/migrate/20130717150737_remove_pname_validation.rb
 - lib/mdm.rb
 - lib/mdm/host/operating_system_normalization.rb
 - lib/mdm/module.rb