metasploit_data_models 6.0.13 → 6.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f076fefa48fbef835f71f863254fa30d0f7c6f6b4b7cc96eb43ea4b77bf2acc5
-  data.tar.gz: 2418ddb5ba7a144da1eee3e3953193fdcfc1b1091a576e086d735a29b5fc4067
+  metadata.gz: fc3667efca0c441c45d062f28f591d4cbd2a6124931a18ebfa5d72d6008479da
+  data.tar.gz: 810bbcddf14719ff02ac1902a53c93205218c24ceff1897b937dff11f3c6a60c
 SHA512:
-  metadata.gz: 211fa97f496a5092bf5b4c33a7de943274b066f828518171f33cb608a28540610a6fbd416626fee89ae831f36773b7fb83d0962a49a11a88f87f5de057c4f854
-  data.tar.gz: f7c12e620d4e9aa6ab0763887b9e5ca6627c25da54d1e063c0c547c11c3de14979cd4b68b91969bc602b0eed6966dcabc7ab2bf4147eaec279d6afc558e2dc96
+  metadata.gz: d0affbc2120a9667c3261c8af222ecb3f41da1a0f1ea387a322bdc23ade75470457d975523e3577ff5c725e4171953f48073fe11a9a0e6023cb318e5e5236657
+  data.tar.gz: 96ea1a6c5baffaed3da5aef0739789c62a45f90fca2fedd274084ea9ea0da371e268e4006fcc1795127e8cc8f4bec0c75a637f0b22b31cf5e4c23eb9e63ab849

data/app/models/mdm/session.rb

@@ -1,6 +1,11 @@
 # A session opened on a {#host} using an {#via_exploit exploit} and controlled through a {#via_payload payload} to
 # connect back to the local host using meterpreter or a cmd shell.
 class Mdm::Session < ApplicationRecord
+  extend ActiveSupport::Autoload
+
+  include Metasploit::Model::Search
+
+  require_relative 'session_tag'
 
   #
   # Associations
@@ -67,6 +72,27 @@ class Mdm::Session < ApplicationRecord
           class_name: 'Mdm::VulnAttempt',
           inverse_of: :session
 
+  # @!attribute sessions_tags
+  #   A join model between {Mdm::Tag} and {Mdm::Session}.  Use {#tags} to get the actual {Mdm::Tag Mdm::Tags} on this host.
+  #
+  #   @todo MSP-2723
+  #   @return [ActiveRecord::Relation<Mdm::SessionTag>]
+  has_many :sessions_tags,
+           class_name: 'Mdm::SessionTag',
+           dependent: :destroy,
+           inverse_of: :session
+
+  #
+  # Through sessions_tags
+  #
+
+  # @!attribute [r] tags
+  #   The tags on this session.  Tags are used to filter sessions.
+  #
+  #   @return [ActiveRecord::Relation<Mdm::Tag>]
+  #   @see #sessions_tags
+  has_many :tags, :class_name => 'Mdm::Tag', :through => :sessions_tags
+
   #
   # Through :host
   #

data/app/models/mdm/session_tag.rb

@@ -0,0 +1,51 @@
+# Join model between {Mdm::Host} and {Mdm::Tag}.
+class Mdm::SessionTag < ApplicationRecord
+  self.table_name = "sessions_tags"
+
+  #
+  # Associations
+  #
+
+  # Session with {#tag}.
+  #
+  # @todo MSP-2723
+  belongs_to :session,
+             class_name: 'Mdm::Session',
+             inverse_of: :sessions_tags
+
+  # Tag on {#host}.
+  #
+  # @todo MSP-2723
+  belongs_to :tag,
+             class_name: 'Mdm::Tag',
+             inverse_of: :sessions_tags
+
+  #
+  # Callbacks
+  #
+
+  # @see http://stackoverflow.com/a/11694704
+  after_destroy :destroy_orphan_tag
+  
+  #
+  # Instance Methods
+  #
+
+  private
+
+  # Destroys {#tag} if it is orphaned
+  #
+  # @see http://stackoverflow.com/a/11694704
+  # @return [void]
+  def destroy_orphan_tag
+    # ensure fresh load of tag record
+    # in theory this will always return one result safe navigation is just "extra"
+    Mdm::Tag.where(id: tag.id).first&.destroy_if_orphaned
+  end
+
+  # switch back to public for load hooks
+  public
+
+  Metasploit::Concern.run(self)
+end
+

data/app/models/mdm/tag.rb

@@ -12,6 +12,12 @@ class Mdm::Tag < ApplicationRecord
            dependent: :destroy,
            inverse_of: :tag
 
+  # Joins {#sessions} to this tag.
+  has_many :sessions_tags,
+           class_name: 'Mdm::SessionTag',
+           dependent: :destroy,
+           inverse_of: :tag
+
   # User that created this tag.
   belongs_to :user,
              class_name: 'Mdm::User',

data/db/migrate/20251231162000_add_session_tags.rb

@@ -0,0 +1,14 @@
+class AddSessionTags < ActiveRecord::Migration[7.0]
+
+	def change
+		create_table :sessions_tags do |t|
+			t.integer :session_id
+			t.integer :tag_id
+		end
+		add_index :sessions_tags, [:session_id, :tag_id], unique: true
+	end
+
+	def self.down
+		drop_table :sessions_tags
+	end
+end

data/lib/metasploit_data_models/version.rb

@@ -1,6 +1,6 @@
 module MetasploitDataModels
   # VERSION is managed by GemRelease
-  VERSION = '6.0.13'
+  VERSION = '6.0.14'
 
   # @return [String]
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit_data_models
 version: !ruby/object:Gem::Version
-  version: 6.0.13
+  version: 6.0.14
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -343,6 +343,7 @@ files:
 - app/models/mdm/service_link.rb
 - app/models/mdm/session.rb
 - app/models/mdm/session_event.rb
+- app/models/mdm/session_tag.rb
 - app/models/mdm/tag.rb
 - app/models/mdm/task.rb
 - app/models/mdm/task_cred.rb
@@ -528,6 +529,7 @@ files:
 - db/migrate/20250718122714_create_service_links.rb
 - db/migrate/20250720082201_drop_service_uniqueness_index2.rb
 - db/migrate/20250721114306_remove_duplicate_services3.rb
+- db/migrate/20251231162000_add_session_tags.rb
 - db/migrate/20260130124052_add_sso_status_to_user.rb
 - lib/mdm.rb
 - lib/mdm/host/operating_system_normalization.rb