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

httpproxy: Fix invalid request on invalid hostnames

Browse Source 
When an invalid hostname is passed for connection, the
g_hostname_to_ascii() might fail when creating the request in
create_request(). Make sure that error is caught and reported rather
than passing "(null)" as the hostname of the site we want to connect to.

https://bugzilla.gnome.org/show_bug.cgi?id=772989
This commit is contained in:
Bastien Nocera 2016-12-07 17:29:35 +01:00
parent 9b3cb4470d
commit 5c566e435e
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gio/ghttpproxy.c
View File

@ -69,8 +69,9 @@ g_http_proxy_init (GHttpProxy *proxy)
} }
static gchar * static gchar *
create_request (GProxyAddress *proxy_address, create_request (GProxyAddress *proxy_address,
gboolean *has_cred) gboolean *has_cred,
GError **error)
{ {
const gchar *hostname; const gchar *hostname;
gint port; gint port;
@ -83,13 +84,19 @@ create_request (GProxyAddress *proxy_address,
*has_cred = FALSE; *has_cred = FALSE;
hostname = g_proxy_address_get_destination_hostname (proxy_address); hostname = g_proxy_address_get_destination_hostname (proxy_address);
ascii_hostname = g_hostname_to_ascii (hostname);
if (!ascii_hostname)
{
g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
_("Invalid hostname"));
return NULL;
}
port = g_proxy_address_get_destination_port (proxy_address); port = g_proxy_address_get_destination_port (proxy_address);
username = g_proxy_address_get_username (proxy_address); username = g_proxy_address_get_username (proxy_address);
password = g_proxy_address_get_password (proxy_address); password = g_proxy_address_get_password (proxy_address);
request = g_string_new (NULL); request = g_string_new (NULL);
ascii_hostname = g_hostname_to_ascii (hostname);
g_string_append_printf (request, g_string_append_printf (request,
"CONNECT %s:%i HTTP/1.0\r\n" "CONNECT %s:%i HTTP/1.0\r\n"
"Host: %s:%i\r\n" "Host: %s:%i\r\n"
@ -214,7 +221,9 @@ g_http_proxy_connect (GProxy *proxy,
in = g_io_stream_get_input_stream (io_stream); in = g_io_stream_get_input_stream (io_stream);
out = g_io_stream_get_output_stream (io_stream); out = g_io_stream_get_output_stream (io_stream);
buffer = create_request (proxy_address, &has_cred); buffer = create_request (proxy_address, &has_cred, error);
if (!buffer)
goto error;
if (!g_output_stream_write_all (out, buffer, strlen (buffer), NULL, if (!g_output_stream_write_all (out, buffer, strlen (buffer), NULL,
cancellable, error)) cancellable, error))
goto error; goto error;