metasploit-concern 4.0.5 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3be630fb8cb4600f2f037eaab42c0dfff18213332092215ce650b5f19ab016f0
-  data.tar.gz: 7d85b09c76f6ef2c7cb4cba53f6cf6d923898ac58a78efb03373593e4d3142e5
+  metadata.gz: ff99cb753f6000ae296a36694acdde163312774daf920c0f4f4b87eb8b718ead
+  data.tar.gz: 5690e170ac10caf4acf543026ce066abde76c76b2aca5468a5766faac05cc27c
 SHA512:
-  metadata.gz: bcb972c3cc42b0462bab6d1292db9615f1b14a6cd99d5639ab2adfcacf8fe32b2293528d77ea3cc2dcdd99be43f6f892ed3e63533251644bc9956d81f9be1444
-  data.tar.gz: 22902a1e5afb1845932b35fb0fce799ff9c8a8f337d5c228a0f2cd3a31800e0b42a7c405f45cda70d4e0443691b8abdc19de65936507ea76ed9dff1994f1f74f
+  metadata.gz: 5d1a7bd44f83d327491e04548a1da814aefafd3d8ae01c52fabba2bcad60016e79feac2abb8d8b2cfa2b85884e34f1ab25105f0f73913247008322e6a829bad5
+  data.tar.gz: 9139fdc9619ed2db171bad235cc41499b92d4a06a63100dc0ab6148d95a99bc9eeed8e673333aa5733df0dfd8d649db61755c746bea84e037b467e44a899620d

data/lib/metasploit/concern/engine.rb

@@ -41,12 +41,16 @@ module Metasploit
               raise Metasploit::Concern::Error::SkipAutoload, engine
             end
 
-            concerns_directories = concerns_path.existent_directories
+            ActiveSupport::Reloader.to_prepare do
+              # wrap engine configs changes in to_prepare to ensure they get recreated if classes are reloaded by zeitwerk
+              concerns_directories = concerns_path.existent_directories
 
-            concerns_directories.each do |concerns_directory|
-              concerns_pathname = Pathname.new(concerns_directory)
-              loader = Metasploit::Concern::Loader.new(root: concerns_pathname)
-              loader.register
+              concerns_directories.each do |concerns_directory|
+                concerns_pathname = Pathname.new(concerns_directory)
+
+                loader = Metasploit::Concern::Loader.new(root: concerns_pathname)
+                loader.register
+              end
             end
           end
         end

data/lib/metasploit/concern/loader.rb

@@ -32,10 +32,9 @@ class Metasploit::Concern::Loader
   # @yieldparam constant [Module] constant declared under `parent_pathname`.
   # @yieldreturn [void]
   # @return [void]
-  def each_pathname_constant(mechanism:, parent_pathname:)
+  def each_pathname_constant(parent_pathname:)
     parent_pathname.each_child do |child_pathname|
       constant = constantize_pathname(
-          mechanism: mechanism,
           pathname: child_pathname
       )
 
@@ -87,14 +86,8 @@ class Metasploit::Concern::Loader
       loader = self
 
       ActiveSupport.on_load(on_load_name) do
-        if ActiveSupport::Dependencies.autoloaded? self
-          mechanism = :constantize
-        else
-          mechanism = :require
-        end
-
-        loader.each_pathname_constant(mechanism: mechanism, parent_pathname: module_pathname) do |concern|
-          include concern
+        loader.each_pathname_constant(parent_pathname: module_pathname) do |concern|
+          include concern unless self.ancestors.map(&:name).include?(concern.to_s)
         end
       end
     end
@@ -109,19 +102,25 @@ class Metasploit::Concern::Loader
   # @param pathname [Pathname] a Pathname under {#root}.
   # @return [Object] if {#pathname_to_constant_name} returns a constant name
   # @return [nil] otherwise
-  def constantize_pathname(mechanism:, pathname:)
+  def constantize_pathname(pathname:)
     constant_name = pathname_to_constant_name(pathname)
 
     constant = nil
 
     if constant_name
-      # require before calling constantize so that the constant isn't recorded as unloadable.
-      if mechanism == :require
-        require pathname
+      begin
+        # constantize either way as the the constant_name still needs to be converted to Module
+        constant = constant_name.constantize
+      rescue => e # rescue any here should probably be more specific
+        if e.kind_of?(NameError)
+          begin
+            require pathname
+            constant = constant_name.constantize
+          rescue NameError => _e
+            _e # left for debugging breakpoint
+          end
+        end
       end
-
-      # constantize either way as the the constant_name still needs to be converted to Module
-      constant = constant_name.constantize
     end
 
     constant

data/lib/metasploit/concern/version.rb

@@ -1,7 +1,7 @@
 module Metasploit
   module Concern
     # VERSION is managed by GemRelease
-    VERSION = '4.0.5'
+    VERSION = '5.0.0'
   
     # @return [String]
     #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-concern
 version: !ruby/object:Gem::Version
-  version: 4.0.5
+  version: 5.0.0
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -93,7 +93,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2022-09-02 00:00:00.000000000 Z
+date: 2022-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metasploit-yard
@@ -129,42 +129,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  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'
 description: Automatically includes Modules from app/concerns/<module_with_concerns>/<concern>.rb
   into <module_with_concerns> to ease monkey-patching associations and validations
   on ActiveRecord::Base descendents from other gems when layering schemas.
@@ -199,15 +213,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.10
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Automatically include Modules from app/concerns