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

Fix/is name underscores #66

Merged
merged 3 commits into from
Mar 25, 2024
Merged

Fix/is name underscores #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e62b8af
Add a spec for what is broken
zeroSteiner Mar 25, 2024
c43f950
Hostnames can contain spaces per RFC 2181
zeroSteiner Mar 25, 2024
9937ebb
Allow trailing dots in the domain name
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
4 changes: 2 additions & 2 deletions lib/rex/socket.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def self.create_ip(opts = {})
#

# see: https://debugpointer.com/regex/regex-for-dns-name
MATCH_DNS_NAME = /^(((?!-))(xn--)?([a-z0-9][a-z0-9\-]{0,59})?[a-z0-9]\.)*(xn--)?([a-z0-9\-]{1,61}|[a-z0-9-]{1,30}\.[a-z]{2,})$/i
MATCH_DNS_NAME = /^(((?!-))(xn--)?([a-z0-9_][a-z0-9_\-]{0,59})?[a-z0-9_]\.)*(xn--)?([a-z0-9_\-]{1,61}|[a-z0-9_-]{1,30}\.[a-z]{2,})$/i
zeroSteiner marked this conversation as resolved.
Show resolved Hide resolved

MATCH_IPV6 = /^\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$/

Expand Down Expand Up @@ -133,7 +133,7 @@ def self.support_ipv6?
#
def self.is_name?(name)
return false if name.length > 253
name =~ MATCH_DNS_NAME ? (name =~ /\s/).nil? : false
name.delete_suffix('.') =~ MATCH_DNS_NAME ? (name =~ /\s/).nil? : false
end

#
Expand Down
22 changes: 19 additions & 3 deletions spec/rex/socket_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,13 +342,29 @@
end
end

context 'with a fully qualified domain name' do
let(:try) { "www.metasploit.com" }
it "should return true" do
context 'with a name containing underscores' do
Copy link
Contributor

@adfoster-r7 adfoster-r7 Mar 25, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Not a blocker; would it make sense to rename is_name? is is_dns_name? or something similar? I intentionally didn't call it on the initial PR as I thought the distinction wasn't super important, but now I wish I had as hostname vs DNS name have very different rules apparently 😄

let(:try) { '_ldap._tcp.msflab.local' }
it 'should return true' do
expect(name).to eq true
end
end

context 'with a fully qualified domain name' do
context 'and a trailing dot' do
let(:try) { "www.metasploit.com." }
it "should return true" do
expect(name).to eq true
end
end

context 'and no trailing dot' do
let(:try) { "www.metasploit.com" }
it "should return true" do
expect(name).to eq true
end
end
end

context 'with multiple fully qualified domain names' do
context 'separated by newlines' do
let(:try) { "www.metasploit.com\nmetasploit.com" }
Expand Down