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

Fixed encoding of reserved/unsafe chars.

Browse Source
This commit is contained in:
Vincent Richard 2006-01-31 19:09:43 +00:00
parent 1539754d53
commit 64235edb41
2 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/utility/urlUtils.cpp
View File

@ -27,6 +27,10 @@ namespace utility {
const string urlUtils::encode(const string& s)
{
static const string RESERVED_CHARS =
/* reserved */ "$&+,/:;=?@"
/* unsafe */ "<>#%{}[]|\\^\"~`";
string result;
result.reserve(s.length());
@ -35,8 +39,8 @@ const string urlUtils::encode(const string& s)
const char_t c = *it;
if (parserHelpers::isPrint(c) && !parserHelpers::isSpace(c) &&
c != '%' && c != '=' && c != '?' && c != '&' &&
c != '@' && c != '/' && c != ':')
static_cast <unsigned char>(c) <= 127 &&
RESERVED_CHARS.find(c) == string::npos)
{
result += c;
}

35
tests/utility/urlTest.cpp
View File

@ -42,6 +42,8 @@ VMIME_TEST_SUITE_BEGIN
VMIME_TEST(testGenerate)
VMIME_TEST(testUtilsEncode)
VMIME_TEST(testUtilsDecode)
VMIME_TEST(testUtilsEncodeReservedChars)
VMIME_TEST(testUtilsEncodeUnsafeChars)
VMIME_TEST_LIST_END
@ -251,5 +253,38 @@ VMIME_TEST_SUITE_BEGIN
}
void testUtilsEncodeReservedChars()
{
VASSERT_EQ("1", "%24", vmime::utility::urlUtils::encode("$"));
VASSERT_EQ("2", "%26", vmime::utility::urlUtils::encode("&"));
VASSERT_EQ("3", "%2B", vmime::utility::urlUtils::encode("+"));
VASSERT_EQ("4", "%2C", vmime::utility::urlUtils::encode(","));
VASSERT_EQ("5", "%2F", vmime::utility::urlUtils::encode("/"));
VASSERT_EQ("6", "%3A", vmime::utility::urlUtils::encode(":"));
VASSERT_EQ("7", "%3B", vmime::utility::urlUtils::encode(";"));
VASSERT_EQ("8", "%3D", vmime::utility::urlUtils::encode("="));
VASSERT_EQ("9", "%3F", vmime::utility::urlUtils::encode("?"));
VASSERT_EQ("10", "%40", vmime::utility::urlUtils::encode("@"));
}
void testUtilsEncodeUnsafeChars()
{
VASSERT_EQ("1", "%20", vmime::utility::urlUtils::encode(" "));
VASSERT_EQ("2", "%22", vmime::utility::urlUtils::encode("\""));
VASSERT_EQ("3", "%3C", vmime::utility::urlUtils::encode("<"));
VASSERT_EQ("4", "%3E", vmime::utility::urlUtils::encode(">"));
VASSERT_EQ("5", "%23", vmime::utility::urlUtils::encode("#"));
VASSERT_EQ("6", "%25", vmime::utility::urlUtils::encode("%"));
VASSERT_EQ("7", "%7B", vmime::utility::urlUtils::encode("{"));
VASSERT_EQ("8", "%7D", vmime::utility::urlUtils::encode("}"));
VASSERT_EQ("9", "%7C", vmime::utility::urlUtils::encode("|"));
VASSERT_EQ("10", "%5C", vmime::utility::urlUtils::encode("\\"));
VASSERT_EQ("11", "%5E", vmime::utility::urlUtils::encode("^"));
VASSERT_EQ("12", "%7E", vmime::utility::urlUtils::encode("~"));
VASSERT_EQ("13", "%5B", vmime::utility::urlUtils::encode("["));
VASSERT_EQ("14", "%5D", vmime::utility::urlUtils::encode("]"));
VASSERT_EQ("15", "%60", vmime::utility::urlUtils::encode("`"));
}
VMIME_TEST_SUITE_END