diff options
| author | Hiroshi SHIBATA <[email protected]> | 2025-02-21 18:16:28 +0900 |
|---|---|---|
| committer | git <[email protected]> | 2025-02-26 07:08:45 +0000 |
| commit | b407b6b5b2dc8071c3b1b623e4399899e851f791 (patch) | |
| tree | 549d9f6f191c66c107596a9b07f0193b927f3d7c | |
| parent | 57dcb4bb9bc44368db3a2ef908f1babc79ea5224 (diff) | |
[ruby/uri] Fix merger of URI with authority component
https://hackerone.com/reports/2957667
https://github.com/ruby/uri/commit/2789182478
Co-authored-by: Nobuyoshi Nakada <[email protected]>
| -rw-r--r-- | lib/uri/generic.rb | 19 | ||||
| -rw-r--r-- | test/uri/test_generic.rb | 7 |
2 files changed, 14 insertions, 12 deletions
diff --git a/lib/uri/generic.rb b/lib/uri/generic.rb index cd3aa23ce1..b574104ba1 100644 --- a/lib/uri/generic.rb +++ b/lib/uri/generic.rb @@ -1133,21 +1133,16 @@ module URI base.fragment=(nil) # RFC2396, Section 5.2, 4) - if !authority - base.set_path(merge_path(base.path, rel.path)) if base.path && rel.path - else - # RFC2396, Section 5.2, 4) - base.set_path(rel.path) if rel.path + if authority + base.set_userinfo(rel.userinfo) + base.set_host(rel.host) + base.set_port(rel.port || base.default_port) + base.set_path(rel.path) + elsif base.path && rel.path + base.set_path(merge_path(base.path, rel.path)) end # RFC2396, Section 5.2, 7) - if rel.userinfo - base.set_userinfo(rel.userinfo) - else - base.set_userinfo(nil) - end - base.set_host(rel.host) if rel.host - base.set_port(rel.port) if rel.port base.query = rel.query if rel.query base.fragment=(rel.fragment) if rel.fragment diff --git a/test/uri/test_generic.rb b/test/uri/test_generic.rb index 4b04998490..1d5fbc715e 100644 --- a/test/uri/test_generic.rb +++ b/test/uri/test_generic.rb @@ -278,6 +278,13 @@ class URI::TestGeneric < Test::Unit::TestCase assert_equal(u0, u1) end + def test_merge_authority + u = URI.parse('http://user:[email protected]:8080') + u0 = URI.parse('http://new.example.org/path') + u1 = u.merge('//new.example.org/path') + assert_equal(u0, u1) + end + def test_route url = URI.parse('http://hoge/a.html').route_to('http://hoge/b.html') assert_equal('b.html', url.to_s) |