Merge branch 'bump-gems' into dependabot/bundler/rack-2.2.9

Author: Stephen

Gemfile

@@ -50,7 +50,7 @@ end
 # DNS extension
 group :ext_dns do
   gem 'async-dns', '~> 1.3'
-  gem 'async', '~> 1.31'
+  gem 'async', '~> 1.32'
 end
 
 # QRcode extension

Gemfile.lock

@@ -23,7 +23,7 @@ GEM
     archive-zip (0.12.0)
       io-like (~> 0.3.0)
     ast (2.4.2)
-    async (1.31.0)
+    async (1.32.0)
       console (~> 1.10)
       nio4r (~> 2.3)
       timers (~> 4.1)
@@ -47,9 +47,10 @@ GEM
     coderay (1.1.3)
     concurrent-ruby (1.2.2)
     connection_pool (2.4.1)
-    console (1.23.3)
+    console (1.23.6)
       fiber-annotation
       fiber-local
+      json
     curb (1.0.5)
     daemons (1.4.1)
     diff-lcs (1.5.1)
@@ -101,10 +102,10 @@ GEM
     mutex_m (0.2.0)
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0.1)
+    net-smtp (0.5.0)
       net-protocol
     netrc (0.11.0)
-    nio4r (2.7.0)
+    nio4r (2.7.1)
     nokogiri (1.16.2-arm64-darwin)
       racc (~> 1.4)
     nokogiri (1.16.2-x86_64-linux)
@@ -139,7 +140,7 @@ GEM
       rack (>= 1.3)
     rainbow (3.1.1)
     rake (13.1.0)
-    rdoc (6.6.2)
+    rdoc (6.6.3.1)
       psych (>= 4.0.0)
     regexp_parser (2.9.0)
     reline (0.4.3)
@@ -249,7 +250,7 @@ PLATFORMS
 
 DEPENDENCIES
   ansi (~> 1.5)
-  async (~> 1.31)
+  async (~> 1.32)
   async-dns (~> 1.3)
   browserstack-local (~> 1.4)
   capybara (~> 3.40)

beef

@@ -243,6 +243,8 @@ BeEF::Core::Console::Banners.print_loaded_extensions
 BeEF::Core::Console::Banners.print_loaded_modules
 BeEF::Core::Console::Banners.print_network_interfaces_count
 BeEF::Core::Console::Banners.print_network_interfaces_routes
+BeEF::Core::Console::Banners.print_http_proxy
+BeEF::Core::Console::Banners.print_dns
 
 #
 # @note Prints the API key needed to use the RESTful API

core/main/configuration.rb

@@ -26,7 +26,6 @@ def initialize(config)
         begin
           # open base config
           @config = load(config)
-          # set default value if key? does not exist
           @config.default = nil
           @@config = config
         rescue StandardError => e
@@ -156,7 +155,7 @@ def beef_url_str
         "#{beef_proto}://#{beef_host}:#{beef_port}"
       end
 
-      # Returns the hool path value stored in the config file
+      # Returns the hook path value stored in the config file
       #
       # @return [String] hook file path
       def hook_file_path

core/main/console/banners.rb

@@ -134,6 +134,29 @@ def print_websocket_servers
               print_info "Starting WebSocketSecure server on wss://[#{config.beef_host}:#{config.get('beef.http.websocket.secure_port').to_i} [timer: #{ws_poll_timeout}]"
             end
           end
+
+          # Print WebSocket servers
+          #
+          def print_http_proxy
+            config = BeEF::Core::Configuration.instance
+            print_info "HTTP Proxy: http://#{config.get('beef.extension.proxy.address')}:#{config.get('beef.extension.proxy.port')}"
+          end
+
+          def print_dns
+            address = nil
+            port = nil
+            protocol = nil
+
+            # TODO: fix the following reference - extensions/dns/api.rb
+            # servers, interfaces, address, port, protocol, upstream_servers = get_dns_config # get the DNS configuration
+
+            # Print the DNS server information
+            unless address.nil? || port.nil? || protocol.nil?
+              print_info "DNS Server: #{address}:#{port} (#{protocol})"
+              print_more upstream_servers unless upstream_servers.empty?
+            end
+          end
+
         end
       end
     end

extensions/dns/api.rb

@@ -24,8 +24,23 @@ module NameserverHandler
           #
           # @param http_hook_server [BeEF::Core::Server] HTTP server instance
           def self.pre_http_start(_http_hook_server)
-            dns_config = BeEF::Core::Configuration.instance.get('beef.extension.dns')
+            servers, interfaces, address, port, protocol, upstream_servers = get_dns_config # get the DNS configuration
+
+            # Start the DNS server
             dns = BeEF::Extension::Dns::Server.instance
+            dns.run(upstream: servers, listen: interfaces)
+          end
+
+          def self.print_dns_info
+            servers, interfaces, address, port, protocol, upstream_servers = get_dns_config # get the DNS configuration
+
+            # Print the DNS server information
+            print_info "DNS Server: #{address}:#{port} (#{protocol})"
+            print_more upstream_servers unless upstream_servers.empty?
+          end
+
+          def self.get_dns_config
+            dns_config = BeEF::Core::Configuration.instance.get('beef.extension.dns')
 
             protocol = begin
               dns_config['protocol'].to_sym
@@ -52,10 +67,7 @@ def self.pre_http_start(_http_hook_server)
               end
             end
 
-            dns.run(upstream: servers, listen: interfaces)
-
-            print_info "DNS Server: #{address}:#{port} (#{protocol})"
-            print_more upstream_servers unless upstream_servers.empty?
+            return servers, interfaces, address, port, protocol, upstream_servers
           end
 
           # Mounts the handler for processing DNS RESTful API requests.

extensions/dns/dns.rb

@@ -15,9 +15,11 @@ class Server < Async::DNS::Server
 
         def initialize
           super()
+          logger.level = Logger::ERROR
           @lock = Mutex.new
           @database = BeEF::Core::Models::Dns::Rule
           @data_chunks = {}
+          @server_started = false
         end
 
         # Adds a new DNS rule. If the rule already exists, its current ID is returned.
@@ -118,6 +120,7 @@ def run(options = {})
           @lock.synchronize do
             Thread.new do
               EventMachine.next_tick do
+                next if @server_started # Check if the server was already started
                 upstream = options[:upstream] || nil
 
                 listen = options[:listen] || nil
@@ -132,6 +135,7 @@ def run(options = {})
                 begin
                   # super(:listen => listen)
                   Thread.new { super() }
+                  @server_started = true # Set the server started flag
                 rescue RuntimeError => e
                   if e.message =~ /no datagram socket/ || e.message =~ /no acceptor/ # the port is in use
                     print_error "[DNS] Another process is already listening on port #{options[:listen]}"
@@ -146,6 +150,14 @@ def run(options = {})
           end
         end
 
+        def stop
+          return unless @server_started # Check if the server was started
+      
+          # Logic to stop the Async::DNS server
+          puts EventMachine.stop if EventMachine.reactor_running?
+          @server_started = false # Reset the server started flag
+        end
+
         # Entry point for processing incoming DNS requests. Attempts to find a matching rule and
         # sends back its associated response.
         #

extensions/proxy/api.rb

@@ -18,7 +18,6 @@ def self.pre_http_start(http_hook_server)
                 BeEF::Extension::Proxy::Proxy.new
               end
             end
-            print_info "HTTP Proxy: http://#{config.get('beef.extension.proxy.address')}:#{config.get('beef.extension.proxy.port')}"
           end
 
           def self.mount_handler(beef_server)

extensions/qrcode/qrcode.rb

@@ -32,11 +32,7 @@ def self.pre_http_start(_http_hook_server)
               # Retrieve the list of network interfaces from BeEF::Core::Console::Banners
               interfaces = BeEF::Core::Console::Banners.interfaces
 
-              # 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 not interfaces.nil? and not interfaces.empty? # If interfaces are available, iterate over each network interface
                 # 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)