From aa57e68b06852f69677a9c5fbf6c7937d18b77e2 Mon Sep 17 00:00:00 2001 From: gotoyuzo Date: Sun, 30 Oct 2005 20:40:05 +0000 Subject: [PATCH] * lib/webrick/httpservlet/cgihandler.rb (WEBrick::HTTPServlet::CGIHandler#do_GET): the value of Set-Cookie: header field should be splited into each cookie. [ruby-Bugs:2199] * lib/webrick/cookie.rb (WEBrick::Cookie.parse_set_cookie): new method to parse the value of Set-Cookie: header field. * test/webrick/test_cookie.rb, test/webrick/test_cgi.rb, test/webrick/webrick.cgi: add some test for cookie. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9484 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 12 ++++++++++++ lib/webrick/cookie.rb | 24 ++++++++++++++++++++++++ lib/webrick/httpservlet/cgihandler.rb | 6 ++++++ test/webrick/test_cgi.rb | 22 ++++++++++++++++++++++ test/webrick/test_cookie.rb | 17 +++++++++++++++++ test/webrick/webrick.cgi | 6 ++++++ 6 files changed, 87 insertions(+) diff --git a/ChangeLog b/ChangeLog index 28571f7341..bb9e40f11f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Mon Oct 31 05:38:26 2005 GOTOU Yuuzou + + * lib/webrick/httpservlet/cgihandler.rb + (WEBrick::HTTPServlet::CGIHandler#do_GET): the value of Set-Cookie: + header field should be splited into each cookie. [ruby-Bugs:2199] + + * lib/webrick/cookie.rb (WEBrick::Cookie.parse_set_cookie): new method + to parse the value of Set-Cookie: header field. + + * test/webrick/test_cookie.rb, test/webrick/test_cgi.rb, + test/webrick/webrick.cgi: add some test for cookie. + Mon Oct 31 02:31:41 2005 Hirokazu Yamamoto * test/ruby/test_float.rb (test_precision): test by assert_in_delta. diff --git a/lib/webrick/cookie.rb b/lib/webrick/cookie.rb index 4785b2bb33..b9663dc791 100644 --- a/lib/webrick/cookie.rb +++ b/lib/webrick/cookie.rb @@ -76,5 +76,29 @@ module WEBrick end end + def self.parse_set_cookie(str) + cookie_elem = str.split(/;/) + first_elem = cookie_elem.shift + first_elem.strip! + key, value = first_elem.split(/=/, 2) + cookie = new(key, HTTPUtils.dequote(value)) + cookie_elem.each{|pair| + pair.strip! + key, value = pair.split(/=/, 2) + if value + value = HTTPUtils.dequote(value.strip) + end + case key.downcase + when "domain" then cookie.domain = value + when "path" then cookie.path = value + when "expires" then cookie.expires = value + when "max-age" then cookie.max_age = Integer(value) + when "comment" then cookie.comment = value + when "version" then cookie.version = Integer(value) + when "secure" then cookie.secure = true + end + } + return cookie + end end end diff --git a/lib/webrick/httpservlet/cgihandler.rb b/lib/webrick/httpservlet/cgihandler.rb index 9a300cf72b..40247366f7 100644 --- a/lib/webrick/httpservlet/cgihandler.rb +++ b/lib/webrick/httpservlet/cgihandler.rb @@ -85,6 +85,12 @@ module WEBrick res.status = $1.to_i header.delete('status') end + if header.has_key?('set-cookie') + header['set-cookie'].each{|k| + res.cookies << Cookie.parse_set_cookie(k) + } + header.delete('set-cookie') + end header.each{|key, val| res[key] = val.join(", ") } rescue => ex raise HTTPStatus::InternalServerError, ex.message diff --git a/test/webrick/test_cgi.rb b/test/webrick/test_cgi.rb index b3e13ba2c5..7e3f4ee5f0 100644 --- a/test/webrick/test_cgi.rb +++ b/test/webrick/test_cgi.rb @@ -51,6 +51,28 @@ class TestWEBrickCGI < Test::Unit::TestCase assert_match(%r{/$}, ary[0]) assert_match(%r{/webrick.cgi$}, ary[1]) } + + req = Net::HTTP::Get.new("/webrick.cgi") + req["Cookie"] = "CUSTOMER=WILE_E_COYOTE; PART_NUMBER=ROCKET_LAUNCHER_0001" + http.request(req){|res| + assert_equal( + "CUSTOMER=WILE_E_COYOTE\nPART_NUMBER=ROCKET_LAUNCHER_0001\n", + res.body) + } + + req = Net::HTTP::Get.new("/webrick.cgi") + cookie = %{$Version="1"; } + cookie << %{Customer="WILE_E_COYOTE"; $Path="/acme"; } + cookie << %{Part_Number="Rocket_Launcher_0001"; $Path="/acme"; } + cookie << %{Shipping="FedEx"; $Path="/acme"} + req["Cookie"] = cookie + http.request(req){|res| + assert_equal("Customer=WILE_E_COYOTE, Shipping=FedEx", + res["Set-Cookie"]) + assert_equal("Customer=WILE_E_COYOTE\n" + + "Part_Number=Rocket_Launcher_0001\n" + + "Shipping=FedEx\n", res.body) + } } end end diff --git a/test/webrick/test_cookie.rb b/test/webrick/test_cookie.rb index 8826d0b81f..f58b6b145d 100644 --- a/test/webrick/test_cookie.rb +++ b/test/webrick/test_cookie.rb @@ -53,4 +53,21 @@ class TestWEBrickCookie < Test::Unit::TestCase assert_equal("__div__session", cookies[1].name) assert_equal("9865ecfd514be7f7", cookies[1].value) end + + def test_parse_set_cookie + data = %(Customer="WILE_E_COYOTE"; Version="1"; Path="/acme") + cookie = WEBrick::Cookie.parse_set_cookie(data) + assert_equal("Customer", cookie.name) + assert_equal("WILE_E_COYOTE", cookie.value) + assert_equal(1, cookie.version) + assert_equal("/acme", cookie.path) + + data = %(Shipping="FedEx"; Version="1"; Path="/acme"; Secure) + cookie = WEBrick::Cookie.parse_set_cookie(data) + assert_equal("Shipping", cookie.name) + assert_equal("FedEx", cookie.value) + assert_equal(1, cookie.version) + assert_equal("/acme", cookie.path) + assert_equal(true, cookie.secure) + end end diff --git a/test/webrick/webrick.cgi b/test/webrick/webrick.cgi index 9edbb13847..73ba729407 100644 --- a/test/webrick/webrick.cgi +++ b/test/webrick/webrick.cgi @@ -16,6 +16,12 @@ class TestApp < WEBrick::CGI res.body = "" res.body << req.request_uri.to_s << "\n" res.body << req.script_name + elsif !req.cookies.empty? + res.body = req.cookies.inject(""){|result, cookie| + result << "%s=%s\n" % [cookie.name, cookie.value] + } + res.cookies << WEBrick::Cookie.new("Customer", "WILE_E_COYOTE") + res.cookies << WEBrick::Cookie.new("Shipping", "FedEx") else res.body = req.script_name end