metasploit_data_models 6.0.13 → 6.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f076fefa48fbef835f71f863254fa30d0f7c6f6b4b7cc96eb43ea4b77bf2acc5
-  data.tar.gz: 2418ddb5ba7a144da1eee3e3953193fdcfc1b1091a576e086d735a29b5fc4067
+  metadata.gz: d4d011d8005f59d1f1f2395ec7bd72aeffcb88fcd8a6e701b05ae4150f822a1a
+  data.tar.gz: f0e9c11fdd9167932491e4d9c97b877e82ff296d30b45c60c771f15e60cab87c
 SHA512:
-  metadata.gz: 211fa97f496a5092bf5b4c33a7de943274b066f828518171f33cb608a28540610a6fbd416626fee89ae831f36773b7fb83d0962a49a11a88f87f5de057c4f854
-  data.tar.gz: f7c12e620d4e9aa6ab0763887b9e5ca6627c25da54d1e063c0c547c11c3de14979cd4b68b91969bc602b0eed6966dcabc7ab2bf4147eaec279d6afc558e2dc96
+  metadata.gz: 980eb17b3a2fa52fd7410cd06e015e0cc3263de2791b622a2b8a46a4c83e19672cfdc53e6fcd28c6ecda05cefbe0cf094113c5d0b1586de4eb2a1a5f9ed919d6
+  data.tar.gz: 4e7f6dc83030e7520a3c3349ed8513163074bfa2efee28c66e486c79795c5ff1cc82023adfd06a080b45dc9c06b8b338457c3c33b0d7f781967e8dc1f67a69b7

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.15'
 
   # @return [String]
   #

data/metasploit_data_models.gemspec

@@ -39,7 +39,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'metasploit-model', '~>5.0.4'
   s.add_runtime_dependency 'railties', '~>7.0'
   s.add_runtime_dependency 'webrick'
-  s.add_runtime_dependency 'concurrent-ruby', '<1.3.5'
 
   # os fingerprinting
   s.add_runtime_dependency 'recog'

data/spec/dummy/db/structure.sql

@@ -1456,6 +1456,36 @@ CREATE SEQUENCE public.sessions_id_seq
 ALTER SEQUENCE public.sessions_id_seq OWNED BY public.sessions.id;
 
 
+--
+-- Name: sessions_tags; Type: TABLE; Schema: public; Owner: -
+--
+
+CREATE TABLE public.sessions_tags (
+    id bigint NOT NULL,
+    session_id integer,
+    tag_id integer
+);
+
+
+--
+-- Name: sessions_tags_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE public.sessions_tags_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: sessions_tags_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE public.sessions_tags_id_seq OWNED BY public.sessions_tags.id;
+
+
 --
 -- Name: tags; Type: TABLE; Schema: public; Owner: -
 --
@@ -2432,6 +2462,13 @@ ALTER TABLE ONLY public.session_events ALTER COLUMN id SET DEFAULT nextval('publ
 ALTER TABLE ONLY public.sessions ALTER COLUMN id SET DEFAULT nextval('public.sessions_id_seq'::regclass);
 
 
+--
+-- Name: sessions_tags id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.sessions_tags ALTER COLUMN id SET DEFAULT nextval('public.sessions_tags_id_seq'::regclass);
+
+
 --
 -- Name: tags id; Type: DEFAULT; Schema: public; Owner: -
 --
@@ -2886,6 +2923,14 @@ ALTER TABLE ONLY public.sessions
     ADD CONSTRAINT sessions_pkey PRIMARY KEY (id);
 
 
+--
+-- Name: sessions_tags sessions_tags_pkey; Type: CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.sessions_tags
+    ADD CONSTRAINT sessions_tags_pkey PRIMARY KEY (id);
+
+
 --
 -- Name: tags tags_pkey; Type: CONSTRAINT; Schema: public; Owner: -
 --
@@ -3324,6 +3369,13 @@ CREATE INDEX index_services_on_state ON public.services USING btree (state);
 CREATE INDEX index_sessions_on_module_run_id ON public.sessions USING btree (module_run_id);
 
 
+--
+-- Name: index_sessions_tags_on_session_id_and_tag_id; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE UNIQUE INDEX index_sessions_tags_on_session_id_and_tag_id ON public.sessions_tags USING btree (session_id, tag_id);
+
+
 --
 -- Name: index_vulns_on_name; Type: INDEX; Schema: public; Owner: -
 --
@@ -3548,6 +3600,7 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20250718122714'),
 ('20250720082201'),
 ('20250721114306'),
+('20251231162000'),
 ('20260130124052'),
 ('21'),
 ('22'),

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.15
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -178,20 +178,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: concurrent-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.3.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.3.5
 - !ruby/object:Gem::Dependency
   name: recog
   requirement: !ruby/object:Gem::Requirement
@@ -343,6 +329,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 +515,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