metasploit_data_models 6.0.8 → 6.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edadba0a0b450002d8aa039191ec2afcd6dce324359d6c1f2d4c26cb22e0fbd8
-  data.tar.gz: 2b7dfd16ff232695a305baab6da43cc9e491357c14b26b3869da3304a6326d91
+  metadata.gz: 40fa3cb2ec4dfaface1baab768811f1902882e5e5ff1e11298051e8a46974c28
+  data.tar.gz: 611a69c4328a0a0d73d983059db8c3c38e6ca6faa68898859e3e71b6f994c7f0
 SHA512:
-  metadata.gz: 5c37530d3bae08e462d4d19f9dd90917e9deb9d0498e88386c4f08359d4494dc4f6bc0efa56124c6bb311d3b383a7d439f7cd7b0751dfb7cb2d884295e8bf2d3
-  data.tar.gz: 5f596df8353893eb8c7cdac0f0176738c05aa8e8156b424b9d79fbd8712526672fce2acad76e915e3ef571d4c2d7301702c8005e246a85ca0c0a0329bde282e3
+  metadata.gz: 522514fd33922e9ca5505563c053194fb7c3116c7d5e862574fe56546873953c56d082e92d7e4d3c701139875634aee8ef686aeb71647367114312ca4fab0963
+  data.tar.gz: 57d1cb11239b0cb4fc93e36013cebb75372a04550d2ea6506c7be2ce1521d29cbef7a5514a00ab528cff053093867e9948368a3a5c927b8c49775d2ba680e337

data/.github/workflows/verify.yml

@@ -25,71 +25,14 @@ on:
       - '*'
 
 jobs:
-  test:
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 40
-
-    services:
-      postgres:
-        image: postgres:9.6
-        ports: ["5432:5432"]
-        env:
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-
-    strategy:
-      fail-fast: true
-      matrix:
-        ruby:
-          - '2.7'
-          - '3.0'
-          - '3.1'
-          - '3.2'
-        rails:
-          - '~> 7.0.0'
-          - '~> 7.1.0'
-        os:
-          - ubuntu-22.04
-          - ubuntu-latest
-        exclude:
-          - { os: ubuntu-latest, ruby: '2.7' }
-          - { os: ubuntu-latest, ruby: '3.0' }
-
-    env:
-      RAILS_ENV: test
-
-    name: ${{ matrix.os }} - Ruby ${{ matrix.ruby }} - Rails ${{ matrix.rails }}
-    steps:
-      - name: Install system dependencies
-        run: sudo apt-get install libpcap-dev graphviz
-
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          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
-          bundle exec rake --version
-          bundle exec rake db:create db:migrate
-
-          # Disabling this check because it is proving unreliable
-          # git diff --exit-code spec/dummy/db/structure.sql
-          bundle exec rake spec
-          bundle exec rake yard
+  build:
+    uses: rapid7/metasploit-framework/.github/workflows/shared_gem_verify_rails.yml@master
+    with:
+      dependencies: '["libpcap-dev", "graphviz"]'
+      test_commands: |
+        cp spec/dummy/config/database.yml.github_actions spec/dummy/config/database.yml
+        bundle exec rake --version
+        bundle exec rake db:create db:migrate
+        bundle exec rake spec
+        bundle exec rake spec
+        bundle exec rake yard

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.8'
+  VERSION = '6.0.10'
 
   # @return [String]
   #

data/metasploit_data_models.gemspec

@@ -46,6 +46,15 @@ Gem::Specification.new do |s|
   # arel-helpers: Useful tools to help construct database queries with ActiveRecord and Arel.
   s.add_runtime_dependency 'arel-helpers'
 
+  # Standard libraries: https://www.ruby-lang.org/en/news/2023/12/25/ruby-3-3-0-released/
+  %w[
+    bigdecimal
+    drb
+    mutex_m
+  ].each do |library|
+    s.add_runtime_dependency library
+  end
+
   if RUBY_PLATFORM =~ /java/
     # markdown formatting for yard
     s.add_development_dependency 'kramdown'

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.8
+  version: 6.0.10
 platform: ruby
 authors:
 - Metasploit Hackers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-01 00:00:00.000000000 Z
+date: 2025-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metasploit-yard
@@ -206,6 +206,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bigdecimal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: drb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mutex_m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement