Skip to content

Fix/dns/dot suffixed names #19012

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

Merged
adfoster-r7 merged 2 commits into from
Mar 25, 2024
Merged

Fix/dns/dot suffixed names #19012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c83554
Ignore the hosts file if it can't be loaded
zeroSteiner Mar 25, 2024
6d1d20c
Bump rex-socket to include changes from #66
zeroSteiner Mar 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ GEM
metasm
rex-core
rex-text
rex-socket (0.1.56)
rex-socket (0.1.57)
rex-core
rex-sslscan (0.1.10)
rex-core
Expand Down
2 changes: 1 addition & 1 deletion LICENSE_GEMS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ rex-powershell, 0.1.99, "New BSD"
rex-random_identifier, 0.1.11, "New BSD"
rex-registry, 0.1.5, "New BSD"
rex-rop_builder, 0.1.5, "New BSD"
rex-socket, 0.1.56, "New BSD"
rex-socket, 0.1.57, "New BSD"
rex-sslscan, 0.1.10, "New BSD"
rex-struct2, 0.1.4, "New BSD"
rex-text, 0.2.56, "New BSD"
Expand Down
9 changes: 8 additions & 1 deletion lib/rex/proto/dns/resolver.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,15 @@ def initialize(config = {})
raise ResolverArgumentError, "Option #{key} not valid"
end
end

self.static_hostnames = StaticHostnames.new(hostnames: static_hosts)
self.static_hostnames.parse_hosts_file
begin
self.static_hostnames.parse_hosts_file
Copy link
Contributor

@adfoster-r7 adfoster-r7 Mar 25, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible to ignore the individual entries that break? 👀

i.e. If an invalid entry is the first line of the /etc/hosts file, we could ignore that individual host and continue to parse the rest of the file with 127.0.0.1 localhost etc

rescue StandardError => e
@logger.error 'Failed to parse the hosts file, ignoring it'
Copy link
Contributor

@adfoster-r7 adfoster-r7 Mar 25, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like the default @logger is /dev/null:

[11] pry(#<Rex::Proto::DNS::CachedResolver>)> @config[:log_file]
=> "/dev/null"

Which in this scenario might not be useful if folk want to debug issues/report framework issues; Is it possible to wire it up to the framework logging

# if the hosts file is corrupted, just use a default instance with any specified hostnames
self.static_hostnames = StaticHostnames.new(hostnames: static_hosts)
end
end
#
# Provides current proxy setting if configured
Expand Down