Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ensure DNS command config loading does not crash msfconsole #18760

Merged
merged 1 commit into from Jan 29, 2024
Merged

Ensure DNS command config loading does not crash msfconsole #18760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 10 additions & 10 deletions lib/msf/ui/console/driver.rb
View file
Open in desktop
Expand Up @@ -80,16 +80,16 @@ def initialize(prompt = DefaultPrompt, prompt_char = DefaultPromptChar, opts = {

# Initialize attributes

dns_resolver = Rex::Proto::DNS::CachedResolver.new
dns_resolver.extend(Rex::Proto::DNS::CustomNameserverProvider)
dns_resolver.load_config

# Defer loading of modules until paths from opts can be added below
framework_create_options = opts.merge({
'DeferModuleLoads' => true,
'CustomDnsResolver' => dns_resolver
}
)
framework_create_options = opts.merge({ 'DeferModuleLoads' => true })

if Msf::FeatureManager.instance.enabled?(Msf::FeatureManager::DNS_FEATURE)
dns_resolver = Rex::Proto::DNS::CachedResolver.new
dns_resolver.extend(Rex::Proto::DNS::CustomNameserverProvider)
dns_resolver.load_config

# Defer loading of modules until paths from opts can be added below
framework_create_options = framework_create_options.merge({ 'CustomDnsResolver' => dns_resolver })
end
self.framework = opts['Framework'] || Msf::Simple::Framework.create(framework_create_options)

if self.framework.datastore['Prompt']
Expand Down
24 changes: 14 additions & 10 deletions lib/net/dns/resolver.rb
View file
Open in desktop
Expand Up @@ -1084,17 +1084,21 @@ def parse_config_file
self.domain = arr[0]
self.nameservers = arr[1]
else
IO.foreach(@config[:config_file]) do |line|
line.gsub!(/\s*[;#].*/,"")
next unless line =~ /\S/
case line
when /^\s*domain\s+(\S+)/
self.domain = $1
when /^\s*search\s+(.*)/
self.searchlist = $1.split(" ")
when /^\s*nameserver\s+(.*)/
self.nameservers += $1.split(" ")
begin
IO.foreach(@config[:config_file]) do |line|
line.gsub!(/\s*[;#].*/,"")
next unless line =~ /\S/
case line
when /^\s*domain\s+(\S+)/
self.domain = $1
when /^\s*search\s+(.*)/
self.searchlist = $1.split(" ")
when /^\s*nameserver\s+(.*)/
self.nameservers += $1.split(" ")
end
end
rescue => e
@logger.error(e)
end
end
end
Expand Down