luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-12 23:46:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport-1680-uri-escaping-glib-2-66' into 'glib-2-66'

Browse Source 
Backport !1680 “guri: Fix UTF-8 validation when escaping URI components” to glib-2-66

See merge request GNOME/glib!1682
This commit is contained in:
Sebastian Dröge 2020-10-07 13:29:38 +00:00
commit 4fe3389fbd
2 changed files with 57 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
glib/guri.c
View File

@ -420,8 +420,13 @@ _uri_encoder (GString *out,
while (p < end) while (p < end)
{ {
if (allow_utf8 && *p >= 0x80 && gunichar multibyte_utf8_char = 0;
g_utf8_get_char_validated ((gchar *)p, end - p) > 0)
if (allow_utf8 && *p >= 0x80)
multibyte_utf8_char = g_utf8_get_char_validated ((gchar *)p, end - p);
if (multibyte_utf8_char > 0 &&
multibyte_utf8_char != (gunichar) -1 && multibyte_utf8_char != (gunichar) -2)
{ {
gint len = g_utf8_skip [*p]; gint len = g_utf8_skip [*p];
g_string_append_len (out, (gchar *)p, len); g_string_append_len (out, (gchar *)p, len);

65
glib/tests/uri.c
View File

@ -449,22 +449,48 @@ test_uri_unescape_segment (void)
} }
static void static void
test_uri_escape (void) test_uri_escape_string (void)
{ {
gchar *s; const struct
{
/* Inputs */
const gchar *unescaped;
const gchar *reserved_chars_allowed;
gboolean allow_utf8;
/* Outputs */
const gchar *expected_escaped;
}
tests[] =
{
{ "abcdefgABCDEFG._~", NULL, FALSE, "abcdefgABCDEFG._~" },
{ ":+ \\?#", NULL, FALSE, "%3A%2B%20%5C%3F%23" },
{ "a+b:c", "+", FALSE, "a+b%3Ac" },
{ "a+b:c\303\234", "+", TRUE, "a+b%3Ac\303\234" },
/* Incomplete UTF-8 sequence: */
{ "\xfc\x3b\xd2", NULL, TRUE, "%FC%3B%D2" },
/* Invalid sequence: */
{ "\xc3\xb1\xc3\x28", NULL, TRUE, "ñ%C3%28" },
};
gsize i;
s = g_uri_escape_string ("abcdefgABCDEFG._~", NULL, FALSE); for (i = 0; i < G_N_ELEMENTS (tests); i++)
g_assert_cmpstr (s, ==, "abcdefgABCDEFG._~"); {
g_free (s); gchar *s = NULL;
s = g_uri_escape_string (":+ \\?#", NULL, FALSE);
g_assert_cmpstr (s, ==, "%3A%2B%20%5C%3F%23"); g_test_message ("Test %" G_GSIZE_FORMAT ": %s", i, tests[i].unescaped);
g_free (s);
s = g_uri_escape_string ("a+b:c", "+", FALSE); s = g_uri_escape_string (tests[i].unescaped,
g_assert_cmpstr (s, ==, "a+b%3Ac"); tests[i].reserved_chars_allowed,
g_free (s); tests[i].allow_utf8);
s = g_uri_escape_string ("a+b:c\303\234", "+", TRUE); g_assert_cmpstr (s, ==, tests[i].expected_escaped);
g_assert_cmpstr (s, ==, "a+b%3Ac\303\234"); g_free (s);
g_free (s); }
}
static void
test_uri_escape_bytes (void)
{
gchar *s = NULL;
s = g_uri_escape_bytes ((guchar*)"\0\0", 2, NULL); s = g_uri_escape_bytes ((guchar*)"\0\0", 2, NULL);
g_assert_cmpstr (s, ==, "%00%00"); g_assert_cmpstr (s, ==, "%00%00");
@ -723,6 +749,14 @@ static const UriAbsoluteTest absolute_tests[] = {
{ NULL, NULL, NULL, -1, NULL, NULL, NULL } }, { NULL, NULL, NULL, -1, NULL, NULL, NULL } },
{ "http://[192.168.0.1%25em1]/", G_URI_FLAGS_NONE, FALSE, G_URI_ERROR_BAD_HOST, { "http://[192.168.0.1%25em1]/", G_URI_FLAGS_NONE, FALSE, G_URI_ERROR_BAD_HOST,
{ NULL, NULL, NULL, -1, NULL, NULL, NULL } }, { NULL, NULL, NULL, -1, NULL, NULL, NULL } },
{ "http://[fe80::dead:beef%2em1]/", G_URI_FLAGS_PARSE_RELAXED, TRUE, 0,
{ "http", NULL, "fe80::dead:beef%2em1", -1, "/", NULL, NULL } },
{ "http://[fe80::dead:beef%2em1]/", G_URI_FLAGS_NONE, FALSE, G_URI_ERROR_BAD_HOST,
{ NULL, NULL, NULL, -1, NULL, NULL, NULL } },
{ "http://[fe80::dead:beef%25em1%00]/", G_URI_FLAGS_PARSE_RELAXED, FALSE, G_URI_ERROR_BAD_HOST,
{ NULL, NULL, NULL, -1, NULL, NULL, NULL } },
{ "http://[fe80::dead:beef%25em1%00]/", G_URI_FLAGS_NONE, FALSE, G_URI_ERROR_BAD_HOST,
{ NULL, NULL, NULL, -1, NULL, NULL, NULL } },
}; };
static void static void
@ -1688,7 +1722,8 @@ main (int argc,
g_test_add_data_func ("/uri/unescape-bytes/nul-terminated", GINT_TO_POINTER (TRUE), test_uri_unescape_bytes); g_test_add_data_func ("/uri/unescape-bytes/nul-terminated", GINT_TO_POINTER (TRUE), test_uri_unescape_bytes);
g_test_add_data_func ("/uri/unescape-bytes/length", GINT_TO_POINTER (FALSE), test_uri_unescape_bytes); g_test_add_data_func ("/uri/unescape-bytes/length", GINT_TO_POINTER (FALSE), test_uri_unescape_bytes);
g_test_add_func ("/uri/unescape-segment", test_uri_unescape_segment); g_test_add_func ("/uri/unescape-segment", test_uri_unescape_segment);
g_test_add_func ("/uri/escape", test_uri_escape); g_test_add_func ("/uri/escape-string", test_uri_escape_string);
g_test_add_func ("/uri/escape-bytes", test_uri_escape_bytes);
g_test_add_func ("/uri/scheme", test_uri_scheme); g_test_add_func ("/uri/scheme", test_uri_scheme);
g_test_add_func ("/uri/parsing/absolute", test_uri_parsing_absolute); g_test_add_func ("/uri/parsing/absolute", test_uri_parsing_absolute);
g_test_add_func ("/uri/parsing/relative", test_uri_parsing_relative); g_test_add_func ("/uri/parsing/relative", test_uri_parsing_relative);