Clearer dns feature results

Author: smashery

lib/msf/ui/console/command_dispatcher/dns.rb

@@ -209,10 +209,15 @@ def add_dns(*args)
       comm_obj = driver.framework.sessions[comm_int]
     end
 
+    rules.each do |rule|
+      print_warning("DNS rule #{rule} does not contain wildcards, so will not match subdomains") unless rule.include?('*')
+    end
+
     # Split each DNS server entry up into a separate entry
     servers.each do |server|
       driver.framework.dns_resolver.add_nameserver(rules, server, comm_obj)
     end
+    print_good("DNS #{servers.length > 1 ? 'entries' : 'entry'} added")
   end
 
   #
@@ -228,26 +233,33 @@ def remove_dns(*args)
       end
     end
 
-    driver.framework.dns_resolver.remove_ids(remove_ids)
+    removed = driver.framework.dns_resolver.remove_ids(remove_ids)
+    difference = remove_ids.difference(removed.map { |entry| entry[:id] })
+    print_warning("Some entries were not removed: #{difference.join(', ')}") unless difference.empty?
+    if removed.length > 0
+      print_good("#{removed.length} DNS #{removed.length > 1 ? 'entries' : 'entry'} removed") 
+      print_dns_set('Deleted entries', ['ID', 'Rules(s)', 'DNS Server', 'Commm channel'], removed.map {|hash| [hash[:id], hash[:wildcard_rules].join(','), hash[:dns_server], prettify_comm(hash[:comm], hash[:dns_server])]})
+    end
   end
 
   #
   # Delete all user-configured DNS settings
   #
   def purge_dns
     driver.framework.dns_resolver.purge
+    print_good('DNS entries purged')
   end
 
   #
   # Display the user-configured DNS settings
   #
   def print_dns
     results = driver.framework.dns_resolver.nameserver_entries
-    columns = ['ID','Rule(s)', 'DNS Server(s)', 'Comm channel']
+    columns = ['ID','Rule(s)', 'DNS Server', 'Comm channel']
     print_dns_set('Custom nameserver rules', columns, results[0].map {|hash| [hash[:id], hash[:wildcard_rules].join(','), hash[:dns_server], prettify_comm(hash[:comm], hash[:dns_server])]})
 
     # Default nameservers don't include a rule
-    columns = ['ID', 'DNS Server(s)', 'Comm channel']
+    columns = ['ID', 'DNS Server', 'Comm channel']
     print_dns_set('Default nameservers', columns, results[1].map {|hash| [hash[:id], hash[:dns_server], prettify_comm(hash[:comm], hash[:dns_server])]})
   end
 

lib/rex/proto/dns/custom_nameserver_provider.rb

@@ -82,7 +82,7 @@ def load_config
           with_rules << entry
         end
 
-        next_id = [id, next_id].max
+        next_id = [id + 1, next_id].max
       end
 
       # Now that config has successfully read, update the global values
@@ -118,11 +118,23 @@ def add_nameserver(wildcard_rules, dns_server, comm)
     #
     # Remove entries with the given IDs
     # Ignore entries that are not found
+    # @param [Array<Integer>] The IDs to removed
+    # @return [Array<Hash>] The removed entries
+    #
     def remove_ids(ids)
+      removed= []
       ids.each do |id|
-        self.entries_with_rules.delete_if {|entry| entry[:id] == id}
-        self.entries_without_rules.delete_if {|entry| entry[:id] == id}
+        removed_with, remaining_with = self.entries_with_rules.partition {|entry| entry[:id] == id}
+        self.entries_with_rules.replace(remaining_with)
+
+        removed_without, remaining_without = self.entries_without_rules.partition {|entry| entry[:id] == id}
+        self.entries_without_rules.replace(remaining_without)
+
+        removed.concat(removed_with)
+        removed.concat(removed_without)
       end
+
+      removed
     end
 
     #