Merge branch 'master' into feature/task_sssoc/sessions

Conflicts:
	Gemfile
	Gemfile.lock

Author: David Maloney

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130522041110) do
+ActiveRecord::Schema.define(:version => 20130531144949) do
 
   create_table "api_keys", :force => true do |t|
     t.text     "token"
@@ -46,11 +46,10 @@
   create_table "clients", :force => true do |t|
     t.integer  "host_id"
     t.datetime "created_at"
-    t.string   "ua_string",   :limit => 1024, :null => false
-    t.string   "ua_name",     :limit => 64
-    t.string   "ua_ver",      :limit => 32
+    t.string   "ua_string",  :limit => 1024, :null => false
+    t.string   "ua_name",    :limit => 64
+    t.string   "ua_ver",     :limit => 32
     t.datetime "updated_at"
-    t.integer  "campaign_id"
   end
 
   create_table "creds", :force => true do |t|
@@ -167,18 +166,11 @@
   add_index "hosts", ["state"], :name => "index_hosts_on_state"
   add_index "hosts", ["workspace_id", "address"], :name => "index_hosts_on_workspace_id_and_address", :unique => true
 
-  create_table "hosts_tags", :id => false, :force => true do |t|
+  create_table "hosts_tags", :force => true do |t|
     t.integer "host_id"
     t.integer "tag_id"
   end
 
-  create_table "imported_creds", :force => true do |t|
-    t.integer "workspace_id",                :default => 1,          :null => false
-    t.string  "user",         :limit => 512
-    t.string  "pass",         :limit => 512
-    t.string  "ptype",        :limit => 16,  :default => "password"
-  end
-
   create_table "listeners", :force => true do |t|
     t.datetime "created_at",                     :null => false
     t.datetime "updated_at",                     :null => false

spec/factories/mdm/exported_web_vulns.rb

@@ -0,0 +1,14 @@
+FactoryGirl.define do
+  factory :exported_web_vuln, :parent => :mdm_web_vuln do
+    blame { generate :mdm_web_vuln_blame }
+    description { generate :mdm_web_vuln_description }
+  end
+
+  sequence :mdm_web_vuln_blame do |n|
+    "Blame employee ##{n}"
+  end
+
+  sequence :mdm_web_vuln_description do |n|
+    "Mdm::WebVuln#description #{n}"
+  end
+end