metasploit_data_models 6.0.7 → 6.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f40cd6914e210d182f683f528eb8af20e813821d9f7d6c17b0c942ad7b3f5f13
-  data.tar.gz: 036f11d4a71fc2269462be6133ad5234475d41e914e26a651ac8e2e26543b9cc
+  metadata.gz: 74538eeddece124d46bfbc8b75ed8cfbdff4e3817d2d043ce378277085a84be4
+  data.tar.gz: 8bdb64d936ab097ed960eafb3e6a4681d8e456ed87a6aa1c6bde7054754590ca
 SHA512:
-  metadata.gz: 252a1fc665e44c1487479f1870a4ad0fccb8512f107b5feac8898ec6e07f3f9433be3883c5ac2e44d6f40a986bf985d4792a0a0b43a1479fb569acbc5955207e
-  data.tar.gz: bdd04378b8f40a80336790223c87a162bf2b5a9ff1dfef6d531581ef86c59459063e4562624ac7d2ddb8d5a3ac28d09e3c8bedc9e2435044a68b26ff7038f781
+  metadata.gz: 3155ae51fcf684a115ca902c96987ee867bde52f0017cf790f92e352039e5ab4bceefb300af00c79b068871542527e153ded49699b93493d3ca92d23e8f725c1
+  data.tar.gz: '0678de3dff2f00feb24b6b3a0be2adeaa89e716bdcad744a62efb6bca4a521e16767058fc4e14e7b5851c60c5eedf50e6410887d672ed93234d20149a15de7f9'

data/.github/workflows/verify.yml

@@ -50,8 +50,11 @@ jobs:
           - '3.0'
           - '3.1'
           - '3.2'
+        rails:
+          - '~> 7.0.0'
+          - '~> 7.1.0'
         os:
-          - ubuntu-20.04
+          - ubuntu-22.04
           - ubuntu-latest
         exclude:
           - { os: ubuntu-latest, ruby: '2.7' }
@@ -60,7 +63,7 @@ jobs:
     env:
       RAILS_ENV: test
 
-    name: ${{ matrix.os }} - Ruby ${{ matrix.ruby }}
+    name: ${{ matrix.os }} - Ruby ${{ matrix.ruby }} - Rails ${{ matrix.rails }}
     steps:
       - name: Install system dependencies
         run: sudo apt-get install libpcap-dev graphviz
@@ -74,6 +77,12 @@ jobs:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
 
+      - name: Update Rails version
+        run: |
+          ruby -pi.bak -e "gsub(/gem ['\"]rails['\"],\s*['\"].+['\"]?/, \"gem 'rails', '${{ matrix.rails }}'\")" Gemfile
+          bundle update
+          bundle install
+
       - name: Test
         run: |
           cp spec/dummy/config/database.yml.github_actions spec/dummy/config/database.yml

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

@@ -49,6 +49,25 @@ class MetasploitDataModels::Search::Visitor::Where
     attribute.matches(match_value)
   end
 
+  visit 'Metasploit::Model::Search::Operation::Jsonb' do |operation|
+    attribute = attribute_visitor.visit operation.operator
+
+    begin
+      operation_hash = JSON.parse(operation.value)
+      left = Arel::Nodes::InfixOperation.new(
+        '->>',
+        Arel::Nodes.build_quoted(attribute),
+        Arel::Nodes.build_quoted(operation_hash.keys[0])
+      )
+      right ="%#{operation_hash.values[0]}%"
+    rescue JSON::ParserError
+      left = Arel::Nodes::NamedFunction.new("cast", [attribute.as('text')])
+      right ="%#{operation.value}%"
+    end
+
+    left.matches(right)
+  end
+
   visit 'MetasploitDataModels::IPAddress::CIDR' do |cidr|
     cast_to_inet "#{cidr.address}/#{cidr.prefix_length}"
   end

data/lib/metasploit_data_models/version.rb

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

data/spec/app/models/metasploit_data_models/search/visitor/where_spec.rb

@@ -183,5 +183,49 @@ RSpec.describe MetasploitDataModels::Search::Visitor::Where, type: :model do
         end
       end
     end
+
+    context 'with MetasploitDataModels::Search::Operation::Jsonb' do
+      let(:klass) do
+        klass = Class.new(ApplicationRecord)
+        Object.const_set('Jsonb', klass)
+        klass
+      end
+
+      let(:node) do
+        Metasploit::Model::Search::Operation::Jsonb.new(
+            :operator => operator,
+            :value => value
+        )
+      end
+
+      let(:operator) do
+        Metasploit::Model::Search::Operator::Attribute.new(
+            :klass => klass,
+            :attribute => :metadata
+        )
+      end
+
+      let(:value) do
+        'adcs_ca:myCA'
+      end
+
+      it 'should visit operation.operator with attribute_visitor' do
+        expect(visitor.attribute_visitor).to receive(:visit).with(operator).and_call_original
+
+        visit
+      end
+
+      it 'should return the expected Arel::Nodes::Matches' do
+        attribute = Arel::Attributes::Attribute.new(
+          Arel::Table.new(:metasploit_credential_privates),
+          'metadata'
+        )
+        allow(visitor.attribute_visitor).to receive(:visit).with(operator).and_return(attribute)
+
+        results = visit
+        expect(results).to be_a(Arel::Nodes::Matches)
+        expect(results.to_sql).to eq("\"metasploit_credential_privates\".\"metadata\" ->> 'adcs_ca' ILIKE '%myCA%'")
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metasploit_data_models
 version: !ruby/object:Gem::Version
-  version: 6.0.7
+  version: 6.0.9
 platform: ruby
 authors:
 - Metasploit Hackers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-24 00:00:00.000000000 Z
+date: 2025-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metasploit-yard