Fixed erroneous commit

lib/msf/core/model/campaign.rb

@@ -10,7 +10,7 @@ class Campaign < ActiveRecord::Base
 
 	extend SerializedPrefs
 
-	serialize :prefs
+	serialize :prefs, Msf::Util::Base64Serializer.new
 
 	# General settings
 	serialized_prefs_attr_accessor :payload_lhost, :listener_lhost, :payload_type

lib/msf/core/model/email_template.rb

@@ -7,7 +7,7 @@ class EmailTemplate < ActiveRecord::Base
 
 	extend SerializedPrefs
 
-	serialize :prefs
+	serialize :prefs, Msf::Util::Base64Serializer.new
 
 	serialized_prefs_attr_accessor :exploit_module, :exploit_attach_name
 	serialized_prefs_attr_accessor :attach_exe

lib/msf/core/model/event.rb

@@ -5,7 +5,7 @@ class Event < ActiveRecord::Base
 	include DBSave
 	belongs_to :workspace
 	belongs_to :host
-	serialize :info
+	serialize :info, Msf::Util::Base64Serializer.new
 end
 
 end

lib/msf/core/model/listener.rb

@@ -7,7 +7,7 @@ class Listener < ActiveRecord::Base
 	belongs_to :workspace
 	belongs_to :task
 
-	serialize :options
+	serialize :options, Msf::Util::Base64Serializer.new
 end
 
 end

lib/msf/core/model/loot.rb

@@ -8,7 +8,7 @@ class Loot < ActiveRecord::Base
 	belongs_to :host
 	belongs_to :service
 
-	serialize :data
+	serialize :data, Msf::Util::Base64Serializer.new
 end
 
 end

lib/msf/core/model/macro.rb

@@ -3,8 +3,8 @@ class DBManager
 
 class Macro < ActiveRecord::Base
 	include DBSave
-	serialize :actions
-	serialize :prefs
+	serialize :actions, Msf::Util::Base64Serializer.new
+	serialize :prefs, Msf::Util::Base64Serializer.new
 end
 
 end

lib/msf/core/model/nexpose_console.rb

@@ -3,7 +3,7 @@ class DBManager
 
 class NexposeConsole < ActiveRecord::Base
 	include DBSave
-	serialize :cached_sites
+	serialize :cached_sites, Msf::Util::Base64Serializer.new
 end
 
 end

lib/msf/core/model/note.rb

@@ -7,7 +7,7 @@ class Note < ActiveRecord::Base
 	belongs_to :workspace
 	belongs_to :host
 	belongs_to :service
-	serialize :data
+	serialize :data, Msf::Util::Base64Serializer.new
 
 	def after_save
 		if data_changed? and ntype =~ /fingerprint/

lib/msf/core/model/profile.rb

@@ -3,7 +3,7 @@ class DBManager
 
 class Profile < ActiveRecord::Base
 	include DBSave
-	serialize :settings
+	serialize :settings, Msf::Util::Base64Serializer.new
 end
 
 end

lib/msf/core/model/report.rb

@@ -5,7 +5,7 @@ class Report < ActiveRecord::Base
 	include DBSave
 
 	belongs_to :workspace
-	serialize :options
+	serialize :options, Msf::Util::Base64Serializer.new
 end
 
 end

lib/msf/core/model/service.rb

@@ -13,8 +13,8 @@ class Service < ActiveRecord::Base
 	has_many :web_pages, :through => :web_sites
 	has_many :web_forms, :through => :web_sites
 	has_many :web_vulns, :through => :web_sites
-
-	serialize :info
+		
+	serialize :info, Msf::Util::Base64Serializer.new
 
 	def after_save
 		if info_changed?

lib/msf/core/model/session.rb

@@ -12,7 +12,7 @@ class Session < ActiveRecord::Base
 	scope :alive, :conditions => "closed_at IS NULL"
 	scope :dead, :conditions => "closed_at IS NOT NULL"
 
-	serialize :datastore
+	serialize :datastore, Msf::Util::Base64Serializer.new
 end
 
 end

lib/msf/core/model/task.rb

@@ -6,9 +6,9 @@ class Task < ActiveRecord::Base
 
 	belongs_to :workspace
 
-	serialize :options
-	serialize :result
-	serialize :settings
+	serialize :options, Msf::Util::Base64Serializer.new
+	serialize :result, Msf::Util::Base64Serializer.new
+	serialize :settings, Msf::Util::Base64Serializer.new
 end
 
 end

lib/msf/core/model/user.rb

@@ -4,7 +4,7 @@ class DBManager
 class User < ActiveRecord::Base
 	include DBSave
 
-	serialize :prefs
+	serialize :prefs, Msf::Util::Base64Serializer.new
 end
 
 end

lib/msf/core/model/web_form.rb

@@ -4,7 +4,7 @@ class DBManager
 class WebForm < ActiveRecord::Base
 	include DBSave
 	belongs_to :web_site
-	serialize :params
+	serialize :params, Msf::Util::Base64Serializer.new
 end
 
 end

lib/msf/core/model/web_page.rb

@@ -4,7 +4,7 @@ class DBManager
 class WebPage < ActiveRecord::Base
 	include DBSave
 	belongs_to :web_site
-	serialize :headers
+	serialize :headers, Msf::Util::Base64Serializer.new
 end
 
 end

lib/msf/core/model/web_site.rb

@@ -7,9 +7,9 @@ class WebSite < ActiveRecord::Base
 	has_many :web_pages, :dependent => :destroy
 	has_many :web_forms, :dependent => :destroy
 	has_many :web_vulns, :dependent => :destroy
-
-	serialize :options
-
+			
+	serialize :options, Msf::Util::Base64Serializer.new
+	
 	def to_url(ignore_vhost=false)
 		proto = self.service.name == "https" ? "https" : "http"
 		host  = ignore_vhost ? self.service.host.address : self.vhost

lib/msf/core/model/web_template.rb

@@ -6,7 +6,7 @@ class WebTemplate < ActiveRecord::Base
 
 	extend SerializedPrefs
 
-	serialize :prefs
+	serialize :prefs, Msf::Util::Base64Serializer.new
 
 	serialized_prefs_attr_accessor :exploit_type
 	serialized_prefs_attr_accessor :exploit_name, :exploit_opts

lib/msf/core/model/web_vuln.rb

@@ -4,7 +4,7 @@ class DBManager
 class WebVuln < ActiveRecord::Base
 	include DBSave
 	belongs_to :web_site
-	serialize :params
+	serialize :params, Msf::Util::Base64Serializer.new
 end
 
 end

lib/msf/util.rb

@@ -23,3 +23,6 @@ require 'msf/util/exe'
 
 # Parse SVN entries
 require 'msf/util/svn'
+
+# Custom ActiveRecord serialization via base64 (Marshal)
+require "msf/util/base64_serializer.rb"

lib/msf/util/base64_serializer.rb

@@ -0,0 +1,23 @@
+# 2011-12-07
+# Ported from pro/ui/lib/custom/base64_serializer.rb
+#
+# Provides ActiveRecord 3.1x-friendly serialization for descendants of
+# ActiveRecord::Base
+#
+# usage:
+# serialize :foo, Msf::Util::Base64Serializer.new
+#
+module Msf::Util
+  class Base64Serializer
+    def load(value)
+      return "" if value.blank?
+      Marshal.load value.unpack('m').first
+    end
+
+    def dump(value)
+      [ Marshal.dump(value) ].pack('m')
+    end
+  end
+end
+
+