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

net/protocol.rb: fix SMTP dot stuffing

Browse source 
* net/protocol.rb (using_each_crlf_line): fix SMTP dot-stuffing
  for messages not ending with a new-line.
  [ruby-core:61441] [Bug #9627] [fix GH-616]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46060 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-05-23 12:36:30 +00:00
parent 8ab27ebbb1
commit 1fd639393f
3 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Fri May 23 21:36:28 2014 Josh Goebel <dreamer3@gmail.com>
* net/protocol.rb (using_each_crlf_line): fix SMTP dot-stuffing
for messages not ending with a new-line.
[ruby-core:61441] [Bug #9627] [fix GH-616]
Fri May 23 03:48:08 2014 Eric Wong <e@80x24.org> Fri May 23 03:48:08 2014 Eric Wong <e@80x24.org>
* gc.c (rb_free_m_tbl): mark function as static * gc.c (rb_free_m_tbl): mark function as static

8
lib/net/protocol.rb
View file

@ -267,7 +267,7 @@ module Net # :nodoc:
def write_message_0(src) def write_message_0(src)
prev = @written_bytes prev = @written_bytes
each_crlf_line(src) do |line| each_crlf_line(src) do |line|
write0 line.sub(/\A\./, '..') write0 dot_stuff(line)
end end
@written_bytes - prev @written_bytes - prev
end end
@ -308,11 +308,15 @@ module Net # :nodoc:
private private
def dot_stuff(s)
s.sub(/\A\./, '..')
end
def using_each_crlf_line def using_each_crlf_line
@wbuf = '' @wbuf = ''
yield yield
if not @wbuf.empty? # unterminated last line if not @wbuf.empty? # unterminated last line
write0 @wbuf.chomp + "\r\n" write0 dot_stuff(@wbuf.chomp) + "\r\n"
elsif @written_bytes == 0 # empty src elsif @written_bytes == 0 # empty src
write0 "\r\n" write0 "\r\n"
end end

9
test/net/protocol/test_protocol.rb
View file

@ -3,6 +3,15 @@ require "net/protocol"
require "stringio" require "stringio"
class TestProtocol < Test::Unit::TestCase class TestProtocol < Test::Unit::TestCase
def test_should_properly_dot_stuff_period_with_no_endline
bug9627 = '[ruby-core:61441] [Bug #9627]'
sio = StringIO.new("")
imio = Net::InternetMessageIO.new(sio)
email = "To: bob@aol.com\nlook, a period with no endline\n."
imio.write_message(email)
assert_equal("To: bob@aol.com\r\nlook, a period with no endline\r\n..\r\n.\r\n", sio.string, bug9627)
end
def test_each_crlf_line def test_each_crlf_line
assert_output('', '') do assert_output('', '') do
sio = StringIO.new("") sio = StringIO.new("")