ruby-changes:14445
From: wyhaines <ko1@a...>
Date: Mon, 11 Jan 2010 00:18:54 +0900 (JST)
Subject: [ruby-changes:14445] Ruby:r26274 (ruby_1_8_6): Fix to escape logs in order to avoid escape sequence injection bug. Also inserted an old comment into ChangeLog for a change that got missed last year.
wyhaines 2010-01-11 00:18:04 +0900 (Mon, 11 Jan 2010) New Revision: 26274 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=26274 Log: Fix to escape logs in order to avoid escape sequence injection bug. Also inserted an old comment into ChangeLog for a change that got missed last year. Modified files: branches/ruby_1_8_6/ChangeLog branches/ruby_1_8_6/lib/webrick/accesslog.rb branches/ruby_1_8_6/lib/webrick/httprequest.rb branches/ruby_1_8_6/lib/webrick/httpresponse.rb branches/ruby_1_8_6/lib/webrick/httpstatus.rb branches/ruby_1_8_6/lib/webrick/httputils.rb Index: ruby_1_8_6/ChangeLog =================================================================== --- ruby_1_8_6/ChangeLog (revision 26273) +++ ruby_1_8_6/ChangeLog (revision 26274) @@ -1,6 +1,16 @@ +Sun Jan 10 8:00:00 2010 Kirk Haines <khaines@r...> + + * lib/webrick/accesslog.rb : Added escape fixes for logs to fix a log injection attack. + + * lib/webrick/httpstatus.rb : Added escape fixes for logs to fix a log injection attack. + + * lib/webrick/httprequest.rb : Added escape fixes for logs to fix a log injection attack. + + * lib/webrick/httputils.rb : Added escape fixes for logs to fix a log injection attack. + Thu Nov 19 2:44:00 2009 Kirk Haines <khaines@r...> - * gc.c: backport r24713 which adds a check for freelist exhaustion in gc_sweep; this prevents segfaults from certain tight loops. An example test case: Time.now while true + * gc.c: backport r24713 which adds a check for freelist exhaustion in gc_sweep; this prevents segfaults from certain tight loops. An example test case: Time.now while true. r25871 Fri Aug 28 12:54:00 2009 Kirk Haines <khaines@r...> @@ -70,6 +80,12 @@ * test/ostruct/test_ostruct.rb: Modified tests to fit the #inspect fix. +Thu Jul 7 12:31:58 2009 Kirk Haines <khaines@r...> + + * gc.c: Fix method scoping bug. r24030 + + * eval.c: Fix method scoping bug. r24030 + Mon Jun 8 12:46:00 2009 Kirk Haines <khaines@r...> * lib/soap/mimemessage.rb: Fixed a typo -- conent -> content Index: ruby_1_8_6/lib/webrick/httpstatus.rb =================================================================== --- ruby_1_8_6/lib/webrick/httpstatus.rb (revision 26273) +++ ruby_1_8_6/lib/webrick/httpstatus.rb (revision 26274) @@ -12,7 +12,17 @@ module HTTPStatus - class Status < StandardError; end + class Status < StandardError + def initialize(message=self.class, *rest) + super(AccessLog.escape(message), *rest) + end + class << self + attr_reader :code, :reason_phrase + end + def code() self::class::code end + def reason_phrase() self::class::reason_phrase end + alias to_i code + end class Info < Status; end class Success < Status; end class Redirect < Status; end @@ -68,6 +78,7 @@ CodeToError = {} StatusMessage.each{|code, message| + message.freeze var_name = message.gsub(/[ \-]/,'_').upcase err_name = message.gsub(/[ \-]/,'') @@ -79,18 +90,12 @@ when 500...600; parent = ServerError end - eval %- - RC_#{var_name} = #{code} - class #{err_name} < #{parent} - def self.code() RC_#{var_name} end - def self.reason_phrase() StatusMessage[code] end - def code() self::class::code end - def reason_phrase() self::class::reason_phrase end - alias to_i code - end - - - - CodeToError[code] = const_get(err_name) + const_set("RC_#{var_name}", code) + err_class = Class.new(parent) + err_class.instance_variable_set(:@code, code) + err_class.instance_variable_set(:@reason_phrase, message) + const_set(err_name, err_class) + CodeToError[code] = err_class } def reason_phrase(code) Index: ruby_1_8_6/lib/webrick/httprequest.rb =================================================================== --- ruby_1_8_6/lib/webrick/httprequest.rb (revision 26273) +++ ruby_1_8_6/lib/webrick/httprequest.rb (revision 26274) @@ -242,11 +242,7 @@ @raw_header << line end end - begin - @header = HTTPUtils::parse_header(@raw_header) - rescue => ex - raise HTTPStatus::BadRequest, ex.message - end + @header = HTTPUtils::parse_header(@raw_header.join) end def parse_uri(str, scheme="http") Index: ruby_1_8_6/lib/webrick/httpresponse.rb =================================================================== --- ruby_1_8_6/lib/webrick/httpresponse.rb (revision 26273) +++ ruby_1_8_6/lib/webrick/httpresponse.rb (revision 26274) @@ -132,7 +132,7 @@ end end - # Determin the message length (RFC2616 -- 4.4 Message Length) + # Determine the message length (RFC2616 -- 4.4 Message Length) if @status == 304 || @status == 204 || HTTPStatus::info?(@status) @header.delete('content-length') @body = "" Index: ruby_1_8_6/lib/webrick/httputils.rb =================================================================== --- ruby_1_8_6/lib/webrick/httputils.rb (revision 26273) +++ ruby_1_8_6/lib/webrick/httputils.rb (revision 26274) @@ -128,11 +128,11 @@ when /^\s+(.*?)\s*\z/om value = $1 unless field - raise "bad header '#{line.inspect}'." + raise HTTPStatus::BadRequest, "bad header '#{line}'." end header[field][-1] << " " << value else - raise "bad header '#{line.inspect}'." + raise HTTPStatus::BadRequest, "bad header '#{line}'." end } header.each{|key, values| Index: ruby_1_8_6/lib/webrick/accesslog.rb =================================================================== --- ruby_1_8_6/lib/webrick/accesslog.rb (revision 26273) +++ ruby_1_8_6/lib/webrick/accesslog.rb (revision 26274) @@ -53,15 +53,23 @@ when ?e, ?i, ?n, ?o raise AccessLogError, "parameter is required for \"#{spec}\"" unless param - params[spec][param] || "-" + param = params[spec][param] ? escape(param) : "-" when ?t params[spec].strftime(param || CLF_TIME_FORMAT) when ?% "%" else - params[spec] + escape(params[spec].to_s) end } end + + def escape(data) + if data.tainted? + data.gsub(/[[:cntrl:]\\]+/) {$&.dump[1...-1]}.untaint + else + data + end + end end end -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/