Changeset 2695 for lang/ruby/ssb

Timestamp:

12/07/07 07:38:52 (13 months ago)

Author:

coji

Message:

lang/ruby/ssb: remove trashes

Location:

lang/ruby/ssb/trunk

Files:

• libs/ssb.rb (modified) (4 diffs)
• libs/ssb/request.rb (modified) (4 diffs)
• test/filter_test.rb (modified) (1 diff)
• test/request_test.rb (modified) (1 diff)

lang/ruby/ssb/trunk/libs/ssb.rb

@@ -126 +126 @@
 
     def output_template(request_uri, response, term, page, source, res)
-      ssb = ''
       tpl_file = 'ssb.rhtml'
       template = open(File.join(SSB::CONFIG[:template_dir], tpl_file)).read.untaint
@@ -136 +135 @@
       end
 
-      page = SSB::Application.filter_html(page, request_uri, term, ssb, response)
+      page = SSB::Application.filter_html(page, request_uri, term, response)
 
       page = NKF::nkf('-w', page)
@@ -158 +157 @@
     end
 
-    def self.filter_html(page, request_uri, term, ssb, response)
+    def self.filter_html(page, request_uri, term, response)
       # <?xml をけす。IEのバグ対応
       page.gsub!(/<\?([^\?]+)\?>/) { |s|
@@ -173 +172 @@
               %Q! #{tag}="#{$2}"#{$3} target="_top" >!
             elsif $2.index('/') == 0
-              %Q! #{tag}="./#{ssb}?ssb_q=#{CGI.escape(('http://' + request_uri.host + ':' + request_uri.port.to_s + $2).to_s)}"#{$3} target="_top" >!
+              %Q! #{tag}="./?ssb_q=#{CGI.escape(('http://' + request_uri.host + ':' + request_uri.port.to_s + $2).to_s)}"#{$3} target="_top" >!
             else
-              %Q! #{tag}="./#{ssb}?ssb_q=#{CGI.escape((request_uri + $2).to_s)}"#{$3} target="_top" >!
+              %Q! #{tag}="./?ssb_q=#{CGI.escape((request_uri + $2).to_s)}"#{$3} target="_top" >!
             end
           when 'action'

lang/ruby/ssb/trunk/libs/ssb/request.rb

@@ -24 +24 @@
 
     def initialize(method, in_query, in_cookie)
-      case method.upcase
-      when 'POST', 'GET'
-        @method = method.upcase.dup.untaint
-      else
-        raise ArgumentError
-      end
+      @method = method
       @term = SSB::Misc.load_terminal_info(in_cookie)
       @http_proxy = ENV['HTTP_PROXY'] || ENV['http_proxy']
@@ -45 +40 @@
       uri = URI.parse(http_proxy)
       user, pass = uri.userinfo.split(/:/) if uri.userinfo
-      address = uri.host.untaint
-      port = uri.port.untaint
+      address = uri.host
+      port = uri.port
       Net::HTTP.Proxy(address, port, user, pass)
     end
@@ -61 +56 @@
       response = nil
 
-      http = http_class(@http_proxy).new(@uri.host.untaint, @uri.port.untaint)
+      http = http_class(@http_proxy).new(@uri.host, @uri.port)
       if @uri.scheme == 'https'
         http.use_ssl = true
@@ -90 +85 @@
       in_query.each do |key,value|
         value = value.to_s unless value.instance_of?(String)
-        if key == 'ssb_q'           # request URI
+        if key == 'ssb_q'       # request URI
           uri_base = value.dup.untaint
         else                    # passing parameters
-          uri_params[NKF::nkf('-s', key)] = CGI.escape(NKF::nkf('-s', value))
+          uri_params[NKF::nkf('-s', key.dup.untaint)] = CGI.escape(NKF::nkf('-s', value.dup.untaint))
         end
       end

lang/ruby/ssb/trunk/test/filter_test.rb

@@ -20 +20 @@
   test 'filter a tag' do
     assert_equal(
-        SSB::Application.filter_html("<a href='/bar'>foo</a>", URI.parse('http://example.com/foo'), Term.new(SSB::KtaiSpec::CARRIER_DOCOMO), '', ''),
+        SSB::Application.filter_html("<a href='/bar'>foo</a>", URI.parse('http://example.com/foo'), Term.new(SSB::KtaiSpec::CARRIER_DOCOMO), ''),
         %Q{<a href=\"./?ssb_q=http%3A%2F%2Fexample.com%3A80%2Fbar\" target=\"_top\" >foo</a>}
     )

lang/ruby/ssb/trunk/test/request_test.rb

@@ -63 +63 @@
   end
 
-  test 'request_uri_should_not_taintedx' do
-    assert(!@request.uri.tainted?)
+  test 'request_uri_should_not_tainted' do
+    assert(!@request.uri.to_s.tainted?)
   end