From 3286a9c39bb838ad4824e8809aa7af67aba07dea Mon Sep 17 00:00:00 2001
From: gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 10 Jan 2005 06:29:58 +0000
Subject: * lib/webrick/cgi.rb (WEBrick::CGI::Socket#request_line): should  
 escape SCRIPT_NAME and PATH_INFO before being parsed as a URI.

* lib/webrick/httputils.rb (WEBrick::HTTPUtils#escape_path): add
  new method to escape URI path component.

* lib/webrick/ssl.rb (WEBrick::Config::SSL): the default value
  of :SSLEnable is false.

* test/webrick/{test_cgi.rb,webrick.cgi}: new file.

* test/webrick/utils.rb: require "webrick/https.h".


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@7758 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/webrick/test_cgi.rb | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 test/webrick/utils.rb    |  1 +
 test/webrick/webrick.cgi | 26 ++++++++++++++++++++++++++
 3 files changed, 73 insertions(+)
 create mode 100644 test/webrick/test_cgi.rb
 create mode 100644 test/webrick/webrick.cgi

(limited to 'test/webrick')

diff --git a/test/webrick/test_cgi.rb b/test/webrick/test_cgi.rb
new file mode 100644
index 000000000..60d5da6a7
--- /dev/null
+++ b/test/webrick/test_cgi.rb
@@ -0,0 +1,46 @@
+require "webrick"
+require File.join(File.dirname(__FILE__), "utils.rb")
+require "test/unit"
+begin
+  loadpath = $:.dup
+  $:.replace($: | [File.expand_path("../ruby", File.dirname(__FILE__))])
+  require 'envutil'
+ensure
+  $:.replace(loadpath)
+end
+
+class TestWEBrickCGI < Test::Unit::TestCase
+  def test_cgi
+    accepted = started = stopped = 0
+    requested0 = requested1 = 0
+    config = {
+      :CGIInterpreter => EnvUtil.rubybin,
+      :DocumentRoot => File.dirname(__FILE__),
+    }
+    TestWEBrick.start_httpserver(config){|server, addr, port|
+      http = Net::HTTP.new(addr, port)
+      req = Net::HTTP::Get.new("/webrick.cgi")
+      http.request(req){|res| assert_equal("/webrick.cgi", res.body)}
+      req = Net::HTTP::Get.new("/webrick.cgi/path/info")
+      http.request(req){|res| assert_equal("/path/info", res.body)}
+      req = Net::HTTP::Get.new("/webrick.cgi/%3F%3F%3F?foo=bar")
+      http.request(req){|res| assert_equal("/???", res.body)}
+      req = Net::HTTP::Get.new("/webrick.cgi/%A4%DB%A4%B2/%A4%DB%A4%B2")
+      http.request(req){|res|
+        assert_equal("/\xA4\xDB\xA4\xB2/\xA4\xDB\xA4\xB2", res.body)}
+      req = Net::HTTP::Get.new("/webrick.cgi?a=1;a=2;b=x")
+      http.request(req){|res| assert_equal("a=1, a=2, b=x", res.body)}
+      req = Net::HTTP::Get.new("/webrick.cgi?a=1&a=2&b=x")
+      http.request(req){|res| assert_equal("a=1, a=2, b=x", res.body)}
+
+      req = Net::HTTP::Post.new("/webrick.cgi?a=x;a=y;b=1")
+      req["Content-Type"] = "application/x-www-form-urlencoded"
+      http.request(req, "a=1;a=2;b=x"){|res|
+        assert_equal("a=1, a=2, b=x", res.body)}
+      req = Net::HTTP::Post.new("/webrick.cgi?a=x&a=y&b=1")
+      req["Content-Type"] = "application/x-www-form-urlencoded"
+      http.request(req, "a=1&a=2&b=x"){|res|
+        assert_equal("a=1, a=2, b=x", res.body)}
+    }
+  end
+end
diff --git a/test/webrick/utils.rb b/test/webrick/utils.rb
index 50ffd759a..adb0d106e 100644
--- a/test/webrick/utils.rb
+++ b/test/webrick/utils.rb
@@ -1,4 +1,5 @@
 require "webrick"
+require "webrick/https"
 require "webrick/httpproxy"
 
 module TestWEBrick
diff --git a/test/webrick/webrick.cgi b/test/webrick/webrick.cgi
new file mode 100644
index 000000000..97e137745
--- /dev/null
+++ b/test/webrick/webrick.cgi
@@ -0,0 +1,26 @@
+#!ruby -d
+require "webrick/cgi"
+
+class TestApp < WEBrick::CGI
+  def do_GET(req, res)
+    res["content-type"] = "text/plain"
+    if p = req.path_info
+      res.body = p
+    elsif (q = req.query).size > 0
+      res.body = q.keys.sort.collect{|key|
+        q[key].list.sort.collect{|v|
+          "#{key}=#{v}"
+        }.join(", ")
+      }.join(", ")
+    else
+      res.body = req.script_name
+    end
+  end
+
+  def do_POST(req, res)
+    do_GET(req, res)
+  end
+end
+
+cgi = TestApp.new
+cgi.start
-- 
cgit