diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2020-12-10 17:34:10 +0100 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2020-12-10 17:34:10 +0100 |
| commit | 97b0beca9becb0513111801ba3380f29e44383b2 (patch) | |
| tree | 9399ec6763270cf27292aa35f8a31490b32d21de /tests | |
| parent | ff2cb9f8a3a3ba01c9881ee1b196c9397c91ee6d (diff) | |
| download | libquotient-97b0beca9becb0513111801ba3380f29e44383b2.tar.gz libquotient-97b0beca9becb0513111801ba3380f29e44383b2.zip | |
Uri: fix a few cases of insufficient escaping
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/quotest.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/tests/quotest.cpp b/tests/quotest.cpp index 44a17baf..19d5eec0 100644 --- a/tests/quotest.cpp +++ b/tests/quotest.cpp @@ -730,14 +730,19 @@ TEST_IMPL(visitResources) "matrix:room/" + roomAlias.mid(1) + "/event/" + eventId.mid(1), "https://matrix.to/#/" + roomId + '/' + eventId }; - // The following URIs are not supposed to be actually joined (and even - // exist, as yet) - only to be syntactically correct + // Check that reserved characters are correctly processed. static const auto& joinRoomAlias = - QStringLiteral("unjoined:example.org"); // # will be added below + QStringLiteral("##/?.@\"unjoined:example.org"); + static const auto& encodedRoomAliasNoSigil = + QUrl::toPercentEncoding(joinRoomAlias.mid(1), ":"); static const QString joinQuery { "?action=join" }; + // These URIs are not supposed to be actually joined (and even exist, + // as yet) - only to be syntactically correct static const QStringList joinByAliasUris { - "matrix:room/" + joinRoomAlias + joinQuery, - "https://matrix.to/#/%23"/*`#`*/ + joinRoomAlias + joinQuery + Uri(joinRoomAlias.toUtf8(), {}, joinQuery.mid(1)).toDisplayString(), + "matrix:room/" + encodedRoomAliasNoSigil + joinQuery, + "https://matrix.to/#/%23"/*`#`*/ + encodedRoomAliasNoSigil + joinQuery, + "https://matrix.to/#/%23" + joinRoomAlias.mid(1) /* unencoded */ + joinQuery }; static const auto& joinRoomId = QStringLiteral("!anyid:example.org"); static const QStringList viaServers { "matrix.org", "example.org" }; @@ -758,7 +763,7 @@ TEST_IMPL(visitResources) || testResourceResolver(eventUris, &UriDispatcher::roomAction, room(), { eventId }) || testResourceResolver(joinByAliasUris, &UriDispatcher::joinAction, - connection(), { '#' + joinRoomAlias }) + connection(), { joinRoomAlias }) || testResourceResolver(joinByIdUris, &UriDispatcher::joinAction, connection(), { joinRoomId, viaServers })) return true; |