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

Fix failure to respect default port of proxy URLs

Browse Source 
Currently we require explicitly specifying the port when configuring a
proxy server, which is seriously weird. I take the fact that nobody
reported a bug until 2022 to indicate that almost nobody is using
proxies. Whatever. Let's assume that if no port is provided, the default
port for the protocol should be used instead.

For example, you can now specify in GNOME settings that your proxy server
is https://example.com and it will work. Previously, you had to write
https://example.com:443. Yuck!

This was originally reported as GProxyResolver bug, but nothing is
actually wrong there. It's actually GProxyAddressEnumerator that gets
tripped up by URLs returned by GProxyResolver without a default port.
This breaks GSocketClient.

Fixing this requires exposing GUri's _default_scheme_port() function to
GIO. I considered copy/pasting it since it's not very much code, but I
figure the private call mechanism is probably not too expensive, and I
don't like code duplication.

Fixes #2832
This commit is contained in:
Michael Catanzaro 2023-05-24 17:37:57 -05:00
parent 42cb8dfb95
commit cc5bb80b9a
4 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gio/gproxyaddressenumerator.c
View File

@ -29,6 +29,7 @@
#include "ginetaddress.h"
#include "gioerror.h"
#include "glibintl.h"
#include "glib-private.h"
#include "gnetworkaddress.h"
#include "gnetworkingprivate.h"
#include "gproxy.h"
@ -158,9 +159,13 @@ next_enumerator (GProxyAddressEnumeratorPrivate *priv)
else
{
GError *error = NULL;
int default_port;
connectable = g_network_address_parse_uri (priv->proxy_uri, 0, &error);
default_port = GLIB_PRIVATE_CALL (g_uri_get_default_scheme_port) (priv->proxy_type);
if (default_port == -1)
default_port = 0;
connectable = g_network_address_parse_uri (priv->proxy_uri, default_port, &error);
if (error)
{
g_warning ("Invalid proxy URI '%s': %s",

2
glib/glib-private.c
View File

@ -69,6 +69,8 @@ glib__private__ (void)
g_win32_pop_invalid_parameter_handler,
g_find_program_for_path,
g_uri_get_default_scheme_port,
};
return &table;

5
glib/glib-private.h
View File

@ -158,6 +158,8 @@ char *g_find_program_for_path (const char *program,
const char *path,
const char *working_dir);
int g_uri_get_default_scheme_port (const char *scheme);
#define GLIB_PRIVATE_CALL(symbol) (glib__private__()->symbol)
@ -222,6 +224,9 @@ typedef struct {
const char *path,
const char *working_dir);
/* See guri.c */
int (* g_uri_get_default_scheme_port) (const char *scheme);
/* Add other private functions here, initialize them in glib-private.c */
} GLibPrivateVTable;

9
glib/guri.c
View File

@ -25,6 +25,7 @@
#include "glib.h"
#include "glibintl.h"
#include "glib-private.h"
#include "guriprivate.h"
/**
@ -808,8 +809,8 @@ normalize_port (const char *scheme,
return port;
}
static int
default_scheme_port (const char *scheme)
int
g_uri_get_default_scheme_port (const char *scheme)
{
if (strcmp (scheme, "http") == 0 || strcmp (scheme, "ws") == 0)
return 80;
@ -1022,7 +1023,7 @@ g_uri_split_internal (const gchar *uri_string,
}
if (port && *port == -1)
*port = default_scheme_port (scheme_str);
*port = g_uri_get_default_scheme_port (scheme_str);
}
g_free (normalized_scheme);
@ -2510,7 +2511,7 @@ g_uri_get_port (GUri *uri)
g_return_val_if_fail (uri != NULL, -1);
if (uri->port == -1 && uri->flags & G_URI_FLAGS_SCHEME_NORMALIZE)
return default_scheme_port (uri->scheme);
return g_uri_get_default_scheme_port (uri->scheme);
return uri->port;
}