From d9b4d1ce20e89a00dba8afc3767845fb7e357b21 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Thu, 7 Jan 2016 18:00:00 +0100 Subject: [PATCH] connection reuse: IDN host names fixed Use the ACE form of IDN hostnames as key in the connection cache. Add new tests. Closes #592 --- lib/url.c | 56 +++++++++++++----------- tests/data/Makefile.inc | 2 +- tests/data/test2046 | 94 +++++++++++++++++++++++++++++++++++++++ tests/data/test2047 | 97 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 222 insertions(+), 27 deletions(-) create mode 100644 tests/data/test2046 create mode 100644 tests/data/test2047 diff --git a/lib/url.c b/lib/url.c index 49c71becc..728ceb83d 100644 --- a/lib/url.c +++ b/lib/url.c @@ -142,6 +142,7 @@ static struct connectdata * find_oldest_idle_connection_in_bundle(struct SessionHandle *data, struct connectbundle *bundle); static void conn_free(struct connectdata *conn); +static void free_fixed_hostname(struct hostname *host); static void signalPipeClose(struct curl_llist *pipeline, bool pipe_broke); static CURLcode parse_url_login(struct SessionHandle *data, struct connectdata *conn, @@ -2798,23 +2799,8 @@ CURLcode Curl_disconnect(struct connectdata *conn, bool dead_connection) infof(data, "Closing connection %ld\n", conn->connection_id); Curl_conncache_remove_conn(data->state.conn_cache, conn); -#if defined(USE_LIBIDN) - if(conn->host.encalloc) - idn_free(conn->host.encalloc); /* encoded host name buffer, must be freed - with idn_free() since this was allocated - by libidn */ - if(conn->proxy.encalloc) - idn_free(conn->proxy.encalloc); /* encoded proxy name buffer, must be - freed with idn_free() since this was - allocated by libidn */ -#elif defined(USE_WIN32_IDN) - free(conn->host.encalloc); /* encoded host name buffer, must be freed with - idn_free() since this was allocated by - curl_win32_idn_to_ascii */ - free(conn->proxy.encalloc); /* encoded proxy name buffer, must be freed - with idn_free() since this was allocated by - curl_win32_idn_to_ascii */ -#endif + free_fixed_hostname(&conn->host); + free_fixed_hostname(&conn->proxy); Curl_ssl_close(conn, FIRSTSOCKET); @@ -3786,6 +3772,24 @@ static void fix_hostname(struct SessionHandle *data, } } +/* + * Frees data allocated by fix_hostname() + */ +static void free_fixed_hostname(struct hostname *host) +{ +#if defined(USE_LIBIDN) + if(host->encalloc) { + idn_free(host->encalloc); /* must be freed with idn_free() since this was + allocated by libidn */ + host->encalloc = NULL; + } +#elif defined(USE_WIN32_IDN) + free(host->encalloc); /* must be freed withidn_free() since this was + allocated by curl_win32_idn_to_ascii */ + host->encalloc = NULL; +#endif +} + static void llist_dtor(void *user, void *element) { (void)user; @@ -5242,9 +5246,6 @@ static CURLcode resolve_server(struct SessionHandle *data, int rc; struct Curl_dns_entry *hostaddr; - /* set a pointer to the hostname we display */ - fix_hostname(data, conn, &conn->host); - #ifdef USE_UNIX_SOCKETS if(data->set.str[STRING_UNIX_SOCKET_PATH]) { /* Unix domain sockets are local. The host gets ignored, just use the @@ -5294,9 +5295,6 @@ static CURLcode resolve_server(struct SessionHandle *data, else { /* This is a proxy that hasn't been resolved yet. */ - /* IDN-fix the proxy name */ - fix_hostname(data, conn, &conn->proxy); - /* resolve proxy */ rc = Curl_resolv_timeout(conn, conn->proxy.name, (int)conn->port, &hostaddr, timeout_ms); @@ -5328,6 +5326,7 @@ static CURLcode resolve_server(struct SessionHandle *data, static void reuse_conn(struct connectdata *old_conn, struct connectdata *conn) { + free_fixed_hostname(&old_conn->proxy); free(old_conn->proxy.rawalloc); /* free the SSL config struct from this connection struct as this was @@ -5362,6 +5361,7 @@ static void reuse_conn(struct connectdata *old_conn, /* host can change, when doing keepalive with a proxy or if the case is different this time etc */ + free_fixed_hostname(&conn->host); Curl_safefree(conn->host.rawalloc); conn->host=old_conn->host; @@ -5650,6 +5650,13 @@ static CURLcode create_conn(struct SessionHandle *data, if((conn->given->flags&PROTOPT_SSL) && conn->bits.httpproxy) conn->bits.tunnel_proxy = TRUE; + /************************************************************* + * IDN-fix the hostnames + *************************************************************/ + fix_hostname(data, conn, &conn->host); + if(conn->proxy.name && *conn->proxy.name) + fix_hostname(data, conn, &conn->proxy); + /************************************************************* * Figure out the remote port number and fix it in the URL *************************************************************/ @@ -5794,9 +5801,6 @@ static CURLcode create_conn(struct SessionHandle *data, conn = conn_temp; *in_connect = conn; - /* set a pointer to the hostname we display */ - fix_hostname(data, conn, &conn->host); - infof(data, "Re-using existing connection! (#%ld) with %s %s\n", conn->connection_id, conn->bits.proxy?"proxy":"host", diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc index eeed1b13a..4e01bdfcb 100644 --- a/tests/data/Makefile.inc +++ b/tests/data/Makefile.inc @@ -168,4 +168,4 @@ test2008 test2009 test2010 test2011 test2012 test2013 test2014 test2015 \ test2016 test2017 test2018 test2019 test2020 test2021 test2022 test2023 \ test2024 test2025 test2026 test2027 test2028 test2029 test2030 test2031 \ test2032 test2033 test2034 test2035 test2036 test2037 test2038 test2039 \ -test2040 test2041 test2042 test2043 test2044 test2045 +test2040 test2041 test2042 test2043 test2044 test2045 test2046 test2047 diff --git a/tests/data/test2046 b/tests/data/test2046 new file mode 100644 index 000000000..133c14d73 --- /dev/null +++ b/tests/data/test2046 @@ -0,0 +1,94 @@ + + + +HTTP +HTTP GET +IDN +followlocation +--write-out + + + +# +# Server-side + + +HTTP/1.1 302 OK swsbounce +Date: Thu, 09 Nov 2010 14:49:00 GMT +Content-Length: 9 +Content-Type: text/plain +Location: ./20460001 + +redirect + + +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Content-Length: 3 +Content-Type: text/plain; charset=us-ascii + +OK + + + +# +# Client-side + + +http + + +idn + + +CHARSET=UTF-8 + + +Connection re-use with IDN host name + + + +http://åäö.se:%HTTPPORT/2046 --resolve xn--4cab6c.se:%HTTPPORT:%HOSTIP -w "%{num_connects}\n%{num_redirects}\n%{size_download}\n%{url_effective}\n%{content_type}\n%{response_code}\n" -L + + + +# +# Verify data after the test has been "shot" + + +^User-Agent:.* + + +GET /2046 HTTP/1.1 +Host: xn--4cab6c.se:%HTTPPORT +Accept: */* + +GET /20460001 HTTP/1.1 +Host: xn--4cab6c.se:%HTTPPORT +Accept: */* + + + + +HTTP/1.1 302 OK swsbounce +Date: Thu, 09 Nov 2010 14:49:00 GMT +Content-Length: 9 +Content-Type: text/plain +Location: ./20460001 + +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Content-Length: 3 +Content-Type: text/plain; charset=us-ascii + +OK +1 +1 +3 +http://åäö.se:%HTTPPORT/20460001 +text/plain; charset=us-ascii +200 + + + + diff --git a/tests/data/test2047 b/tests/data/test2047 new file mode 100644 index 000000000..442297801 --- /dev/null +++ b/tests/data/test2047 @@ -0,0 +1,97 @@ + + + +HTTP +HTTP GET +HTTP proxy +IDN +followlocation +--write-out + + + +# +# Server-side + + +HTTP/1.1 302 OK swsbounce +Date: Thu, 09 Nov 2010 14:49:00 GMT +Content-Length: 9 +Content-Type: text/plain +Location: ./20470001 + +redirect + + +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Content-Length: 3 +Content-Type: text/plain; charset=us-ascii + +OK + + + +# +# Client-side + + +http + + +idn + + +CHARSET=UTF-8 + + +Connection re-use with IDN host name over HTTP proxy + + + +http://åäö.se/2047 -x %HOSTIP:%HTTPPORT -w "%{num_connects}\n%{num_redirects}\n%{size_download}\n%{url_effective}\n%{content_type}\n%{response_code}\n" -L + + + +# +# Verify data after the test has been "shot" + + +^User-Agent:.* + + +GET http://xn--4cab6c.se/2047 HTTP/1.1 +Host: xn--4cab6c.se +Accept: */* +Proxy-Connection: Keep-Alive + +GET http://xn--4cab6c.se/20470001 HTTP/1.1 +Host: xn--4cab6c.se +Accept: */* +Proxy-Connection: Keep-Alive + + + + +HTTP/1.1 302 OK swsbounce +Date: Thu, 09 Nov 2010 14:49:00 GMT +Content-Length: 9 +Content-Type: text/plain +Location: ./20470001 + +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Content-Length: 3 +Content-Type: text/plain; charset=us-ascii + +OK +1 +1 +3 +http://xn--4cab6c.se/20470001 +text/plain; charset=us-ascii +200 + + + +