diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-09-12 16:18:03 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-09-12 16:18:03 +0000 |
commit | db2be749b470c28f1feee7d33d5774a3ed6cb36b (patch) | |
tree | bfa0734c7d1d50668866c93c942bb96e66f0daea | |
parent | c8f61740086a69ccff5af780c0fd884a15cb35cc (diff) | |
download | ruby-db2be749b470c28f1feee7d33d5774a3ed6cb36b.tar.gz |
* lib/open-uri.rb (URI::FTP#buffer_open): fix the %2F handling.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24875 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | lib/open-uri.rb | 5 | ||||
-rw-r--r-- | test/open-uri/test_open-uri.rb | 59 |
3 files changed, 66 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Sun Sep 13 01:15:49 2009 Tanaka Akira <akr@fsij.org> + + * lib/open-uri.rb (URI::FTP#buffer_open): fix the %2F handling. + Sun Sep 13 00:46:39 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * vm_method.c (CALL_METHOD_HOOK): refined with macro. diff --git a/lib/open-uri.rb b/lib/open-uri.rb index 4daec25c01..b426455e27 100644 --- a/lib/open-uri.rb +++ b/lib/open-uri.rb @@ -778,8 +778,9 @@ module URI end require 'net/ftp' - directories = self.path.split(%r{/}, -1) - directories.shift if directories[0] == '' # strip a field before leading slash + path = self.path + path = path.sub(%r{\A/}, '%2F') # re-encode the beginning slash because uri library decodes it. + directories = path.split(%r{/}, -1) directories.each {|d| d.gsub!(/%([0-9A-Fa-f][0-9A-Fa-f])/) { [$1].pack("H2") } } diff --git a/test/open-uri/test_open-uri.rb b/test/open-uri/test_open-uri.rb index 27e4e4c604..4a4514063f 100644 --- a/test/open-uri/test_open-uri.rb +++ b/test/open-uri/test_open-uri.rb @@ -446,6 +446,15 @@ class TestOpenURI < Test::Unit::TestCase } end + def test_ftp_invalid_request + assert_raise(ArgumentError) { URI("ftp://127.0.0.1/").read } + assert_raise(ArgumentError) { URI("ftp://127.0.0.1/a%0Db").read } + assert_raise(ArgumentError) { URI("ftp://127.0.0.1/a%0Ab").read } + assert_raise(ArgumentError) { URI("ftp://127.0.0.1/a%0Db/f").read } + assert_raise(ArgumentError) { URI("ftp://127.0.0.1/a%0Ab/f").read } + assert_raise(URI::InvalidComponentError) { URI("ftp://127.0.0.1/d/f;type=x") } + end + def test_ftp TCPServer.open("127.0.0.1", 0) {|serv| _, port, _, host = serv.addr @@ -487,6 +496,56 @@ class TestOpenURI < Test::Unit::TestCase } end + def test_ftp_ascii + TCPServer.open("127.0.0.1", 0) {|serv| + _, port, _, host = serv.addr + th = Thread.new { + s = serv.accept + begin + content = "content" + s.print "220 Test FTP Server\r\n" + assert_equal("USER anonymous\r\n", s.gets); s.print "331 name ok\r\n" + assert_match(/\APASS .*\r\n/, s.gets); s.print "230 logged in\r\n" + assert_equal("TYPE I\r\n", s.gets); s.print "200 type set to I\r\n" + assert_equal("CWD /foo\r\n", s.gets); s.print "250 CWD successful\r\n" + assert_equal("TYPE A\r\n", s.gets); s.print "200 type set to A\r\n" + assert_equal("SIZE bar\r\n", s.gets); s.print "213 #{content.bytesize}\r\n" + assert_equal("PASV\r\n", s.gets) + TCPServer.open("127.0.0.1", 0) {|data_serv| + _, data_serv_port, _, data_serv_host = data_serv.addr + hi = data_serv_port >> 8 + lo = data_serv_port & 0xff + s.print "227 Entering Passive Mode (127,0,0,1,#{hi},#{lo}).\r\n" + assert_equal("RETR bar\r\n", s.gets); s.print "150 file okay\r\n" + data_sock = data_serv.accept + begin + data_sock << content + ensure + data_sock.close + end + s.print "226 transfer complete\r\n" + assert_nil(s.gets) + } + ensure + s.close if s + end + } + begin + length = [] + progress = [] + content = URI("ftp://#{host}:#{port}/%2Ffoo/b%61r;type=a").read( + :content_length_proc => lambda {|n| length << n }, + :progress_proc => lambda {|n| progress << n }) + assert_equal("content", content) + assert_equal([7], length) + assert_equal(7, progress.inject(&:+)) + ensure + Thread.kill(th) + th.join + end + } + end + def test_ftp_over_http_proxy TCPServer.open("127.0.0.1", 0) {|proxy_serv| proxy_port = proxy_serv.addr[1] |