GpgFrontend/vmime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed SMTP dot stuffing at the beginning of content.

Browse Source
This commit is contained in:
Vincent Richard 2013-02-20 16:07:00 +01:00
parent e3bb8020e0
commit d3f539bf92
3 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/utility/filteredStream.cpp
View File

@ -137,7 +137,7 @@ stream::size_type dotFilteredInputStream::skip(const size_type /* count */)
// dotFilteredOutputStream
dotFilteredOutputStream::dotFilteredOutputStream(outputStream& os)
: m_stream(os), m_previousChar('\0')
: m_stream(os), m_previousChar('\0'), m_start(true)
{
}
@ -158,6 +158,17 @@ void dotFilteredOutputStream::write
const value_type* end = data + count;
const value_type* start = data;
if (m_previousChar == '.')
{
if (data[0] == '\n' || data[0] == '\r')
{
m_stream.write(".", 1); // extra <DOT>
m_stream.write(data, 1);
pos = data + 1;
}
}
// Replace "\n." with "\n.."
while ((pos = std::find(pos, end, '.')) != end)
{
@ -171,12 +182,24 @@ void dotFilteredOutputStream::write
start = pos + 1;
}
else if (pos == data && m_start) // <DOT><CR><LF> at the beginning of content
{
m_stream.write(start, pos - start);
if (pos + 1 < end && (*(pos + 1) == '\n' || *(pos + 1) == '\r'))
m_stream.write("..", 2);
else
m_stream.write(".", 1);
start = pos + 1;
}
++pos;
}
m_stream.write(start, end - start);
m_previousChar = data[count - 1];
m_start = false;
}

6
tests/utility/filteredStreamTest.cpp
View File

@ -163,6 +163,12 @@ VMIME_TEST_SUITE_BEGIN
testFilteredOutputStreamHelper<FILTER>("3", "foo\n..bar", "foo", "\n.bar");
testFilteredOutputStreamHelper<FILTER>("4", "foo\n..bar", "foo", "\n", ".bar");
testFilteredOutputStreamHelper<FILTER>("5", "foo\n..bar", "foo", "\n", ".", "bar");
testFilteredOutputStreamHelper<FILTER>("6", "..\nfoobar", ".\nfoobar");
testFilteredOutputStreamHelper<FILTER>("7", "..\r\nfoobar", ".\r\nfoobar");
testFilteredOutputStreamHelper<FILTER>("8", "..\r\nfoobar", ".\r", "\nfoobar");
testFilteredOutputStreamHelper<FILTER>("9", ".foobar", ".foobar");
testFilteredOutputStreamHelper<FILTER>("10", ".foobar", ".", "foobar");
}
void testCRLFToLFFilteredOutputStream()

3
vmime/utility/filteredStream.hpp
View File

@ -123,8 +123,9 @@ public:
private:
outputStream& m_stream;
outputStream& m_stream;
value_type m_previousChar;
bool m_start;
};