metasploit_data_models 0.17.2-java → 0.17.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e104b52d2748ed93e68fec6508897da074908217
-  data.tar.gz: 9b969019e03a32ec345a2df5109d164933e52af9
+  metadata.gz: 1e5474047a6fa396d39d8444f823cc3c2daabf9f
+  data.tar.gz: ea9ed9b01de74c5e6cbe8249eacd202134fbba9e
 SHA512:
-  metadata.gz: e24c15e3dae978d1366ccdff47f7f94a8f6d09b72b0d3476937d3d1971f7f258a63244eff65891547c5cab0ed60d002bdbf93c249b275843637c5409dd804d99
-  data.tar.gz: 98f84f78613acef78e59cdb89b0a06149345d4322cdea366c83620444a8e1d7b35ed08d24b0f059e87db3d9df44a2f25ac2f8be1857f5c55e2ef3b5a7606fed0
+  metadata.gz: 4571592ed26d7ab8d1d1623314660e0851cb8ddbab5f49555dae8532ea0fd08a832fae7deb548ad79cd70ae5bd50b62fc1aff6720937ffdf775d26cbb17febc0
+  data.tar.gz: 7bd2fe3760de463b57839f9ebcddcfc3a4290f19473b391474df8d312b99e010a29491d70a13ef0b5ff4b9af0b04b679120f909c57a21337e9b9c132e59907c4

data/app/models/mdm/api_key.rb

@@ -16,5 +16,5 @@ class Mdm::ApiKey < ActiveRecord::Base
     end
   end
 
-  ActiveSupport.run_load_hooks(:mdm_api_key, self)
+  Metasploit::Concern.run(self)
 end

data/app/models/mdm/client.rb

@@ -6,5 +6,5 @@ class Mdm::Client < ActiveRecord::Base
              class_name: 'Mdm::Host',
              inverse_of: :clients
 
-  ActiveSupport.run_load_hooks(:mdm_client, self)
+  Metasploit::Concern.run(self)
 end

data/app/models/mdm/cred.rb

@@ -101,8 +101,6 @@ class Mdm::Cred < ActiveRecord::Base
     self.service.host.workspace
   end
 
-  ActiveSupport.run_load_hooks(:mdm_cred, self)
-
   private
 
   def decrement_host_counter_cache
@@ -112,4 +110,8 @@ class Mdm::Cred < ActiveRecord::Base
   def increment_host_counter_cache
     Mdm::Host.increment_counter("cred_count", self.service.host_id)
   end
+
+  public
+
+  Metasploit::Concern.run(self)
 end

data/app/models/mdm/event.rb

@@ -30,6 +30,6 @@ class Mdm::Event < ActiveRecord::Base
 
   validates :name, :presence => true
 
-  ActiveSupport.run_load_hooks(:mdm_event, self)
+  Metasploit::Concern.run(self)
 end
 

data/app/models/mdm/exploit_attempt.rb

@@ -51,5 +51,5 @@ class Mdm::ExploitAttempt < ActiveRecord::Base
 
   validates :host_id, :presence => true
 
-  ActiveSupport.run_load_hooks(:mdm_exploit_attempt, self)
+  Metasploit::Concern.run(self)
 end

data/app/models/mdm/exploited_host.rb

@@ -11,5 +11,5 @@ class Mdm::ExploitedHost < ActiveRecord::Base
              class_name: 'Mdm::Service',
              inverse_of: :exploited_hosts
 
-  ActiveSupport.run_load_hooks(:mdm_exploited_host, self)
+  Metasploit::Concern.run(self)
 end

data/app/models/mdm/host.rb

@@ -516,6 +516,6 @@ class Mdm::Host < ActiveRecord::Base
     !!self.virtual_host
   end
 
-  ActiveSupport.run_load_hooks(:mdm_host, self)
+  Metasploit::Concern.run(self)
 end
 

data/app/models/mdm/host_detail.rb

@@ -14,5 +14,5 @@ class Mdm::HostDetail < ActiveRecord::Base
 
   validates :host_id, :presence => true
 
-  ActiveSupport.run_load_hooks(:mdm_host_detail, self)
+  Metasploit::Concern.run(self)
 end

data/app/models/mdm/host_tag.rb

@@ -46,6 +46,6 @@ class Mdm::HostTag < ActiveRecord::Base
 
   public
 
-  ActiveSupport.run_load_hooks(:mdm_host_tag, self)
+  Metasploit::Concern.run(self)
 end
 

data/app/models/mdm/listener.rb

@@ -24,7 +24,6 @@ class Mdm::Listener < ActiveRecord::Base
   validates :address, :ip_format => true, :presence => true
   validates :port, :presence => true, :numericality => { :only_integer => true }, :inclusion => {:in => 1..65535}
 
-
-  ActiveSupport.run_load_hooks(:mdm_listener, self)
+  Metasploit::Concern.run(self)
 end
 

data/app/models/mdm/loot.rb

@@ -145,6 +145,8 @@ class Mdm::Loot < ActiveRecord::Base
     end
   end
 
-  ActiveSupport.run_load_hooks(:mdm_loot, self)
+  public
+
+  Metasploit::Concern.run(self)
 end
 

data/app/models/mdm/macro.rb

@@ -15,6 +15,6 @@ class Mdm::Macro < ActiveRecord::Base
 
   validates :name, :presence => true, :format => /^[^'|"]+$/
 
-  ActiveSupport.run_load_hooks(:mdm_macro, self)
+  Metasploit::Concern.run(self)
 end
 

data/app/models/mdm/mod_ref.rb

@@ -1,3 +1,3 @@
 class Mdm::ModRef < ActiveRecord::Base
-  ActiveSupport.run_load_hooks(:mdm_mod_ref, self)
+  Metasploit::Concern.run(self)
 end

data/app/models/mdm/module/action.rb

@@ -20,5 +20,5 @@ class Mdm::Module::Action < ActiveRecord::Base
   validates :detail, :presence => true
   validates :name, :presence => true
 
-  ActiveSupport.run_load_hooks(:mdm_module_action, self)
+  Metasploit::Concern.run(self)
 end

data/app/models/mdm/module/arch.rb

@@ -20,5 +20,5 @@ class Mdm::Module::Arch < ActiveRecord::Base
   validates :detail, :presence => true
   validates :name, :presence => true
 
-  ActiveSupport.run_load_hooks(:mdm_module_arch, self)
+  Metasploit::Concern.run(self)
 end

data/app/models/mdm/module/author.rb

@@ -21,5 +21,5 @@ class Mdm::Module::Author < ActiveRecord::Base
   validates :detail, :presence => true
   validates :name, :presence => true
 
-  ActiveSupport.run_load_hooks(:mdm_module_author, self)
+  Metasploit::Concern.run(self)
 end

data/app/models/mdm/module/detail.rb

@@ -295,5 +295,5 @@ class Mdm::Module::Detail < ActiveRecord::Base
     supports_stance
   end
 
-  ActiveSupport.run_load_hooks(:mdm_module_detail, self)
+  Metasploit::Concern.run(self)
 end

data/app/models/mdm/module/mixin.rb

@@ -20,5 +20,5 @@ class Mdm::Module::Mixin < ActiveRecord::Base
   validates :detail, :presence => true
   validates :name, :presence => true
 
-  ActiveSupport.run_load_hooks(:mdm_module_mixin, self)
+  Metasploit::Concern.run(self)
 end

data/app/models/mdm/module/platform.rb

@@ -20,5 +20,5 @@ class Mdm::Module::Platform < ActiveRecord::Base
   validates :detail, :presence => true
   validates :name, :presence => true
 
-  ActiveSupport.run_load_hooks(:mdm_module_platform, self)
+  Metasploit::Concern.run(self)
 end

data/app/models/mdm/module/ref.rb

@@ -44,5 +44,5 @@ class Mdm::Module::Ref < ActiveRecord::Base
   validates :detail, :presence => true
   validates :name, :presence => true
 
-  ActiveSupport.run_load_hooks(:mdm_module_ref, self)
+  Metasploit::Concern.run(self)
 end

data/app/models/mdm/module/target.rb

@@ -22,5 +22,5 @@ class Mdm::Module::Target < ActiveRecord::Base
   validates :index, :presence => true
   validates :name, :presence => true
 
-  ActiveSupport.run_load_hooks(:mdm_module_target, self)
+  Metasploit::Concern.run(self)
 end

data/app/models/mdm/nexpose_console.rb

@@ -28,6 +28,6 @@ class Mdm::NexposeConsole < ActiveRecord::Base
   validates :port, :numericality => { :only_integer => true }, :inclusion => {:in => 1..65535}
   validates :username, :presence => true
 
-  ActiveSupport.run_load_hooks(:mdm_nexpose_console, self)
+  Metasploit::Concern.run(self)
 end
 

data/app/models/mdm/note.rb

@@ -106,6 +106,8 @@ class Mdm::Note < ActiveRecord::Base
     end
   end
 
-  ActiveSupport.run_load_hooks(:mdm_note, self)
+  public
+
+  Metasploit::Concern.run(self)
 end
 

data/app/models/mdm/profile.rb

@@ -4,6 +4,6 @@ class Mdm::Profile < ActiveRecord::Base
   #
   serialize :settings, MetasploitDataModels::Base64Serializer.new
 
-  ActiveSupport.run_load_hooks(:mdm_profile, self)
+  Metasploit::Concern.run(self)
 end
 

data/app/models/mdm/ref.rb

@@ -50,5 +50,5 @@ class Mdm::Ref < ActiveRecord::Base
 
   attr_accessible :name
 
-  ActiveSupport.run_load_hooks(:mdm_ref, self)
+  Metasploit::Concern.run(self)
 end

data/app/models/mdm/route.rb

@@ -11,5 +11,5 @@ class Mdm::Route < ActiveRecord::Base
              class_name: 'Mdm::Session',
              inverse_of: :routes
 
-  ActiveSupport.run_load_hooks(:mdm_route, self)
+  Metasploit::Concern.run(self)
 end

data/app/models/mdm/service.rb

@@ -202,6 +202,6 @@ class Mdm::Service < ActiveRecord::Base
     end
   end
 
-  ActiveSupport.run_load_hooks(:mdm_service, self)
+  Metasploit::Concern.run(self)
 end
 

data/app/models/mdm/session.rb

@@ -179,5 +179,7 @@ class Mdm::Session < ActiveRecord::Base
     c.session_stop(self.local_id) rescue nil
   end
 
-  ActiveSupport.run_load_hooks(:mdm_session, self)
+  public
+
+  Metasploit::Concern.run(self)
 end

data/app/models/mdm/session_event.rb

@@ -7,5 +7,5 @@ class Mdm::SessionEvent < ActiveRecord::Base
              class_name: 'Mdm::Session',
              inverse_of: :events
 
-  ActiveSupport.run_load_hooks(:mdm_session_event, self)
+  Metasploit::Concern.run(self)
 end

data/app/models/mdm/tag.rb

@@ -61,5 +61,5 @@ class Mdm::Tag < ActiveRecord::Base
     name
   end
 
-  ActiveSupport.run_load_hooks(:mdm_tag, self)
+  Metasploit::Concern.run(self)
 end

data/app/models/mdm/task.rb

@@ -128,6 +128,8 @@ class Mdm::Task < ActiveRecord::Base
     end
   end
 
-  ActiveSupport.run_load_hooks(:mdm_task, self)
+  public
+
+  Metasploit::Concern.run(self)
 end
 

data/app/models/mdm/task_cred.rb

@@ -11,4 +11,6 @@ class Mdm::TaskCred < ActiveRecord::Base
             :uniqueness => {
                 :scope => :task_id
             }
+
+  Metasploit::Concern.run(self)
 end

data/app/models/mdm/task_host.rb

@@ -11,4 +11,6 @@ class Mdm::TaskHost < ActiveRecord::Base
             :uniqueness => {
                 :scope => :task_id
             }
+
+  Metasploit::Concern.run(self)
 end

data/app/models/mdm/task_service.rb

@@ -11,4 +11,6 @@ class Mdm::TaskService < ActiveRecord::Base
             :uniqueness => {
                 :scope => :task_id
             }
+
+  Metasploit::Concern.run(self)
 end

data/app/models/mdm/task_session.rb

@@ -11,4 +11,6 @@ class Mdm::TaskSession < ActiveRecord::Base
             :uniqueness => {
                 :scope => :task_id
             }
+
+  Metasploit::Concern.run(self)
 end

data/app/models/mdm/user.rb

@@ -27,6 +27,6 @@ class Mdm::User < ActiveRecord::Base
   serialized_prefs_attr_accessor :time_zone, :session_key
   serialized_prefs_attr_accessor :last_login_address # specifically NOT last_login_ip to prevent confusion with AuthLogic magic columns (which dont work for serialized fields)
 
-  ActiveSupport.run_load_hooks(:mdm_user, self)
+  Metasploit::Concern.run(self)
 end
 

data/app/models/mdm/vuln.rb

@@ -157,5 +157,7 @@ class Mdm::Vuln < ActiveRecord::Base
     refs.each { |ref| ref.save(:validate => false) }
   end
 
-  ActiveSupport.run_load_hooks(:mdm_vuln, self)
+  public
+
+  Metasploit::Concern.run(self)
 end

data/app/models/mdm/vuln_attempt.rb

@@ -46,5 +46,5 @@ class Mdm::VulnAttempt < ActiveRecord::Base
 
   validates :vuln_id, :presence => true
 
-  ActiveSupport.run_load_hooks(:mdm_vuln_attempt, self)
+  Metasploit::Concern.run(self)
 end

data/app/models/mdm/vuln_detail.rb

@@ -18,5 +18,5 @@ class Mdm::VulnDetail < ActiveRecord::Base
 
   validates :vuln_id, :presence => true
 
-  ActiveSupport.run_load_hooks(:mdm_vuln_detail, self)
+  Metasploit::Concern.run(self)
 end

data/app/models/mdm/vuln_ref.rb

@@ -13,6 +13,6 @@ class Mdm::VulnRef < ActiveRecord::Base
              class_name: 'Mdm::Vuln',
              inverse_of: :vulns_refs
 
-  ActiveSupport.run_load_hooks(:mdm_vuln_ref, self)
+  Metasploit::Concern.run(self)
 end
 

data/app/models/mdm/web_form.rb

@@ -13,6 +13,6 @@ class Mdm::WebForm < ActiveRecord::Base
 
   serialize :params, MetasploitDataModels::Base64Serializer.new
 
-  ActiveSupport.run_load_hooks(:mdm_web_form, self)
+  Metasploit::Concern.run(self)
 end
 

data/app/models/mdm/web_page.rb

@@ -13,6 +13,6 @@ class Mdm::WebPage < ActiveRecord::Base
 
   serialize :headers, MetasploitDataModels::Base64Serializer.new
 
-  ActiveSupport.run_load_hooks(:mdm_web_page, self)
+  Metasploit::Concern.run(self)
 end
 

data/app/models/mdm/web_site.rb

@@ -57,6 +57,6 @@ class Mdm::WebSite < ActiveRecord::Base
     web_vulns.size
   end
 
-  ActiveSupport.run_load_hooks(:mdm_web_site, self)
+  Metasploit::Concern.run(self)
 end
 

data/app/models/mdm/web_vuln.rb

@@ -187,6 +187,6 @@ class Mdm::WebVuln < ActiveRecord::Base
   # switch back to public for load hooks
   public
 
-  ActiveSupport.run_load_hooks(:mdm_web_vuln, self)
+  Metasploit::Concern.run(self)
 end
 

data/app/models/mdm/wmap_request.rb

@@ -1,3 +1,3 @@
 class Mdm::WmapRequest < ActiveRecord::Base
-  ActiveSupport.run_load_hooks(:mdm_wmap_request, self)
+  Metasploit::Concern.run(self)
 end

data/app/models/mdm/wmap_target.rb

@@ -1,3 +1,3 @@
 class Mdm::WmapTarget < ActiveRecord::Base
-  ActiveSupport.run_load_hooks(:mdm_wmap_target, self)
+  Metasploit::Concern.run(self)
 end

data/app/models/mdm/workspace.rb

@@ -188,6 +188,8 @@ class Mdm::Workspace < ActiveRecord::Base
     end
   end
 
-  ActiveSupport.run_load_hooks(:mdm_workspace, self)
+  public
+
+  Metasploit::Concern.run(self)
 end
 

data/app/models/metasploit_data_models/search/visitor/attribute.rb

@@ -10,4 +10,6 @@ class MetasploitDataModels::Search::Visitor::Attribute
     table = operator.klass.arel_table
     table[operator.attribute]
   end
+
+  Metasploit::Concern.run(self)
 end