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

uri: do not encode userinfo fields

Browse Source 
g_uri_build_with_user() builds a userinfo, but it shouldn't encode it
itself, but let the user flags declare what's there. Otherwise,
to_string() code paths may encode a second time.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Marc-André Lureau
2020-07-30 22:47:55 +04:00
parent a97fe4e863
commit b0f9af0e1d
2 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
glib/guri.c
View File

@@ -1634,33 +1634,19 @@ g_uri_build_with_user (GUriFlags flags,
if (user) if (user)
{ {
userinfo = g_string_new (NULL); userinfo = g_string_new (user);
if (flags & G_URI_FLAGS_ENCODED)
g_string_append (userinfo, uri->user);
else
g_string_append_uri_escaped (userinfo, uri->user, USER_ALLOWED_CHARS, TRUE);
if (password) if (password)
{ {
g_string_append_c (userinfo, ':'); g_string_append_c (userinfo, ':');
if (flags & G_URI_FLAGS_ENCODED)
g_string_append (userinfo, uri->password); g_string_append (userinfo, uri->password);
else
g_string_append_uri_escaped (userinfo, uri->password,
PASSWORD_ALLOWED_CHARS, TRUE);
} }
if (auth_params) if (auth_params)
{ {
g_string_append_c (userinfo, ';'); g_string_append_c (userinfo, ';');
if (flags & G_URI_FLAGS_ENCODED)
g_string_append (userinfo, uri->auth_params); g_string_append (userinfo, uri->auth_params);
else
g_string_append_uri_escaped (userinfo,
uri->auth_params, AUTH_PARAMS_ALLOWED_CHARS, TRUE);
} }
uri->userinfo = g_string_free (userinfo, FALSE); uri->userinfo = g_string_free (userinfo, FALSE);
} }
else
uri->userinfo = NULL;
return uri; return uri;
} }

6
glib/tests/uri.c
View File

@@ -987,6 +987,12 @@ test_uri_build (void)
g_assert_cmpstr (g_uri_get_auth_params (uri), ==, "authparams"); g_assert_cmpstr (g_uri_get_auth_params (uri), ==, "authparams");
g_uri_unref (uri); g_uri_unref (uri);
uri = g_uri_build_with_user (G_URI_FLAGS_NONE, "scheme", "user\001", "password\002",
"authparams\003", "host", 1234,
"/path", "query", "fragment");
g_assert_cmpstr (g_uri_get_userinfo (uri), ==, "user\001:password\002;authparams\003");
g_uri_unref (uri);
uri = g_uri_build_with_user (G_URI_FLAGS_ENCODED, "scheme", "user%01", "password%02", uri = g_uri_build_with_user (G_URI_FLAGS_ENCODED, "scheme", "user%01", "password%02",
"authparams%03", "host", 1234, "authparams%03", "host", 1234,
"/path", "query", "fragment"); "/path", "query", "fragment");