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

Handle unbracketed ipv6 addresses #538

Merged
merged 6 commits into from
Jun 22, 2024
Merged

Handle unbracketed ipv6 addresses #538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fd91c2b
Parse unbracketed ipv6 hosts with no ports
jeromedalbert May 19, 2024
246630d
Reuse existing IPv6HostWithPortParser
jeromedalbert May 19, 2024
dc4ddf5
Add failing test
jeromedalbert Jun 22, 2024
e50d22b
Revert “Reuse existing IPv6HostWithPortParser”
jeromedalbert Jun 22, 2024
1cc800b
Merge branch master into unbracketed-ipv6
jeromedalbert Jun 22, 2024
366cce5
Tweak style
jeromedalbert Jun 22, 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
18 changes: 18 additions & 0 deletions lib/sshkit/host.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
require 'ostruct'
require 'resolv'

module SSHKit

Expand Down Expand Up @@ -122,6 +123,22 @@ def attributes

end

# @private
# :nodoc:
class IPv6HostParser < SimpleHostParser
def self.suitable?(host_string)
host_string.match(Resolv::IPv6::Regex)
end

def port

end

def hostname
@host_string.match(Resolv::IPv6::Regex)[0]
end
end

class HostWithPortParser < SimpleHostParser

def self.suitable?(host_string)
Expand Down Expand Up @@ -192,6 +209,7 @@ def hostname

PARSERS = [
SimpleHostParser,
IPv6HostParser,
HostWithPortParser,
HostWithUsernameAndPortParser,
IPv6HostWithPortParser,
Expand Down
12 changes: 12 additions & 0 deletions test/unit/test_host.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ def test_host_with_port
assert_equal 'example.com', h.hostname
end

def test_custom_host_with_port
h = Host.new 'db:22'
Copy link
Member

Choose a reason for hiding this comment

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

✨ Thanks for the additional test!

assert_equal 22, h.port
assert_equal 'db', h.hostname
end

def test_host_with_username
h = Host.new '[email protected]'
assert_equal 'root', h.username
Expand All @@ -50,6 +56,12 @@ def test_host_local
assert_equal 'localhost', h.hostname
end

def test_ipv6_without_brackets
h = Host.new '1fff:0:a88:85a3::ac1f'
assert_nil h.port
assert_equal '1fff:0:a88:85a3::ac1f', h.hostname
end

def test_does_not_confuse_ipv6_hosts_with_port_specification
h = Host.new '[1fff:0:a88:85a3::ac1f]:8001'
assert_equal 8001, h.port
Expand Down