Just basic support - http://user:password@[host]:port Resolves: rhbz#1335239 --- src/spice-uri.c | 25 +++++++++++++++++++++---- tests/test-spice-uri.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 4 deletions(-) diff --git a/src/spice-uri.c b/src/spice-uri.c index 5eca422..d869dff 100644 --- a/src/spice-uri.c +++ b/src/spice-uri.c @@ -146,10 +146,29 @@ gboolean spice_uri_parse(SpiceURI *self, const gchar *_uri, GError **error) spice_uri_set_password(self, NULL); } - /* max 2 parts, host:port */ - gchar **uriv = g_strsplit(uri, ":", 2); + gchar **uriv; const gchar *uri_port = NULL; + if (*uri == '[') { /* ipv6 address */ + uriv = g_strsplit(uri + 1, "]", 2); + if (uriv[1] == NULL) { + g_set_error(error, SPICE_CLIENT_ERROR, SPICE_CLIENT_ERROR_FAILED, + "Missing ']' in ipv6 uri"); + goto end; + } + if (*uriv[1] == ':') { + uri_port = uriv[1] + 1; + } else if (strlen(uriv[1]) > 0) { /* invalid string after the hostname */ + g_set_error(error, SPICE_CLIENT_ERROR, SPICE_CLIENT_ERROR_FAILED, + "Invalid uri address"); + goto end; + } + } else { + /* max 2 parts, host:port */ + uriv = g_strsplit(uri, ":", 2); + uri_port = uriv[1]; + } + if (uriv[0] == NULL || strlen(uriv[0]) == 0) { g_set_error(error, SPICE_CLIENT_ERROR, SPICE_CLIENT_ERROR_FAILED, "Invalid hostname in uri address"); @@ -157,8 +176,6 @@ gboolean spice_uri_parse(SpiceURI *self, const gchar *_uri, GError **error) } spice_uri_set_hostname(self, uriv[0]); - if (uriv[0] != NULL) - uri_port = uriv[1]; if (uri_port != NULL) { char *endptr; diff --git a/tests/test-spice-uri.c b/tests/test-spice-uri.c index c98f4da..36b08ad 100644 --- a/tests/test-spice-uri.c +++ b/tests/test-spice-uri.c @@ -64,11 +64,51 @@ static void test_spice_uri_ipv4(void) g_object_unref(uri); } +static void test_spice_uri_ipv6(void) +{ + const struct test_case invalid_test_cases[] = { + {"http://[]:80";, "http", NULL, 80, NULL, NULL}, + {"http://[::1";, "http", NULL, 3128, NULL, NULL}, + {"http://[host]1234";, "http", "host", 3128, NULL, NULL}, + {"http://[host]foo/";, "http", "host", 3128, NULL, NULL}, + {"http://[::1]:port";, "http", "::1", 3128, NULL, NULL}, + {"http://[::127.0.0.1]:";, "http", "::127.0.0.1", 3128, NULL, NULL}, + }; + const struct test_case valid_test_cases[] = { + {"http://user:password@[host]:80/";, "http", "host", 80, "user", "password"}, + {"http://user@[1080:0:0:0:8:800:200C:4171]:100";, "http", "1080:0:0:0:8:800:200C:4171", 100, + "user", NULL}, + {"https://[1080::8:800:200C:417A]";, "https", "1080::8:800:200C:417A", 3129, NULL, NULL}, + {"[3ffe:2a00:100:7031::1]", "http", "3ffe:2a00:100:7031::1", 3128, NULL, NULL}, + }; + + guint i; + + SpiceURI *uri = spice_uri_new(); + g_assert_nonnull(uri); + + for (i = 0; i < G_N_ELEMENTS(invalid_test_cases); i++) { + g_assert_false(spice_uri_parse(uri, invalid_test_cases[i].uri, NULL)); + } + + for (i = 0; i < G_N_ELEMENTS(valid_test_cases); i++) { + g_assert_true(spice_uri_parse(uri, valid_test_cases[i].uri, NULL)); + g_assert_cmpstr(spice_uri_get_scheme(uri), ==, valid_test_cases[i].scheme); + g_assert_cmpstr(spice_uri_get_hostname(uri), ==, valid_test_cases[i].hostname); + g_assert_cmpstr(spice_uri_get_user(uri), ==, valid_test_cases[i].user); + g_assert_cmpstr(spice_uri_get_password(uri), ==, valid_test_cases[i].password); + g_assert_cmpuint(spice_uri_get_port(uri), ==, valid_test_cases[i].port); + } + + g_object_unref(uri); +} + int main(int argc, char* argv[]) { g_test_init(&argc, &argv, NULL); g_test_add_func("/spice_uri/ipv4", test_spice_uri_ipv4); + g_test_add_func("/spice_uri/ipv6", test_spice_uri_ipv6); return g_test_run(); } -- 2.8.2 _______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/spice-devel