Merge branch 'master' into dependabot/bundler/irb-1.12.0

Author: Stephen

Diff for: Gemfile

@@ -23,7 +23,7 @@ gem 'espeak-ruby', '~> 1.1.0' # Text-to-Voice
 gem 'rake', '~> 13.1'
 gem 'otr-activerecord', '~> 2.2.0'
 gem 'sqlite3', '~> 1.7'
-gem 'rubocop', '~> 1.60.2', require: false
+gem 'rubocop', '~> 1.62.1', require: false
 
 # Geolocation support
 group :geoip do

Diff for: Gemfile.lock

@@ -131,7 +131,7 @@ GEM
       mojo_magick (~> 0.6.5)
       rqrcode_core (~> 1.0)
     racc (1.7.3)
-    rack (2.2.8)
+    rack (2.2.8.1)
     rack-protection (3.2.0)
       base64 (>= 0.1.0)
       rack (~> 2.2, >= 2.2.4)
@@ -165,19 +165,19 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.0)
-    rubocop (1.60.2)
+    rubocop (1.62.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
+    rubocop-ast (1.31.2)
+      parser (>= 3.3.0.4)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
@@ -276,7 +276,7 @@ DEPENDENCIES
   rdoc (~> 6.6)
   rest-client (~> 2.1.0)
   rspec (~> 3.13)
-  rubocop (~> 1.60.2)
+  rubocop (~> 1.62.1)
   rubyzip (~> 2.3)
   rushover (~> 0.3.0)
   selenium-webdriver (~> 4.18)

Diff for: core/main/configuration.rb

@@ -72,10 +72,12 @@ def validate
 
         return unless validate_public_config_variable?(@config)
 
+        # Note for developers:
+        # The configuration path 'beef.http.public_port' is deprecated.
+        # Use the new format for public_port variables as described in the BeEF project documentation.
+        # Refer to the BeEF configuration guide for the web server configuration details:
+        # https://github.com/beefproject/beef/wiki/Configuration#web-server-configuration
         if @config['beef']['http']['public_port']
-          print_error 'Config path beef.http.public_port is deprecated.'
-          print_error 'Please use the new format for public variables found'
-          print_error 'https://github.com/beefproject/beef/wiki/Configuration#web-server-configuration'
           return
         end
 
@@ -277,13 +279,15 @@ def load_modules_config
 
       private
 
+      # Note for developers:
+      # The configuration path 'beef.http.public' is deprecated.
+      # Use the new format for public variables as described in the BeEF project documentation.
+      # Refer to the BeEF configuration guide for the web server configuration details:
+      # https://github.com/beefproject/beef/wiki/Configuration#web-server-configuration
       def validate_public_config_variable?(config)
         return true if config['beef']['http']['public'].is_a?(Hash) ||
                        config['beef']['http']['public'].is_a?(NilClass)
 
-        print_error 'Config path beef.http.public is deprecated.'
-        print_error 'Please use the new format for public variables found'
-        print_error 'https://github.com/beefproject/beef/wiki/Configuration#web-server-configuration'
         false
       end
     end

Diff for: core/module.rb

@@ -301,9 +301,13 @@ def self.parse_targets(mod)
 
       targets = {}
       target_config.each do |k, v|
-        next unless BeEF::Core::Constants::CommandModule.const_defined? "VERIFIED_#{k.upcase}"
-
-        key = BeEF::Core::Constants::CommandModule.const_get "VERIFIED_#{k.upcase}"
+        # Convert the key to a string if it's not already one
+        k_str = k.to_s.upcase
+      
+        # Use the adjusted string key for the rest of the process
+        next unless BeEF::Core::Constants::CommandModule.const_defined? "VERIFIED_#{k_str}"
+      
+        key = BeEF::Core::Constants::CommandModule.const_get "VERIFIED_#{k_str}"
         targets[key] = [] unless targets.key? key
         browser = nil
 

Diff for: extensions/dns/model.rb

@@ -12,7 +12,7 @@ class Rule < BeEF::Core::Model
           # Hooks the model's "save" event. Validates pattern/response and generates a rule identifier.
           before_save :check_rule
           self.table_name = 'dns_rules'
-          serialize :response, Array
+          serialize :response, type: Array
 
           private
 

Diff for: extensions/qrcode/qrcode.rb

@@ -28,14 +28,25 @@ def self.pre_http_start(_http_hook_server)
               fullurls << target
             # relative URLs
             else
-              # network interfaces
-              BeEF::Core::Console::Banners.interfaces.each do |int|
-                next if int == '0.0.0.0'
+              
+              # Retrieve the list of network interfaces from BeEF::Core::Console::Banners
+              interfaces = BeEF::Core::Console::Banners.interfaces
 
-                fullurls << "#{beef_proto}://#{int}:#{beef_port}#{target}"
+              # Check if the interfaces variable is nil, indicating that network interfaces are not available
+              if interfaces.nil?
+                print_error "[QR] Error: Network interfaces information is unavailable."
+                print_error "[QR] Error: This will be acceptable during testing."
+              else
+                # If interfaces are available, iterate over each network interface
+                interfaces.each do |int|
+                  # Skip the loop iteration if the interface address is '0.0.0.0' (which generally represents all IPv4 addresses on the local machine)
+                  next if int == '0.0.0.0'
+                  # Construct full URLs using the network interface address, and add them to the fullurls array
+                  # The URL is composed of the BeEF protocol, interface address, BeEF port, and the target path
+                  fullurls << "#{beef_proto}://#{int}:#{beef_port}#{target}"
+                end
               end
-              # beef host
-              fullurls << "#{beef_proto}://#{beef_host}:#{beef_port}#{target}" unless beef_host == '0.0.0.0'
+
             end
           end