From f5de5eb7c090023df39256a9983f75fc87403194 Mon Sep 17 00:00:00 2001
From: Haoxi Tan <haoxi.tan@gmail.com>
Date: Fri, 10 Jan 2020 09:43:45 +1000
Subject: [PATCH] updated dns extension to use async-dns instead of old rubydns

---
 Gemfile                     |  2 +-
 extensions/dns/dns.rb       | 34 +++++++++++++++++++++-------------
 extensions/dns/extension.rb |  3 ++-
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/Gemfile b/Gemfile
index 35aed970b..9672d0f72 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,7 +52,7 @@ end
 
 # DNS extension
 group :ext_dns do
-  gem 'rubydns', '~> 0.7.3'
+  gem 'async-dns'
 end
 
 # QRcode extension
diff --git a/extensions/dns/dns.rb b/extensions/dns/dns.rb
index efd723f89..368c43099 100644
--- a/extensions/dns/dns.rb
+++ b/extensions/dns/dns.rb
@@ -11,7 +11,7 @@ module BeEF
       # using a rule-based system. A list of user-defined rules is used to match against incoming
       # DNS requests. These rules generate a response that is either a resource record or a
       # failure code.
-      class Server < RubyDNS::Server
+      class Server < Async::DNS::Server
 
         include Singleton
 
@@ -127,26 +127,31 @@ module BeEF
             Thread.new do
               EventMachine.next_tick do
                 upstream = options[:upstream] || nil
+
                 listen = options[:listen] || nil
+                # listen is called enpoints in Async::DNS
+                @endpoints = listen
 
                 if upstream
-                  resolver = RubyDNS::Resolver.new(upstream)
+                  resolver = Async::DNS::Resolver.new(upstream)
                   @otherwise = Proc.new { |t| t.passthrough!(resolver) }
                 end
 
                 begin
-                  super(:listen => listen)
-                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]}"
-                    print_error "Exiting..."
-                    exit 127
-                  else
-                    raise
+                  # super(:listen => listen)
+                  Thread.new { super() }
+                  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]}"
+                      print_error "Exiting..."
+                      exit 127
+                    else
+                      raise
+                    end
                   end
-                end
 
-              end
+
+                end
             end
           end
         end
@@ -159,7 +164,10 @@ module BeEF
         # @param transaction [RubyDNS::Transaction] internal RubyDNS class detailing DNS question/answer
         def process(name, resource, transaction)
           @lock.synchronize do
-	        print_debug "Received DNS request (name: #{name} type: #{format_resource(resource)})"
+
+            resource = resource.to_s
+
+	          print_debug "Received DNS request (name: #{name} type: #{format_resource(resource)})"
 
             # no need to parse AAAA resources when data is extruded from client. Also we check if the FQDN starts with the 0xb3 string.
             # this 0xb3 is convenient to clearly separate DNS requests used to extrude data from normal DNS requests than should be resolved by the DNS server.
diff --git a/extensions/dns/extension.rb b/extensions/dns/extension.rb
index 32adef8dd..ab6607ad3 100644
--- a/extensions/dns/extension.rb
+++ b/extensions/dns/extension.rb
@@ -3,7 +3,8 @@
 # Browser Exploitation Framework (BeEF) - http://beefproject.com
 # See the file 'doc/COPYING' for copying permission
 #
-require 'rubydns'
+require 'async/dns'
+
 
 module BeEF
   module Extension