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

Merge branch 'backport-socks5-fixes-glib-2-64' into 'glib-2-64'

Browse Source 
Backport SOCKS5 fixes to glib-2-64

See merge request GNOME/glib!1412
This commit is contained in:
Sebastian Dröge 2020-03-10 16:10:51 +00:00
commit 41e37de3ac
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gio/gsocks5proxy.c
View File

@ -170,8 +170,22 @@ parse_nego_reply (const guint8 *data,
*must_auth = TRUE; *must_auth = TRUE;
break; break;
case SOCKS5_AUTH_GSSAPI:
case SOCKS5_AUTH_NO_ACCEPT: case SOCKS5_AUTH_NO_ACCEPT:
if (!has_auth)
{
/* The server has said it accepts none of our authentication methods,
* but given the slightly odd implementation of set_nego_msg(), we
* actually only gave it the choice of %SOCKS5_AUTH_NONE, since the
* caller specified no username or password.
* Return %G_IO_ERROR_PROXY_NEED_AUTH so the caller knows that if
* they specify a username and password and try again, authentication
* might succeed (since we’ll send %SOCKS5_AUTH_USR_PASS next time). */
g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_PROXY_NEED_AUTH,
_("The SOCKSv5 proxy requires authentication."));
return FALSE;
}
G_GNUC_FALLTHROUGH;
case SOCKS5_AUTH_GSSAPI:
default: default:
g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_PROXY_AUTH_FAILED, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_PROXY_AUTH_FAILED,
_("The SOCKSv5 proxy requires an authentication " _("The SOCKSv5 proxy requires an authentication "
@ -229,7 +243,7 @@ set_auth_msg (guint8 *msg,
static gboolean static gboolean
check_auth_status (const guint8 *data, GError **error) check_auth_status (const guint8 *data, GError **error)
{ {
if (data[0] != SOCKS5_VERSION if (data[0] != SOCKS5_AUTH_VERSION
|| data[1] != SOCKS5_REP_SUCCEEDED) || data[1] != SOCKS5_REP_SUCCEEDED)
{ {
g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_PROXY_AUTH_FAILED, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_PROXY_AUTH_FAILED,