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

Merge branch 'uri-userinfo-enc' into 'master'

Browse Source 
uri: do not encode ':' and ';' from userinfo

See merge request GNOME/glib!1600
This commit is contained in:
Sebastian Dröge 2020-08-04 13:33:18 +00:00
commit 50343afb6e
2 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
glib/guri.c
View File

@ -1330,6 +1330,7 @@ g_uri_resolve_relative (const gchar *base_uri_string,
static gchar * static gchar *
g_uri_join_internal (GUriFlags flags, g_uri_join_internal (GUriFlags flags,
const gchar *scheme, const gchar *scheme,
gboolean userinfo,
const gchar *user, const gchar *user,
const gchar *password, const gchar *password,
const gchar *auth_params, const gchar *auth_params,
@ -1355,11 +1356,14 @@ g_uri_join_internal (GUriFlags flags,
g_string_append (str, user); g_string_append (str, user);
else else
{ {
/* Encode ':' and ';' regardless of whether we have a if (userinfo)
* password or auth params, since it may be parsed later g_string_append_uri_escaped (str, user, USERINFO_ALLOWED_CHARS, TRUE);
* under the assumption that it does. else
*/ /* Encode ':' and ';' regardless of whether we have a
g_string_append_uri_escaped (str, user, USER_ALLOWED_CHARS, TRUE); * password or auth params, since it may be parsed later
* under the assumption that it does.
*/
g_string_append_uri_escaped (str, user, USER_ALLOWED_CHARS, TRUE);
} }
if (password) if (password)
@ -1469,7 +1473,7 @@ g_uri_join (GUriFlags flags,
return g_uri_join_internal (flags, return g_uri_join_internal (flags,
scheme, scheme,
userinfo, NULL, NULL, TRUE, userinfo, NULL, NULL,
host, host,
port, port,
path, path,
@ -1521,7 +1525,7 @@ g_uri_join_with_user (GUriFlags flags,
return g_uri_join_internal (flags, return g_uri_join_internal (flags,
scheme, scheme,
user, password, auth_params, FALSE, user, password, auth_params,
host, host,
port, port,
path, path,
@ -1591,7 +1595,10 @@ g_uri_build (GUriFlags flags,
* @query: (nullable): the query component, or %NULL * @query: (nullable): the query component, or %NULL
* @fragment: (nullable): the fragment, or %NULL * @fragment: (nullable): the fragment, or %NULL
* *
* Creates a new #GUri from the given components according to @flags. * Creates a new #GUri from the given components according to @flags
* (%G_URI_FLAGS_HAS_PASSWORD is added unconditionally). The @flags must be
* coherent with the passed values, in particular use `%`-encoded values with
* %G_URI_FLAGS_ENCODED.
* In constrast to g_uri_build(), this allows specifying the components * In constrast to g_uri_build(), this allows specifying the components
* of the "userinfo" field separately. Note that @user must be non-%NULL * of the "userinfo" field separately. Note that @user must be non-%NULL
@ -1623,7 +1630,7 @@ g_uri_build_with_user (GUriFlags flags,
g_return_val_if_fail (path != NULL, NULL); g_return_val_if_fail (path != NULL, NULL);
uri = g_atomic_rc_box_new0 (GUri); uri = g_atomic_rc_box_new0 (GUri);
uri->flags = flags; uri->flags = flags | G_URI_FLAGS_HAS_PASSWORD;
uri->scheme = g_ascii_strdown (scheme, -1); uri->scheme = g_ascii_strdown (scheme, -1);
uri->user = g_strdup (user); uri->user = g_strdup (user);
uri->password = g_strdup (password); uri->password = g_strdup (password);
@ -1636,33 +1643,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;
} }

24
glib/tests/uri.c
View File

@ -921,27 +921,27 @@ test_uri_to_string (void)
uri = g_uri_build_with_user (G_URI_FLAGS_NONE, "scheme", "user", "pass", "auth", "host", 1234, uri = g_uri_build_with_user (G_URI_FLAGS_NONE, "scheme", "user", "pass", "auth", "host", 1234,
"/path", "query", "fragment"); "/path", "query", "fragment");
tostring = g_uri_to_string (uri); tostring = g_uri_to_string (uri);
g_assert_cmpstr (tostring, ==, "scheme://user%3Apass%3Bauth@host:1234/path?query#fragment"); g_assert_cmpstr (tostring, ==, "scheme://user:pass;auth@host:1234/path?query#fragment");
g_free (tostring); g_free (tostring);
tostring = g_uri_to_string_partial (uri, G_URI_HIDE_USERINFO); tostring = g_uri_to_string_partial (uri, G_URI_HIDE_USERINFO);
g_assert_cmpstr (tostring, ==, "scheme://host:1234/path?query#fragment"); g_assert_cmpstr (tostring, ==, "scheme://host:1234/path?query#fragment");
g_free (tostring); g_free (tostring);
tostring = g_uri_to_string_partial (uri, G_URI_HIDE_FRAGMENT); tostring = g_uri_to_string_partial (uri, G_URI_HIDE_FRAGMENT);
g_assert_cmpstr (tostring, ==, "scheme://user%3Apass%3Bauth@host:1234/path?query"); g_assert_cmpstr (tostring, ==, "scheme://user:pass;auth@host:1234/path?query");
g_free (tostring); g_free (tostring);
g_uri_unref (uri); g_uri_unref (uri);
uri = g_uri_build_with_user (G_URI_FLAGS_HAS_PASSWORD|G_URI_FLAGS_HAS_AUTH_PARAMS, uri = g_uri_build_with_user (G_URI_FLAGS_HAS_PASSWORD|G_URI_FLAGS_HAS_AUTH_PARAMS,
"scheme", "user", "pass", "auth", "host", 1234, "scheme", "us:er", "pass", "auth", "host", 1234,
"/path", "query", "fragment"); "/path", "query", "fragment");
tostring = g_uri_to_string (uri); tostring = g_uri_to_string (uri);
g_assert_cmpstr (tostring, ==, "scheme://user:pass;auth@host:1234/path?query#fragment"); g_assert_cmpstr (tostring, ==, "scheme://us%3Aer:pass;auth@host:1234/path?query#fragment");
g_free (tostring); g_free (tostring);
tostring = g_uri_to_string_partial (uri, G_URI_HIDE_PASSWORD); tostring = g_uri_to_string_partial (uri, G_URI_HIDE_PASSWORD);
g_assert_cmpstr (tostring, ==, "scheme://user;auth@host:1234/path?query#fragment"); g_assert_cmpstr (tostring, ==, "scheme://us%3Aer;auth@host:1234/path?query#fragment");
g_free (tostring); g_free (tostring);
tostring = g_uri_to_string_partial (uri, G_URI_HIDE_AUTH_PARAMS); tostring = g_uri_to_string_partial (uri, G_URI_HIDE_AUTH_PARAMS);
g_assert_cmpstr (tostring, ==, "scheme://user:pass@host:1234/path?query#fragment"); g_assert_cmpstr (tostring, ==, "scheme://us%3Aer:pass@host:1234/path?query#fragment");
g_free (tostring); g_free (tostring);
g_uri_unref (uri); g_uri_unref (uri);
} }
@ -974,7 +974,7 @@ test_uri_build (void)
"authparams", "host", 1234, "authparams", "host", 1234,
"/path", "query", "fragment"); "/path", "query", "fragment");
g_assert_cmpint (g_uri_get_flags (uri), ==, G_URI_FLAGS_NON_DNS); g_assert_cmpint (g_uri_get_flags (uri), ==, G_URI_FLAGS_NON_DNS | G_URI_FLAGS_HAS_PASSWORD);
g_assert_cmpstr (g_uri_get_scheme (uri), ==, "scheme"); g_assert_cmpstr (g_uri_get_scheme (uri), ==, "scheme");
g_assert_cmpstr (g_uri_get_userinfo (uri), ==, "user:password;authparams"); g_assert_cmpstr (g_uri_get_userinfo (uri), ==, "user:password;authparams");
g_assert_cmpstr (g_uri_get_host (uri), ==, "host"); g_assert_cmpstr (g_uri_get_host (uri), ==, "host");
@ -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");
@ -1425,6 +1431,10 @@ test_uri_join (void)
{ {
gchar *uri = NULL; gchar *uri = NULL;
uri = g_uri_join (G_URI_FLAGS_NONE, "foo", "some:user@info", "bar", -1, "", NULL, NULL);
g_assert_cmpstr (uri, ==, "foo://some:user%40info@bar");
g_free (uri);
uri = g_uri_join_with_user (G_URI_FLAGS_NONE, "scheme", "user\001", "pass\002", "authparams\003", uri = g_uri_join_with_user (G_URI_FLAGS_NONE, "scheme", "user\001", "pass\002", "authparams\003",
"host", 9876, "/path", "query", "fragment"); "host", 9876, "/path", "query", "fragment");
g_assert_cmpstr (uri, ==, "scheme://user%01:pass%02;authparams%03@host:9876/path?query#fragment"); g_assert_cmpstr (uri, ==, "scheme://user%01:pass%02;authparams%03@host:9876/path?query#fragment");