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

HTTPHeader#add_field should allow binary [Bug #13926]

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60021 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2017-09-25 14:28:53 +00:00
parent 0c482713dd
commit 56f91c6ec5
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -76,7 +76,7 @@ module Net::HTTPHeader
@header[key.downcase] = ary
else
val = val.to_s
if /[\r\n]/.match?(val)
if /[\r\n]/n.match?(val.b)
raise ArgumentError, 'header field value cannnot include CR/LF'
end
@header[key.downcase] = [val]
@ -89,7 +89,7 @@ module Net::HTTPHeader
val.each{|x| append_field_value(ary, x)}
else
val = val.to_s
if /[\r\n]/.match?(val)
if /[\r\n]/n.match?(val.b)
raise ArgumentError, 'header field value cannnot include CR/LF'
end
ary.push val

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

@ -45,6 +45,9 @@ class HTTPHeaderTest < Test::Unit::TestCase
assert_equal 2, @c.length
assert_equal ['aaa', 'bbb', '3'], @c.get_fields('aaa')
@c['aaa'] = "aaa\xff"
assert_equal 2, @c.length
assert_raise(ArgumentError){ @c['foo'] = "a\nb" }
assert_raise(ArgumentError){ @c['foo'] = ["a\nb"] }
end
@ -73,9 +76,9 @@ class HTTPHeaderTest < Test::Unit::TestCase
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')
@c.add_field 'My-Header', ['e', ["\xff", 7]]
assert_equal "a, b, c, d, d, e, \xff, 7", @c['My-Header']
assert_equal ['a', 'b', 'c', 'd, d', 'e', "\xff", '7'], @c.get_fields('My-Header')
end
def test_get_fields