1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QNetworkCookie: allow spaces in unquoted values

Browse Source 
We should follow
http://tools.ietf.org/html/draft-ietf-httpstate-cookie-23 , which says
parse the value until reaching the next ';' or the end of the line.
Other cookie implementations allow spaces in unquoted values as well.

Reviewed-by: Martin Petersson
Task-number: QTBUG-18876
This commit is contained in:
Peter Hartmann 2011-04-27 11:48:53 +02:00
parent 8e9aa019bb
commit 863de43dca
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/network/access/qnetworkcookie.cpp
View File

@ -395,8 +395,8 @@ static QPair<QByteArray, QByteArray> nextField(const QByteArray &text, int &posi
// qdtext = <any TEXT except <">> // qdtext = <any TEXT except <">>
// quoted-pair = "\" CHAR // quoted-pair = "\" CHAR
// If its NAME=VALUE, retain the value as is // If it is NAME=VALUE, retain the value as is
// refer to ttp://bugreports.qt.nokia.com/browse/QTBUG-17746 // refer to http://bugreports.qt.nokia.com/browse/QTBUG-17746
if (isNameValue) if (isNameValue)
second += '"'; second += '"';
++i; ++i;
@ -432,7 +432,9 @@ static QPair<QByteArray, QByteArray> nextField(const QByteArray &text, int &posi
position = i; position = i;
for ( ; i < length; ++i) { for ( ; i < length; ++i) {
register char c = text.at(i); register char c = text.at(i);
if (c == ',' || c == ';' || isLWS(c)) // for name value pairs, we want to parse until reaching the next ';'
// and not break when reaching a space char
if (c == ',' || c == ';' || ((isNameValue && (c == '\n' || c == '\r')) || (!isNameValue && isLWS(c))))
break; break;
} }
@ -487,7 +489,6 @@ QByteArray QNetworkCookie::toRawForm(RawForm form) const
result += '='; result += '=';
if ((d->value.contains(';') || if ((d->value.contains(';') ||
d->value.contains(',') || d->value.contains(',') ||
d->value.contains(' ') ||
d->value.contains('"')) && d->value.contains('"')) &&
(!d->value.startsWith('"') && (!d->value.startsWith('"') &&
!d->value.endsWith('"'))) { !d->value.endsWith('"'))) {

8
tests/auto/qnetworkcookie/tst_qnetworkcookie.cpp
View File

@ -182,6 +182,14 @@ void tst_QNetworkCookie::parseSingleCookie_data()
cookie.setValue("\"\\\"a, b; c\\\"\""); cookie.setValue("\"\\\"a, b; c\\\"\"");
QTest::newRow("with-value-with-special5") << "a = \"\\\"a, b; c\\\"\"" << cookie; QTest::newRow("with-value-with-special5") << "a = \"\\\"a, b; c\\\"\"" << cookie;
cookie.setValue("b c");
QTest::newRow("with-value-with-whitespace") << "a = b c" << cookie;
cookie.setValue("\"b\"");
QTest::newRow("quoted-value") << "a = \"b\"" << cookie;
cookie.setValue("\"b c\"");
QTest::newRow("quoted-value-with-whitespace") << "a = \"b c\"" << cookie;
cookie.setValue("b"); cookie.setValue("b");
cookie.setSecure(true); cookie.setSecure(true);
QTest::newRow("secure") << "a=b;secure" << cookie; QTest::newRow("secure") << "a=b;secure" << cookie;