metasploit_data_models 4.1.4 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cce023c97fe6144aadc776c3940166846e8a79486744d9552a7b460b61641525
-  data.tar.gz: 8400cc5756c2dfd3d063c18a9ff0257c8729f85008ce043217af3db28c5cade2
+  metadata.gz: a15267e2f6c71ba5b58fdfea90153b170f940e65b01b85d3612bcdf1694c298f
+  data.tar.gz: fb5e035e7e80f3dea304ed1ca8cacc463117300357c9386d341196e968003d8b
 SHA512:
-  metadata.gz: 79deb575ba6a357e752ebcc30b767cf395b6f0a1cc5ff6042da23c439c3f96d6e8c7875fa4137b42e1ae5825e15b81d948bc8c6cc5464912ee23cf368f976683
-  data.tar.gz: 10c4a62fed219f974469d48c4e9e28ff0056f7f1401c3562ee19a028a2fe93c5c312907b4e5d8c5d2b39e914d27e25100474ca32fb79f5006fdc71e0169946de
+  metadata.gz: 2670839b6eace925d4da176c76da44cfbb54e774a50755a7095ef3de8220a81c146a442d258eee7e6e91abad2fae76ab82e49e7998fef749ea95173a2871a98c
+  data.tar.gz: e6a013485f5b639a31d1232743c847787853bb61fab191a2e619dbfe1d5853b8c4fe7bc905847a3a38910da59accd4b1488fe47eb81f10e96f98da3e38a14ba9

data.tar.gz.sig

@@ -1 +1,2 @@
-H���?���!�$�J�����GBASf�<p�"���`@�՛^�p_>�8���)a�c�Ќ|%H�ر3�cdM�����HQ��o���JY_��tF���]�=$D��]ˊ��
���[z$����f��A�I5.�ԃ���(��j��-P7��e��Ώ�i"T�@���X����7$�L]j<`J�ue��9���Q�\i8���X߀J����Dw%w�����=l�z�ˠH��]�
+Q#�4�����6��eR[�e�`�n����:�ٽ)5��fh�p��Y��訋踦�a�
+��ԩ���1��y�ꮬ�X��氓��D=Io����:

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/lib/metasploit_data_models/version.rb

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

data/metasploit_data_models.gemspec

@@ -33,11 +33,11 @@ Gem::Specification.new do |s|
   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

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/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.4
+  version: 5.0.0
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -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,14 @@ 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
@@ -416,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
@@ -685,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/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)