luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-04 02:06:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'uri-tweaks' into 'master'

Browse Source 
Various GUri code, documentation and API fixes

Closes #2149

See merge request GNOME/glib!1610
This commit is contained in:
Philip Withnall 2020-08-07 14:14:29 +00:00
commit e30fc2e116
7 changed files with 475 additions and 299 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuzzing/fuzz_uri_parse.c
View File

@ -31,7 +31,7 @@ LLVMFuzzerTestOneInput (const unsigned char *data, size_t size)
/* ignore @size (g_uri_parse() doesn’t support it); ensure @data is nul-terminated */
nul_terminated_data = (unsigned char *) g_strndup ((const gchar *) data, size);
test_with_flags ((const gchar *) nul_terminated_data, G_URI_FLAGS_NONE);
test_with_flags ((const gchar *) nul_terminated_data, G_URI_FLAGS_PARSE_STRICT);
test_with_flags ((const gchar *) nul_terminated_data, G_URI_FLAGS_PARSE_RELAXED);
g_free (nul_terminated_data);
return 0;

2
gio/gnetworkaddress.c
View File

@ -546,7 +546,7 @@ g_network_address_parse_uri (const gchar *uri,
gchar *hostname = NULL;
gint port;
if (!g_uri_split_network (uri, G_URI_FLAGS_PARSE_STRICT,
if (!g_uri_split_network (uri, G_URI_FLAGS_NONE,
&scheme, &hostname, &port, NULL))
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,

4
gio/gproxyresolver.c
View File

@ -148,7 +148,7 @@ g_proxy_resolver_lookup (GProxyResolver *resolver,
g_return_val_if_fail (G_IS_PROXY_RESOLVER (resolver), NULL);
g_return_val_if_fail (uri != NULL, NULL);
if (!g_uri_is_valid (uri, G_URI_FLAGS_PARSE_STRICT, NULL))
if (!g_uri_is_valid (uri, G_URI_FLAGS_NONE, NULL))
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
"Invalid URI ‘%s’", uri);
@ -186,7 +186,7 @@ g_proxy_resolver_lookup_async (GProxyResolver *resolver,
g_return_if_fail (G_IS_PROXY_RESOLVER (resolver));
g_return_if_fail (uri != NULL);
if (!g_uri_is_valid (uri, G_URI_FLAGS_PARSE_STRICT, NULL))
if (!g_uri_is_valid (uri, G_URI_FLAGS_NONE, NULL))
{
g_set_error (&error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
"Invalid URI ‘%s’", uri);

2
gio/gsimpleproxyresolver.c
View File

@ -329,7 +329,7 @@ g_simple_proxy_resolver_lookup (GProxyResolver *proxy_resolver,
gchar *host = NULL;
gint port;
if (g_uri_split_network (uri, G_URI_FLAGS_PARSE_STRICT, NULL,
if (g_uri_split_network (uri, G_URI_FLAGS_NONE, NULL,
&host, &port, NULL) &&
ignore_host (resolver, host, port > 0 ? port : 0))
proxy = "direct://";

504
glib/guri.c
View File

File diff suppressed because it is too large Load Diff

72
glib/guri.h
View File

@ -37,15 +37,19 @@ void g_uri_unref (GUri *uri);
/**
* GUriFlags:
* @G_URI_FLAGS_PARSE_STRICT: Parse the URI strictly according to the RFC
* 3986 grammar, rather than fixing up or ignoring common mistakes.
* @G_URI_FLAGS_NONE: No flags set.
* @G_URI_FLAGS_PARSE_RELAXED: Parse the URI more relaxedly than the
* [RFC 3986](https://tools.ietf.org/html/rfc3986) grammar specifies,
* fixing up or ignoring common mistakes in URIs coming from external
* sources. This is also needed for some obscure URI schemes where `;`
* separates the host from the path. Don’t use this flag unless you need to.
* @G_URI_FLAGS_HAS_PASSWORD: The userinfo field may contain a password,
* which will be separated from the username by ':'.
* which will be separated from the username by `:`.
* @G_URI_FLAGS_HAS_AUTH_PARAMS: The userinfo may contain additional
* authentication-related parameters, which will be separated from
* the username and/or password by ';'.
* the username and/or password by `;`.
* @G_URI_FLAGS_NON_DNS: The host component should not be assumed to be a
* DNS hostname or IP address. (Eg, for `smb` URIs with NetBIOS
* DNS hostname or IP address (for example, for `smb` URIs with NetBIOS
* hostnames).
* @G_URI_FLAGS_ENCODED: When parsing a URI, this indicates that `%`-encoded
* characters in the userinfo, path, query, and fragment fields
@ -58,7 +62,6 @@ void g_uri_unref (GUri *uri);
* @G_URI_FLAGS_ENCODED_PATH: Same as %G_URI_FLAGS_ENCODED, for the path only.
* @G_URI_FLAGS_ENCODED_FRAGMENT: Same as %G_URI_FLAGS_ENCODED, for the
* fragment only.
* @G_URI_FLAGS_NONE: No flags set.
*
* Flags that describe a URI.
*
@ -72,7 +75,7 @@ void g_uri_unref (GUri *uri);
GLIB_AVAILABLE_TYPE_IN_2_66
typedef enum {
G_URI_FLAGS_NONE = 0,
G_URI_FLAGS_PARSE_STRICT = 1 << 0,
G_URI_FLAGS_PARSE_RELAXED = 1 << 0,
G_URI_FLAGS_HAS_PASSWORD = 1 << 1,
G_URI_FLAGS_HAS_AUTH_PARAMS = 1 << 2,
G_URI_FLAGS_ENCODED = 1 << 3,
@ -179,11 +182,12 @@ GUri * g_uri_build_with_user (GUriFlags flags,
/**
* GUriHideFlags:
* @G_URI_HIDE_NONE: No flags set.
* @G_URI_HIDE_USERINFO: Hide the userinfo.
* @G_URI_HIDE_PASSWORD: Hide the password.
* @G_URI_HIDE_AUTH_PARAMS: Hide the auth_params.
* @G_URI_HIDE_QUERY: Hide the query.
* @G_URI_HIDE_FRAGMENT: Hide the fragment.
* @G_URI_HIDE_NONE: No flags set.
*
* Flags describing what parts of the URI to hide in
* g_uri_to_string_partial(). Note that %G_URI_HIDE_PASSWORD and
@ -198,7 +202,8 @@ typedef enum {
G_URI_HIDE_USERINFO = 1 << 0,
G_URI_HIDE_PASSWORD = 1 << 1,
G_URI_HIDE_AUTH_PARAMS = 1 << 2,
G_URI_HIDE_FRAGMENT = 1 << 3,
G_URI_HIDE_QUERY = 1 << 3,
G_URI_HIDE_FRAGMENT = 1 << 4,
} GUriHideFlags;
GLIB_AVAILABLE_IN_2_66
@ -233,10 +238,13 @@ GUriFlags g_uri_get_flags (GUri *uri);
/**
* GUriParamsFlags:
* @G_URI_PARAMS_NONE: No flags set.
* @G_URI_PARAMS_CASE_INSENSITIVE: whether parameter names are case insensitive.
* @G_URI_PARAMS_WWW_FORM: replace `+` with space character.
* @G_URI_PARAMS_CASE_INSENSITIVE: Parameter names are case insensitive.
* @G_URI_PARAMS_WWW_FORM: Replace `+` with space character. Only useful for
* URLs on the web, using the `https` or `http` schemas.
* @G_URI_PARAMS_PARSE_RELAXED: See %G_URI_FLAGS_PARSE_RELAXED.
*
* Flags modifying the way parameters are handled.
* Flags modifying the way parameters are handled by g_uri_parse_params() and
* #GUriParamsIter.
*
* Since: 2.66
*/
@ -245,6 +253,7 @@ typedef enum {
G_URI_PARAMS_NONE = 0,
G_URI_PARAMS_CASE_INSENSITIVE = 1 << 0,
G_URI_PARAMS_WWW_FORM = 1 << 1,
G_URI_PARAMS_PARSE_RELAXED = 1 << 2,
} GUriParamsFlags;
GLIB_AVAILABLE_IN_2_66
@ -277,6 +286,7 @@ gboolean g_uri_params_iter_next (GUriParamsIter *iter,
gchar **attribute,
gchar **value,
GError **error);
/**
* G_URI_ERROR:
*
@ -292,23 +302,24 @@ GQuark g_uri_error_quark (void);
/**
* GUriError:
* @G_URI_ERROR_MISC: miscellaneous error
* @G_URI_ERROR_BAD_SCHEME: the scheme of a URI could not be parsed.
* @G_URI_ERROR_BAD_USER: the user/userinfo of a URI could not be parsed.
* @G_URI_ERROR_BAD_PASSWORD: the password of a URI could not be parsed.
* @G_URI_ERROR_BAD_AUTH_PARAMS: the authentication parameters of a URI could not be parsed.
* @G_URI_ERROR_BAD_HOST: the host of a URI could not be parsed.
* @G_URI_ERROR_BAD_PORT: the port of a URI could not be parsed.
* @G_URI_ERROR_BAD_PATH: the path of a URI could not be parsed.
* @G_URI_ERROR_BAD_QUERY: the query of a URI could not be parsed.
* @G_URI_ERROR_BAD_FRAGMENT: the fragment of a URI could not be parsed.
* @G_URI_ERROR_FAILED: Generic error if no more specific error is available.
* See the error message for details.
* @G_URI_ERROR_BAD_SCHEME: The scheme of a URI could not be parsed.
* @G_URI_ERROR_BAD_USER: The user/userinfo of a URI could not be parsed.
* @G_URI_ERROR_BAD_PASSWORD: The password of a URI could not be parsed.
* @G_URI_ERROR_BAD_AUTH_PARAMS: The authentication parameters of a URI could not be parsed.
* @G_URI_ERROR_BAD_HOST: The host of a URI could not be parsed.
* @G_URI_ERROR_BAD_PORT: The port of a URI could not be parsed.
* @G_URI_ERROR_BAD_PATH: The path of a URI could not be parsed.
* @G_URI_ERROR_BAD_QUERY: The query of a URI could not be parsed.
* @G_URI_ERROR_BAD_FRAGMENT: The fragment of a URI could not be parsed.
*
* Error codes returned by #GUri methods.
*
* Since: 2.66
*/
typedef enum {
G_URI_ERROR_MISC,
G_URI_ERROR_FAILED,
G_URI_ERROR_BAD_SCHEME,
G_URI_ERROR_BAD_USER,
G_URI_ERROR_BAD_PASSWORD,
@ -323,7 +334,8 @@ typedef enum {
/**
* G_URI_RESERVED_CHARS_GENERIC_DELIMITERS:
*
* Generic delimiters characters as defined in RFC 3986. Includes ":/?#[]@".
* Generic delimiters characters as defined in
* [RFC 3986](https://tools.ietf.org/html/rfc3986). Includes `:/?#[]@`.
*
* Since: 2.16
**/
@ -332,7 +344,8 @@ typedef enum {
/**
* G_URI_RESERVED_CHARS_SUBCOMPONENT_DELIMITERS:
*
* Subcomponent delimiter characters as defined in RFC 3986. Includes "!$&'()*+,;=".
* Subcomponent delimiter characters as defined in
* [RFC 3986](https://tools.ietf.org/html/rfc3986). Includes `!$&'()*+,;=`.
*
* Since: 2.16
**/
@ -341,7 +354,7 @@ typedef enum {
/**
* G_URI_RESERVED_CHARS_ALLOWED_IN_PATH_ELEMENT:
*
* Allowed characters in path elements. Includes "!$&'()*+,;=:@".
* Allowed characters in path elements. Includes `!$&'()*+,;=:@`.
*
* Since: 2.16
**/
@ -350,7 +363,7 @@ typedef enum {
/**
* G_URI_RESERVED_CHARS_ALLOWED_IN_PATH:
*
* Allowed characters in a path. Includes "!$&'()*+,;=:@/".
* Allowed characters in a path. Includes `!$&'()*+,;=:@/`.
*
* Since: 2.16
**/
@ -359,7 +372,8 @@ typedef enum {
/**
* G_URI_RESERVED_CHARS_ALLOWED_IN_USERINFO:
*
* Allowed characters in userinfo as defined in RFC 3986. Includes "!$&'()*+,;=:".
* Allowed characters in userinfo as defined in
* [RFC 3986](https://tools.ietf.org/html/rfc3986). Includes `!$&'()*+,;=:`.
*
* Since: 2.16
**/
@ -390,7 +404,7 @@ GBytes * g_uri_unescape_bytes (const char *escaped_string,
GError **error);
GLIB_AVAILABLE_IN_2_66
char * g_uri_escape_bytes (const guchar *unescaped,
char * g_uri_escape_bytes (const guint8 *unescaped,
gsize length,
const char *reserved_chars_allowed);

188
glib/tests/uri.c
View File

@ -417,7 +417,7 @@ test_uri_unescape_bytes (gconstpointer test_data)
if (tests[i].expected_unescaped_len < 0)
{
g_assert_null (bytes);
g_assert_error (error, G_URI_ERROR, G_URI_ERROR_MISC);
g_assert_error (error, G_URI_ERROR, G_URI_ERROR_FAILED);
g_clear_error (&error);
}
else
@ -443,6 +443,9 @@ test_uri_unescape_segment (void)
s = g_uri_unescape_segment (escaped_segment, escaped_segment + 10, NULL);
g_assert_cmpstr (s, ==, "+abc O");
g_free (s);
s = g_uri_unescape_segment ("%2Babc%00cde", NULL, NULL);
g_assert_null (s);
}
static void
@ -478,6 +481,10 @@ test_uri_scheme (void)
g_assert_cmpstr (s, ==, "ftp");
g_free (s);
s = g_uri_parse_scheme ("good-scheme.but+weird:gtk.org");
g_assert_cmpstr (s, ==, "good-scheme.but+weird");
g_free (s);
s = g_uri_parse_scheme ("1bad:");
g_assert_null (s);
s = g_uri_parse_scheme ("bad");
@ -512,201 +519,202 @@ typedef struct {
typedef struct {
const gchar *orig;
GUriFlags flags;
const UriParts parts;
} UriAbsoluteTest;
static const UriAbsoluteTest absolute_tests[] = {
{ "foo:",
{ "foo:", G_URI_FLAGS_NONE,
{ "foo", NULL, NULL, -1, "", NULL, NULL }
},
{ "file:/dev/null",
{ "file:/dev/null", G_URI_FLAGS_NONE,
{ "file", NULL, NULL, -1, "/dev/null", NULL, NULL }
},
{ "file:///dev/null",
{ "file:///dev/null", G_URI_FLAGS_NONE,
{ "file", NULL, "", -1, "/dev/null", NULL, NULL }
},
{ "ftp://user@host/path",
{ "ftp://user@host/path", G_URI_FLAGS_NONE,
{ "ftp", "user", "host", -1, "/path", NULL, NULL }
},
{ "ftp://user@host:9999/path",
{ "ftp://user@host:9999/path", G_URI_FLAGS_NONE,
{ "ftp", "user", "host", 9999, "/path", NULL, NULL }
},
{ "ftp://user:password@host/path",
{ "ftp://user:password@host/path", G_URI_FLAGS_NONE,
{ "ftp", "user:password", "host", -1, "/path", NULL, NULL }
},
{ "ftp://user:password@host:9999/path",
{ "ftp://user:password@host:9999/path", G_URI_FLAGS_NONE,
{ "ftp", "user:password", "host", 9999, "/path", NULL, NULL }
},
{ "ftp://user:password@host",
{ "ftp://user:password@host", G_URI_FLAGS_NONE,
{ "ftp", "user:password", "host", -1, "", NULL, NULL }
},
{ "http://us%65r@host",
{ "http://us%65r@host", G_URI_FLAGS_NONE,
{ "http", "user", "host", -1, "", NULL, NULL }
},
{ "http://us%40r@host",
{ "http://us%40r@host", G_URI_FLAGS_NONE,
{ "http", "us@r", "host", -1, "", NULL, NULL }
},
{ "http://us%3ar@host",
{ "http://us%3ar@host", G_URI_FLAGS_NONE,
{ "http", "us:r", "host", -1, "", NULL, NULL }
},
{ "http://us%2fr@host",
{ "http://us%2fr@host", G_URI_FLAGS_NONE,
{ "http", "us/r", "host", -1, "", NULL, NULL }
},
{ "http://us%3fr@host",
{ "http://us%3fr@host", G_URI_FLAGS_NONE,
{ "http", "us?r", "host", -1, "", NULL, NULL }
},
{ "http://host?query",
{ "http://host?query", G_URI_FLAGS_NONE,
{ "http", NULL, "host", -1, "", "query", NULL }
},
{ "http://host/path?query=http%3A%2F%2Fhost%2Fpath%3Fchildparam%3Dchildvalue&param=value",
{ "http://host/path?query=http%3A%2F%2Fhost%2Fpath%3Fchildparam%3Dchildvalue&param=value", G_URI_FLAGS_NONE,
{ "http", NULL, "host", -1, "/path", "query=http://host/path?childparam=childvalue&param=value", NULL }
},
{ "http://control-chars/%01%02%03%04%05%06%07%08%09%0A%0B%0C%0D%0E%0F%10%11%12%13%14%15%16%17%18%19%1A%1B%1C%1D%1E%1F%7F",
{ "http://control-chars/%01%02%03%04%05%06%07%08%09%0A%0B%0C%0D%0E%0F%10%11%12%13%14%15%16%17%18%19%1A%1B%1C%1D%1E%1F%7F", G_URI_FLAGS_NONE,
{ "http", NULL, "control-chars", -1, "/\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F\x7F", NULL, NULL }
},
{ "http://space/%20",
{ "http://space/%20", G_URI_FLAGS_NONE,
{ "http", NULL, "space", -1, "/ ", NULL, NULL }
},
{ "http://delims/%3C%3E%23%25%22",
{ "http://delims/%3C%3E%23%25%22", G_URI_FLAGS_NONE,
{ "http", NULL, "delims", -1, "/<>#%\"", NULL, NULL }
},
{ "http://unwise-chars/%7B%7D%7C%5C%5E%5B%5D%60",
{ "http://unwise-chars/%7B%7D%7C%5C%5E%5B%5D%60", G_URI_FLAGS_NONE,
{ "http", NULL, "unwise-chars", -1, "/{}|\\^[]`", NULL, NULL }
},
/* From RFC 2732 */
{ "http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80/index.html",
{ "http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80/index.html", G_URI_FLAGS_NONE,
{ "http", NULL, "FEDC:BA98:7654:3210:FEDC:BA98:7654:3210", 80, "/index.html", NULL, NULL }
},
{ "http://[1080:0:0:0:8:800:200C:417A]/index.html",
{ "http://[1080:0:0:0:8:800:200C:417A]/index.html", G_URI_FLAGS_NONE,
{ "http", NULL, "1080:0:0:0:8:800:200C:417A", -1, "/index.html", NULL, NULL }
},
{ "http://[3ffe:2a00:100:7031::1]",
{ "http://[3ffe:2a00:100:7031::1]", G_URI_FLAGS_NONE,
{ "http", NULL, "3ffe:2a00:100:7031::1", -1, "", NULL, NULL }
},
{ "http://[1080::8:800:200C:417A]/foo",
{ "http://[1080::8:800:200C:417A]/foo", G_URI_FLAGS_NONE,
{ "http", NULL, "1080::8:800:200C:417A", -1, "/foo", NULL, NULL }
},
{ "http://[::192.9.5.5]/ipng",
{ "http://[::192.9.5.5]/ipng", G_URI_FLAGS_NONE,
{ "http", NULL, "::192.9.5.5", -1, "/ipng", NULL, NULL }
},
{ "http://[::FFFF:129.144.52.38]:80/index.html",
{ "http://[::FFFF:129.144.52.38]:80/index.html", G_URI_FLAGS_NONE,
{ "http", NULL, "::FFFF:129.144.52.38", 80, "/index.html", NULL, NULL }
},
{ "http://[2010:836B:4179::836B:4179]",
{ "http://[2010:836B:4179::836B:4179]", G_URI_FLAGS_NONE,
{ "http", NULL, "2010:836B:4179::836B:4179", -1, "", NULL, NULL }
},
/* some problematic URIs that are handled differently in libsoup */
{ "http://host/path with spaces",
{ "http://host/path with spaces", G_URI_FLAGS_PARSE_RELAXED,
{ "http", NULL, "host", -1, "/path with spaces", NULL, NULL }
},
{ " http://host/path",
{ " http://host/path", G_URI_FLAGS_PARSE_RELAXED,
{ "http", NULL, "host", -1, "/path", NULL, NULL }
},
{ "http://host/path ",
{ "http://host/path ", G_URI_FLAGS_PARSE_RELAXED,
{ "http", NULL, "host", -1, "/path", NULL, NULL }
},
{ "http://host ",
{ "http://host ", G_URI_FLAGS_PARSE_RELAXED,
{ "http", NULL, "host", -1, "", NULL, NULL }
},
{ "http://host:999 ",
{ "http://host:999 ", G_URI_FLAGS_PARSE_RELAXED,
{ "http", NULL, "host", 999, "", NULL, NULL }
},
{ "http://host/pa\nth",
{ "http://host/pa\nth", G_URI_FLAGS_PARSE_RELAXED,
{ "http", NULL, "host", -1, "/path", NULL, NULL }
},
{ "http:\r\n//host/path",
{ "http:\r\n//host/path", G_URI_FLAGS_PARSE_RELAXED,
{ "http", NULL, "host", -1, "/path", NULL, NULL }
},
{ "http://\thost/path",
{ "http://\thost/path", G_URI_FLAGS_PARSE_RELAXED,
{ "http", NULL, "host", -1, "/path", NULL, NULL }
},
/* Bug 594405; 0-length is different from not-present */
{ "http://host/path?",
{ "http://host/path?", G_URI_FLAGS_NONE,
{ "http", NULL, "host", -1, "/path", "", NULL }
},
{ "http://host/path#",
{ "http://host/path#", G_URI_FLAGS_NONE,
{ "http", NULL, "host", -1, "/path", NULL, "" },
},
/* Bug 590524; ignore bad %-encoding */
{ "http://host/path%",
{ "http://host/path%", G_URI_FLAGS_PARSE_RELAXED,
{ "http", NULL, "host", -1, "/path%", NULL, NULL }
},
{ "http://h%ost/path",
{ "http://h%ost/path", G_URI_FLAGS_PARSE_RELAXED,
{ "http", NULL, "h%ost", -1, "/path", NULL, NULL }
},
{ "http://host/path%%",
{ "http://host/path%%", G_URI_FLAGS_PARSE_RELAXED,
{ "http", NULL, "host", -1, "/path%%", NULL, NULL }
},
{ "http://host/path%%%",
{ "http://host/path%%%", G_URI_FLAGS_PARSE_RELAXED,
{ "http", NULL, "host", -1, "/path%%%", NULL, NULL }
},
{ "http://host/path%/x/",
{ "http://host/path%/x/", G_URI_FLAGS_PARSE_RELAXED,
{ "http", NULL, "host", -1, "/path%/x/", NULL, NULL }
},
{ "http://host/path%0x/",
{ "http://host/path%0x/", G_URI_FLAGS_PARSE_RELAXED,
{ "http", NULL, "host", -1, "/path%0x/", NULL, NULL }
},
{ "http://host/path%ax",
{ "http://host/path%ax", G_URI_FLAGS_PARSE_RELAXED,
{ "http", NULL, "host", -1, "/path%ax", NULL, NULL }
},
/* GUri doesn't %-encode non-ASCII characters */
{ "http://host/p\xc3\xa4th/",
{ "http://host/p\xc3\xa4th/", G_URI_FLAGS_NONE,
{ "http", NULL, "host", -1, "/p\xc3\xa4th/", NULL, NULL }
},
{ "HTTP:////////////////",
{ "HTTP:////////////////", G_URI_FLAGS_NONE,
{ "http", NULL, "", -1, "//////////////", NULL, NULL }
},
{ "http://@host",
{ "http://@host", G_URI_FLAGS_NONE,
{ "http", "", "host", -1, "", NULL, NULL }
},
{ "http://:@host",
{ "http://:@host", G_URI_FLAGS_NONE,
{ "http", ":", "host", -1, "", NULL, NULL }
},
{ "scheme://foo%3Abar._webdav._tcp.local",
{ "scheme://foo%3Abar._webdav._tcp.local", G_URI_FLAGS_NONE,
{ "scheme", NULL, "foo:bar._webdav._tcp.local", -1, "", NULL, NULL}
},
/* IPv6 scope ID parsing (both correct and incorrect) */
{ "http://[fe80::dead:beef%em1]/",
{ "http://[fe80::dead:beef%em1]/", G_URI_FLAGS_NONE,
{ "http", NULL, "fe80::dead:beef%em1", -1, "/", NULL, NULL }
},
{ "http://[fe80::dead:beef%25em1]/",
{ "http://[fe80::dead:beef%25em1]/", G_URI_FLAGS_NONE,
{ "http", NULL, "fe80::dead:beef%em1", -1, "/", NULL, NULL }
},
{ "http://[fe80::dead:beef%10]/",
{ "http://[fe80::dead:beef%10]/", G_URI_FLAGS_NONE,
{ "http", NULL, "fe80::dead:beef%10", -1, "/", NULL, NULL }
},
/* ".." past top */
{ "http://example.com/..",
{ "http://example.com/..", G_URI_FLAGS_NONE,
{ "http", NULL, "example.com", -1, "/..", NULL, NULL }
},
/* scheme parsing */
{ "foo0://host/path",
{ "foo0://host/path", G_URI_FLAGS_NONE,
{ "foo0", NULL, "host", -1, "/path", NULL, NULL } },
{ "f0.o://host/path",
{ "f0.o://host/path", G_URI_FLAGS_NONE,
{ "f0.o", NULL, "host", -1, "/path", NULL, NULL } },
{ "http++://host/path",
{ "http++://host/path", G_URI_FLAGS_NONE,
{ "http++", NULL, "host", -1, "/path", NULL, NULL } },
{ "http-ish://host/path",
{ "http-ish://host/path", G_URI_FLAGS_NONE,
{ "http-ish", NULL, "host", -1, "/path", NULL, NULL } },
/* IPv6 scope ID parsing (both correct and incorrect) */
{ "http://[fe80::dead:beef%em1]/",
{ "http://[fe80::dead:beef%em1]/", G_URI_FLAGS_NONE,
{ "http", NULL, "fe80::dead:beef%em1", -1, "/", NULL, NULL } },
{ "http://[fe80::dead:beef%25em1]/",
{ "http://[fe80::dead:beef%25em1]/", G_URI_FLAGS_NONE,
{ "http", NULL, "fe80::dead:beef%em1", -1, "/", NULL, NULL } },
{ "http://[fe80::dead:beef%10]/",
{ "http://[fe80::dead:beef%10]/", G_URI_FLAGS_NONE,
{ "http", NULL, "fe80::dead:beef%10", -1, "/", NULL, NULL } },
{ "http://[fe80::dead:beef%25]/",
{ "http://[fe80::dead:beef%25]/", G_URI_FLAGS_NONE,
{ "http", NULL, "fe80::dead:beef%25", -1, "/", NULL, NULL } },
};
static int num_absolute_tests = G_N_ELEMENTS (absolute_tests);
@ -722,7 +730,9 @@ test_uri_parsing_absolute (void)
GError *error = NULL;
GUri *uri;
uri = g_uri_parse (test->orig, G_URI_FLAGS_NONE, &error);
g_test_message ("Test %d: %s", i, test->orig);
uri = g_uri_parse (test->orig, test->flags, &error);
g_assert_no_error (error);
g_assert_cmpstr (g_uri_get_scheme (uri), ==, test->parts.scheme);
@ -872,7 +882,7 @@ test_uri_parsing_relative (void)
g_assert_cmpstr (resolved, ==, test->resolved);
g_free (resolved);
}
uri = g_uri_parse_relative (base, "%%", G_URI_FLAGS_PARSE_STRICT, &error);
uri = g_uri_parse_relative (base, "%%", G_URI_FLAGS_NONE, &error);
g_assert_null (uri);
g_assert_error (error, G_URI_ERROR, G_URI_ERROR_BAD_PATH);
g_clear_error (&error);
@ -891,17 +901,17 @@ test_uri_parsing_relative (void)
resolved = g_uri_resolve_relative (NULL, "a", G_URI_FLAGS_NONE, &error);
g_assert_null (resolved);
g_assert_error (error, G_URI_ERROR, G_URI_ERROR_MISC);
g_assert_error (error, G_URI_ERROR, G_URI_ERROR_FAILED);
g_clear_error (&error);
resolved = g_uri_resolve_relative ("../b", "a", G_URI_FLAGS_NONE, &error);
g_assert_null (resolved);
g_assert_error (error, G_URI_ERROR, G_URI_ERROR_MISC);
g_assert_error (error, G_URI_ERROR, G_URI_ERROR_FAILED);
g_clear_error (&error);
resolved = g_uri_resolve_relative ("%%", "a", G_URI_FLAGS_NONE, &error);
resolved = g_uri_resolve_relative ("%%", "a", G_URI_FLAGS_PARSE_RELAXED, &error);
g_assert_null (resolved);
g_assert_error (error, G_URI_ERROR, G_URI_ERROR_MISC);
g_assert_error (error, G_URI_ERROR, G_URI_ERROR_FAILED);
g_clear_error (&error);
}
@ -933,6 +943,9 @@ test_uri_to_string (void)
tostring = g_uri_to_string_partial (uri, G_URI_HIDE_USERINFO);
g_assert_cmpstr (tostring, ==, "scheme://host:1234/path?query#fragment");
g_free (tostring);
tostring = g_uri_to_string_partial (uri, G_URI_HIDE_QUERY);
g_assert_cmpstr (tostring, ==, "scheme://user:pass;auth@host:1234/path#fragment");
g_free (tostring);
tostring = g_uri_to_string_partial (uri, G_URI_HIDE_FRAGMENT);
g_assert_cmpstr (tostring, ==, "scheme://user:pass;auth@host:1234/path?query");
g_free (tostring);
@ -950,6 +963,9 @@ test_uri_to_string (void)
tostring = g_uri_to_string_partial (uri, G_URI_HIDE_AUTH_PARAMS);
g_assert_cmpstr (tostring, ==, "scheme://us%3Aer:pass@host:1234/path?query#fragment");
g_free (tostring);
tostring = g_uri_to_string_partial (uri, G_URI_HIDE_QUERY);
g_assert_cmpstr (tostring, ==, "scheme://us%3Aer:pass;auth@host:1234/path#fragment");
g_free (tostring);
g_uri_unref (uri);
}
@ -1011,6 +1027,12 @@ test_uri_build (void)
"/path", "query", "fragment");
g_assert_null (g_uri_get_userinfo (uri));
g_uri_unref (uri);
uri = g_uri_build_with_user (G_URI_FLAGS_NONE, "scheme", "user", NULL, NULL,
"host", 1234,
"/path", "query", "fragment");
g_assert_cmpstr (g_uri_get_userinfo (uri), ==, "user");
g_uri_unref (uri);
}
static void
@ -1068,7 +1090,7 @@ test_uri_split (void)
g_free (host);
g_uri_split ("scheme://@@@host:1234/path?query#fragment",
G_URI_FLAGS_ENCODED,
G_URI_FLAGS_ENCODED | G_URI_FLAGS_PARSE_RELAXED,
NULL,
&userinfo,
NULL,
@ -1083,7 +1105,7 @@ test_uri_split (void)
g_uri_split ("http://f;oo/",
G_URI_FLAGS_NONE,
G_URI_FLAGS_NONE | G_URI_FLAGS_PARSE_RELAXED,
NULL,
NULL,
NULL,
@ -1263,7 +1285,7 @@ test_uri_split (void)
g_clear_error (&error);
g_uri_split_with_user ("scheme://user:pa%x0s;auth@host:1234/path?query#fragment",
G_URI_FLAGS_HAS_PASSWORD|G_URI_FLAGS_PARSE_STRICT,
G_URI_FLAGS_HAS_PASSWORD,
&scheme,
&user,
&pass,
@ -1310,8 +1332,8 @@ test_uri_is_valid (void)
g_assert_true (g_uri_is_valid ("http://127.127.127.b/", G_URI_FLAGS_NONE, NULL));
g_assert_true (g_uri_is_valid ("http://\xc3\x89XAMPLE.COM/", G_URI_FLAGS_NONE, NULL));
g_assert_true (g_uri_is_valid (" \r http\t://f oo \t\n ", G_URI_FLAGS_NONE, NULL));
g_assert_false (g_uri_is_valid (" \r http\t://f oo \t\n ", G_URI_FLAGS_PARSE_STRICT, &error));
g_assert_true (g_uri_is_valid (" \r http\t://f oo \t\n ", G_URI_FLAGS_PARSE_RELAXED, NULL));
g_assert_false (g_uri_is_valid (" \r http\t://f oo \t\n ", G_URI_FLAGS_NONE, &error));
g_assert_error (error, G_URI_ERROR, G_URI_ERROR_BAD_SCHEME);
g_clear_error (&error);
@ -1349,6 +1371,8 @@ test_uri_is_valid (void)
g_assert_false (g_uri_is_valid ("http://host:6553l", G_URI_FLAGS_NONE, &error));
g_assert_error (error, G_URI_ERROR, G_URI_ERROR_BAD_PORT);
g_clear_error (&error);
g_assert_true (g_uri_is_valid ("data:,Hello", G_URI_FLAGS_NONE, &error));
}
static const struct
@ -1386,7 +1410,7 @@ static const struct
{ "p1=foo&P1=bar", "&", G_URI_PARAMS_CASE_INSENSITIVE,
2, { "p1", "foo", "P1", "bar" },
1, { "p1", "bar", NULL, }},
{ "=%", "&", G_URI_PARAMS_NONE,
{ "=%", "&", G_URI_PARAMS_PARSE_RELAXED,
1, { "", "%", NULL, },
1, { "", "%", NULL, }},
{ "=", "&", G_URI_PARAMS_NONE,
@ -1436,6 +1460,19 @@ test_uri_iter_params (gconstpointer test_data)
uri = g_memdup (params_tests[i].uri, uri_len);
}
/* Run once without extracting the attr or value, just to check the numbers. */
n = 0;
g_uri_params_iter_init (&iter, params_tests[i].uri, -1, params_tests[i].separators, params_tests[i].flags);
while (g_uri_params_iter_next (&iter, NULL, NULL, &err))
n++;
g_assert_cmpint (n, ==, params_tests[i].expected_n_iter);
if (err)
{
g_assert_error (err, G_URI_ERROR, G_URI_ERROR_FAILED);
g_clear_error (&err);
}
/* Run again and check the strings too. */
n = 0;
g_uri_params_iter_init (&iter, params_tests[i].uri, -1, params_tests[i].separators, params_tests[i].flags);
while (g_uri_params_iter_next (&iter, &attr, &value, &err))
@ -1449,9 +1486,10 @@ test_uri_iter_params (gconstpointer test_data)
g_assert_cmpint (n, ==, params_tests[i].expected_n_iter);
if (err)
{
g_assert_error (err, G_URI_ERROR, G_URI_ERROR_MISC);
g_assert_error (err, G_URI_ERROR, G_URI_ERROR_FAILED);
g_clear_error (&err);
}
g_free (uri);
}
}
@ -1494,7 +1532,7 @@ test_uri_parse_params (gconstpointer test_data)
if (params_tests[i].expected_n_params < 0)
{
g_assert_null (params);
g_assert_error (err, G_URI_ERROR, G_URI_ERROR_MISC);
g_assert_error (err, G_URI_ERROR, G_URI_ERROR_FAILED);
g_clear_error (&err);
}
else