metasploit_data_models 4.1.1 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68c3f56da5b51a9ae696f0dd49c38fd5f7c2399ea7a99fa6f7805b93badbc80c
-  data.tar.gz: 825c21042d3728a1a47f4cb98a7a01c6e40d41f5dfbfbd715c2adafaabef453e
+  metadata.gz: 6b3d6afb4043f6da94c943b5fbc781ae3181d50720a85dc148faaafb90342e9d
+  data.tar.gz: 42b7980d65c39dfafca53117d550d3bd408e845e051637b9dc2581f580c86f96
 SHA512:
-  metadata.gz: e30b3c529d014801de2524f1c5b731d8461d87e466fc679c4283093346c60febb33fb8a731ada5e59f883ac0fb7b98a5731f88d5bbe3580354832a4aff760a27
-  data.tar.gz: da1925e7549df28935ecc86221ba2c78c9ac9de5deb1fc89b6737c7fbead438a897f9bd8752a50c1dde5afe59a14d228ee67cf80b97fe9059dd0026f22266b22
+  metadata.gz: 8e868aaf68a281bfed3c28ce4bc262fdc8e33ed02ca90beb49c1136e94f78ab0c671e76d6c81d3110592b344ef463d5dc0686c3d110ff8abe3b1aed91a07e33a
+  data.tar.gz: 74ba74b84a2daadc73546e4b604e6c9cac36a3b1370e757848096c76f2580dc79d4d573c48833c904606fcd15535da27fb6d6a8e60fd83abd070b4bb3ba38c56

data/.github/workflows/verify.yml

@@ -0,0 +1,71 @@
+name: Verify
+
+on:
+  push:
+    branches:
+      - '*'
+  pull_request:
+    branches:
+      - '*'
+
+jobs:
+  test:
+    runs-on: ubuntu-16.04
+    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.5
+          - 2.6
+          - 2.7
+          - 3.0
+
+    env:
+      RAILS_ENV: test
+
+    name: Ruby ${{ matrix.ruby }}
+    steps:
+      - name: Install system dependencies
+        run: sudo apt-get install libpcap-dev graphviz
+
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+
+      - name: Setup bundler
+        run: |
+          gem install bundler:2.1.4
+
+      - name: Bundle install
+        run: |
+          bundle config path vendor/bundle
+          bundle _2.1.4_ install --jobs 4 --retry 3
+
+      - 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

data/Gemfile

@@ -27,8 +27,6 @@ group :development, :test do
   # bound to 0.20 for Activerecord 4.2.8 deprecation warnings:
   # https://github.com/ged/ruby-pg/commit/c90ac644e861857ae75638eb6954b1cb49617090
   gem 'pg'
-
-  gem 'pry'
 end
 
 group :test do

data/README.md

@@ -41,6 +41,14 @@ different `on_load` name, which is just the class name converted to an underscor
 
     require 'metasploit_data_models/engine'
 
+`ArelHelper` classes must also be included in your applications `app/models/application_record.rb` class:
+
+    class ApplicationRecord < ActiveRecord::Base
+      self.abstract_class = true
+      include ArelHelpers::ArelTable
+      include ArelHelpers::JoinAssociation
+    end
+
 ### Metasploit Framework
 
 In Metasploit Framework, `MetasploitDataModels::Engine` is loaded, but the data models are only if the user wants to use

data/app/models/metasploit_data_models/ip_address/v4/segment/nmap/list.rb

@@ -12,7 +12,7 @@ class MetasploitDataModels::IPAddress::V4::Segment::Nmap::List < Metasploit::Mod
   # Either an individual {MetasploitDataModels::IPAddress::V4::Segment::Single segment number} or a
   # {MetasploitDataModels::IPAddress::V4::Segment::Nmap::Range segment range}.
   RANGE_OR_NUMBER_REGEXP = %r{
-      (?<range>#{parent::Range.regexp})
+      (?<range>#{module_parent::Range.regexp})
       |
       # range first because it contains a segment and if the range isn't first only the first part of the range will
       # match.

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

@@ -67,7 +67,7 @@ class MetasploitDataModels::Search::Visitor::Relation < Metasploit::Model::Base
   # @return [Hash{Symbol => Class}]
   def self.visitor_class_by_relation_method
     @relation_method_by_visitor_class ||= RELATION_METHODS.each_with_object({}) { |relation_method, relation_method_by_visitor_class|
-      visitor_class_name = "#{parent.name}::#{relation_method.to_s.camelize}"
+      visitor_class_name = "#{module_parent.name}::#{relation_method.to_s.camelize}"
       visitor_class = visitor_class_name.constantize
 
       relation_method_by_visitor_class[relation_method] = visitor_class

data/db/migrate/20140905031549_add_detected_arch_to_host.rb

@@ -1,5 +1,5 @@
 class AddDetectedArchToHost < ActiveRecord::Migration[4.2]
   def change
-    add_column :hosts, :detected_arch, :string, { :null => true }
+    add_column :hosts, :detected_arch, :string, :null => true
   end
 end

data/db/migrate/20190308134512_create_async_callbacks.rb

@@ -8,7 +8,6 @@ class CreateAsyncCallbacks < ActiveRecord::Migration[4.2]
       t.string :target_port
 
       t.timestamps null: false
-      t.uuid null: false
     end
   end
 end

data/lib/metasploit_data_models/version.rb

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

data/metasploit_data_models.gemspec

@@ -28,18 +28,17 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'rake'
 
-  # documentation
-  # @note 0.8.7.4 has a bug where attribute writers show up as undocumented
-  s.add_development_dependency 'yard', '< 0.8.7.4'
+  s.add_development_dependency 'yard'
   # debugging
   s.add_development_dependency 'pry'
 
 
-  s.add_runtime_dependency 'activerecord', '~>5.2.2'
-  s.add_runtime_dependency 'activesupport', '~>5.2.2'
+  s.add_runtime_dependency 'activerecord', '~>6.0'
+  s.add_runtime_dependency 'activesupport', '~>6.0'
   s.add_runtime_dependency 'metasploit-concern'
   s.add_runtime_dependency 'metasploit-model', '>=3.1'
-  s.add_runtime_dependency 'railties', '~>5.2.2'
+  s.add_runtime_dependency 'railties', '~>6.0'
+  s.add_runtime_dependency 'webrick'
 
   # os fingerprinting
   s.add_runtime_dependency 'recog', '~> 2.0'

data/spec/app/models/metasploit_data_models/ip_address/v4/segment/single_spec.rb

@@ -233,7 +233,7 @@ RSpec.describe MetasploitDataModels::IPAddress::V4::Segment::Single, type: :mode
   end
 
   context '#to_s' do
-    subject(:to_s) {
+    subject(:call_to_s) {
       single.to_s
     }
 
@@ -256,7 +256,7 @@ RSpec.describe MetasploitDataModels::IPAddress::V4::Segment::Single, type: :mode
     it 'delegates to #value' do
       expect(value).to receive(:to_s)
 
-      to_s
+      call_to_s
     end
   end
 
@@ -321,4 +321,4 @@ RSpec.describe MetasploitDataModels::IPAddress::V4::Segment::Single, type: :mode
       end
     end
   end
-end
+end

data/spec/app/models/metasploit_data_models/search/operation/range_spec.rb

@@ -39,7 +39,7 @@ RSpec.describe MetasploitDataModels::Search::Operation::Range, type: :model do
 
       context '#ordered' do
         let(:error) {
-          I18n.translate!('metasploit.model.errors.models.metasploit_data_models/search/operation/range.attributes.value.order', error_attributes)
+          I18n.translate!('metasploit.model.errors.models.metasploit_data_models/search/operation/range.attributes.value.order', **error_attributes)
         }
 
         context 'with Range' do
@@ -230,4 +230,4 @@ RSpec.describe MetasploitDataModels::Search::Operation::Range, type: :model do
       end
     end
   end
-end
+end

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

@@ -28,7 +28,11 @@ RSpec.describe MetasploitDataModels::Search::Visitor::Attribute, type: :model do
           end
 
           it "should be #{node_class}#attribute" do
-            expect(name).to eq(node.attribute)
+            if node.attribute.instance_of? Symbol
+              expect(name.to_s).to eq(node.attribute.to_s)
+            else
+              expect(name).to eq(node.attribute)
+            end
           end
         end
 
@@ -93,4 +97,4 @@ RSpec.describe MetasploitDataModels::Search::Visitor::Attribute, type: :model do
       }
     end
   end
-end
+end

data/spec/dummy/app/models/application_record.rb

@@ -1,3 +1,5 @@
 class ApplicationRecord < ActiveRecord::Base
   self.abstract_class = true
+  include ArelHelpers::ArelTable
+  include ArelHelpers::JoinAssociation
 end

data/spec/dummy/config/application.rb

@@ -56,6 +56,8 @@ module Dummy
 
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
+
+    config.autoloader = :zeitwerk
   end
 end
 

data/spec/dummy/config/{database.yml.travis → database.yml.github_actions}

@@ -1,18 +1,17 @@
-# @note This file is only for use in travis-ci.  If you need to make a `spec/dummy/config/database.yml` for running
+# @note This file is only for use in Github Actions.  If you need to make a `spec/dummy/config/database.yml` for running
 # rake, rake spec, or rspec locally, please customize `spec/dummy/config/database.yml.example`.
 #
 # @example Customizing config/database.yml.example
 #   cp spec/dummy/config/database.yml.example spec/dummy/config/database.yml
 #   # update password fields for each environment's user
 
-# Using the postgres user locally without a host and port is the supported configuration from Travis-CI
-#
-# @see http://about.travis-ci.org/docs/user/database-setup/#PostgreSQL
 development: &pgsql
   adapter: postgresql
   database: metasploit_data_models_development
+  host: localhost
   username: postgres
-  pool: 5
+  password: postgres
+  pool: 25
   timeout: 5
 
 # Warning: The database defined as "test" will be erased and re-generated from your development database when you run

data/spec/dummy/config/storage.yml

@@ -0,0 +1,7 @@
+test:
+  service: Disk
+  root: <%= Rails.root.join("tmp/storage") %>
+
+local:
+  service: Disk
+  root: <%= Rails.root.join("storage") %>

data/spec/dummy/db/structure.sql

@@ -5,27 +5,12 @@ SET client_encoding = 'UTF8';
 SET standard_conforming_strings = on;
 SELECT pg_catalog.set_config('search_path', '', false);
 SET check_function_bodies = false;
+SET xmloption = content;
 SET client_min_messages = warning;
 SET row_security = off;
 
---
--- Name: plpgsql; Type: EXTENSION; Schema: -; Owner: -
---
-
-CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog;
-
-
---
--- Name: EXTENSION plpgsql; Type: COMMENT; Schema: -; Owner: -
---
-
-COMMENT ON EXTENSION plpgsql IS 'PL/pgSQL procedural language';
-
-
 SET default_tablespace = '';
 
-SET default_with_oids = false;
-
 --
 -- Name: api_keys; Type: TABLE; Schema: public; Owner: -
 --
@@ -64,8 +49,8 @@ ALTER SEQUENCE public.api_keys_id_seq OWNED BY public.api_keys.id;
 CREATE TABLE public.ar_internal_metadata (
     key character varying NOT NULL,
     value character varying,
-    created_at timestamp without time zone NOT NULL,
-    updated_at timestamp without time zone NOT NULL
+    created_at timestamp(6) without time zone NOT NULL,
+    updated_at timestamp(6) without time zone NOT NULL
 );
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit_data_models
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 5.0.1
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -93,7 +93,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2020-11-30 00:00:00.000000000 Z
+date: 2021-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metasploit-yard
@@ -155,16 +155,16 @@ dependencies:
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -185,28 +185,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.2
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.2
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.2
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.2
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: metasploit-concern
   requirement: !ruby/object:Gem::Requirement
@@ -241,14 +241,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.2
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.2
+        version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  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: recog
   requirement: !ruby/object:Gem::Requirement
@@ -314,10 +328,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".coveralls.yml"
+- ".github/workflows/verify.yml"
 - ".gitignore"
 - ".rspec"
 - ".simplecov"
-- ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
 - CONTRIBUTING.md
@@ -402,7 +416,6 @@ files:
 - app/models/metasploit_data_models/search/visitor/method.rb
 - app/models/metasploit_data_models/search/visitor/relation.rb
 - app/models/metasploit_data_models/search/visitor/where.rb
-- config/initializers/arel_helper.rb
 - config/initializers/ipaddr.rb
 - config/locales/en.yml
 - console_db.yml
@@ -655,7 +668,7 @@ files:
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.yml.example
-- spec/dummy/config/database.yml.travis
+- spec/dummy/config/database.yml.github_actions
 - spec/dummy/config/environment.rb
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
@@ -671,6 +684,7 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/config/storage.yml
 - spec/dummy/db/structure.sql
 - spec/dummy/db/structure.sql.from_rails_3
 - spec/dummy/lib/assets/.gitkeep

data/.travis.yml

@@ -1,22 +0,0 @@
-dist: trusty
-sudo: false
-group: stable
-cache: bundler
-language: ruby
-addons:
-  postgresql: '9.6'
-  apt:
-    packages:
-      - libpcap-dev
-      - graphviz
-rvm:
-  - 2.6.5
-before_script:
-  - cp spec/dummy/config/database.yml.travis spec/dummy/config/database.yml
-  - bundle exec rake --version
-  - bundle exec rake db:create db:migrate
-script:
-  # 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

data/config/initializers/arel_helper.rb

@@ -1,5 +0,0 @@
-# Including arel-helpers in all active record models.
-# https://github.com/camertron/arel-helpers
-
-ApplicationRecord.send(:include, ArelHelpers::ArelTable)
-ApplicationRecord.send(:include, ArelHelpers::JoinAssociation)