Cleanup Msf server and add dnsruby to gemspec

Author: RageLtMan

lib/msf/core/exploit/dns/server.rb

@@ -38,7 +38,7 @@ def initialize(info = {})
     )
   end
 
-  attr_accessor :service
+  attr_accessor :service # :nodoc:
 
   #
   # Process static entries
@@ -103,10 +103,6 @@ def on_send_response(cli, data)
   # Starts the server
   #
   def start_service
-    options.validate(datastore) # This is a hack, DS values should not be Strings prior to this
-    if !datastore['DISABLE_RESOLVER'] and self.respond_to?(:setup_resolver)
-      setup_resolver
-    end
     begin
 
       comm = _determine_server_comm
@@ -116,10 +112,10 @@ def start_service
         datastore['SRVPORT'],
         datastore['DnsServerUdp'],
         datastore['DnsServerTcp'],
-        (datastore['DISABLE_RESOLVER'] ? false : @dns_resolver),
+        (use_resolver? ? setup_resolver : false),
         comm,
         {'Msf' => framework, 'MsfExploit' => self}
-      ) if self.service.nil?
+      )
 
       self.service.dispatch_request_proc = Proc.new do |cli, data|
         on_dispatch_request(cli,data)
@@ -157,8 +153,8 @@ def start_service
   def stop_service(destroy = false)
     Rex::ServiceManager.stop_service(self.service) if self.service
     if destroy
-      @dns_resolver = nil
-      self.service = nil
+      @dns_resolver = nil if @dns_resolver
+      self.service = nil if self.service
     end
   end
 

metasploit-framework.gemspec

@@ -175,4 +175,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'nessus_rest'
   # Nexpose Gem
   spec.add_runtime_dependency 'nexpose'
+  # Dnsruby Gem
+  spec.add_runtime_dependency 'dnsruby'
 end