kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

A HTTP Header value must not contain CR or LF.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59693 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2017-08-30 17:24:05 +00:00
parent f0ae63b072
commit 427f5b5713
2 changed files with 41 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
lib/net/http/header.rb
View file

@ -42,7 +42,7 @@ module Net::HTTPHeader
@header.delete key.downcase
return val
end
@header[key.downcase] = [val]
set_field(key, val)
end
# [Ruby 1.8.3]
@ -62,12 +62,40 @@ module Net::HTTPHeader
#
def add_field(key, val)
if @header.key?(key.downcase)
@header[key.downcase].push val
append_field_value(@header[key.downcase], val)
else
set_field(key, val)
end
end
private def set_field(key, val)
case val
when Enumerable
ary = []
append_field_value(ary, val)
@header[key.downcase] = ary
else
val = val.to_str
if /[\r\n]/.match?(val)
raise ArgumentError, 'header field value cannnot include CR/LF'
end
@header[key.downcase] = [val]
end
end
private def append_field_value(ary, val)
case val
when Enumerable
val.each{|x| append_field_value(ary, x)}
else
val = val.to_s
if /[\r\n]/.match?(val)
raise ArgumentError, 'header field value cannnot include CR/LF'
end
ary.push val
end
end
# [Ruby 1.8.3]
# Returns an array of header field strings corresponding to the
# case-insensitive +key+. This method allows you to get duplicated

11
test/net/http/test_httpheader.rb
View file

@ -40,6 +40,13 @@ class HTTPHeaderTest < Test::Unit::TestCase
@c['aaA'] = 'aaa'
@c['AAa'] = 'aaa'
assert_equal 2, @c.length
@c['aaa'] = ['aaa', ['bbb', [3]]]
assert_equal 2, @c.length
assert_equal ['aaa', 'bbb', '3'], @c.get_fields('aaa')
assert_raise(ArgumentError){ @c['foo'] = "a\nb" }
assert_raise(ArgumentError){ @c['foo'] = ["a\nb"] }
end
def test_AREF
@ -65,6 +72,10 @@ class HTTPHeaderTest < Test::Unit::TestCase
@c.add_field 'My-Header', 'd, d'
assert_equal 'a, b, c, d, d', @c['My-Header']
assert_equal ['a', 'b', 'c', 'd, d'], @c.get_fields('My-Header')
assert_raise(ArgumentError){ @c.add_field 'My-Header', "d\nd" }
@c.add_field 'My-Header', ['e', ['f', 7]]
assert_equal 'a, b, c, d, d, e, f, 7', @c['My-Header']
assert_equal ['a', 'b', 'c', 'd, d', 'e', 'f', '7'], @c.get_fields('My-Header')
end
def test_get_fields