mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-02-26 12:12:10 +01:00
gsocketclient: deprecate tls-validation-flags property
It doesn't work as expected, and you shouldn't be trying to use it anyway.
This commit is contained in:
parent
38de97c148
commit
d1e9e0c094
@ -289,7 +289,9 @@ g_socket_client_get_property (GObject *object,
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_TLS_VALIDATION_FLAGS:
|
case PROP_TLS_VALIDATION_FLAGS:
|
||||||
|
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
|
||||||
g_value_set_flags (value, g_socket_client_get_tls_validation_flags (client));
|
g_value_set_flags (value, g_socket_client_get_tls_validation_flags (client));
|
||||||
|
G_GNUC_END_IGNORE_DEPRECATIONS
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_PROXY_RESOLVER:
|
case PROP_PROXY_RESOLVER:
|
||||||
@ -340,7 +342,9 @@ g_socket_client_set_property (GObject *object,
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_TLS_VALIDATION_FLAGS:
|
case PROP_TLS_VALIDATION_FLAGS:
|
||||||
|
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
|
||||||
g_socket_client_set_tls_validation_flags (client, g_value_get_flags (value));
|
g_socket_client_set_tls_validation_flags (client, g_value_get_flags (value));
|
||||||
|
G_GNUC_END_IGNORE_DEPRECATIONS
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_PROXY_RESOLVER:
|
case PROP_PROXY_RESOLVER:
|
||||||
@ -679,9 +683,15 @@ g_socket_client_set_tls (GSocketClient *client,
|
|||||||
* Gets the TLS validation flags used creating TLS connections via
|
* Gets the TLS validation flags used creating TLS connections via
|
||||||
* @client.
|
* @client.
|
||||||
*
|
*
|
||||||
|
* This function does not work as originally designed and is impossible
|
||||||
|
* to use correctly. See #GSocketClient:tls-validation-flags for more
|
||||||
|
* information.
|
||||||
|
*
|
||||||
* Returns: the TLS validation flags
|
* Returns: the TLS validation flags
|
||||||
*
|
*
|
||||||
* Since: 2.28
|
* Since: 2.28
|
||||||
|
*
|
||||||
|
* Deprecated: 2.72: Do not attempt to ignore validation errors.
|
||||||
*/
|
*/
|
||||||
GTlsCertificateFlags
|
GTlsCertificateFlags
|
||||||
g_socket_client_get_tls_validation_flags (GSocketClient *client)
|
g_socket_client_get_tls_validation_flags (GSocketClient *client)
|
||||||
@ -697,7 +707,13 @@ g_socket_client_get_tls_validation_flags (GSocketClient *client)
|
|||||||
* Sets the TLS validation flags used when creating TLS connections
|
* Sets the TLS validation flags used when creating TLS connections
|
||||||
* via @client. The default value is %G_TLS_CERTIFICATE_VALIDATE_ALL.
|
* via @client. The default value is %G_TLS_CERTIFICATE_VALIDATE_ALL.
|
||||||
*
|
*
|
||||||
|
* This function does not work as originally designed and is impossible
|
||||||
|
* to use correctly. See #GSocketClient:tls-validation-flags for more
|
||||||
|
* information.
|
||||||
|
*
|
||||||
* Since: 2.28
|
* Since: 2.28
|
||||||
|
*
|
||||||
|
* Deprecated: 2.72: Do not attempt to ignore validation errors.
|
||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
g_socket_client_set_tls_validation_flags (GSocketClient *client,
|
g_socket_client_set_tls_validation_flags (GSocketClient *client,
|
||||||
@ -916,6 +932,29 @@ g_socket_client_class_init (GSocketClientClass *class)
|
|||||||
G_PARAM_CONSTRUCT |
|
G_PARAM_CONSTRUCT |
|
||||||
G_PARAM_READWRITE |
|
G_PARAM_READWRITE |
|
||||||
G_PARAM_STATIC_STRINGS));
|
G_PARAM_STATIC_STRINGS));
|
||||||
|
|
||||||
|
/**
|
||||||
|
* GSocketClient:tls-validation-flags:
|
||||||
|
*
|
||||||
|
* The TLS validation flags used when creating TLS connections. The
|
||||||
|
* default value is %G_TLS_CERTIFICATE_VALIDATE_ALL.
|
||||||
|
*
|
||||||
|
* GLib guarantees that if certificate verification fails, at least one
|
||||||
|
* flag will be set, but it does not guarantee that all possible flags
|
||||||
|
* will be set. Accordingly, you may not safely decide to ignore any
|
||||||
|
* particular type of error. For example, it would be incorrect to mask
|
||||||
|
* %G_TLS_CERTIFICATE_EXPIRED if you want to allow expired certificates,
|
||||||
|
* because this could potentially be the only error flag set even if
|
||||||
|
* other problems exist with the certificate. Therefore, there is no
|
||||||
|
* safe way to use this property. This is not a horrible problem,
|
||||||
|
* though, because you should not be attempting to ignore validation
|
||||||
|
* errors anyway. If you really must ignore TLS certificate errors,
|
||||||
|
* connect to the #GSocketClient::event signal, wait for it to be
|
||||||
|
* emitted with %G_SOCKET_CLIENT_TLS_HANDSHAKING, and use that to
|
||||||
|
* connect to #GTlsConnection::accept-certificate.
|
||||||
|
*
|
||||||
|
* Deprecated: 2.72: Do not attempt to ignore validation errors.
|
||||||
|
*/
|
||||||
g_object_class_install_property (gobject_class, PROP_TLS_VALIDATION_FLAGS,
|
g_object_class_install_property (gobject_class, PROP_TLS_VALIDATION_FLAGS,
|
||||||
g_param_spec_flags ("tls-validation-flags",
|
g_param_spec_flags ("tls-validation-flags",
|
||||||
P_("TLS validation flags"),
|
P_("TLS validation flags"),
|
||||||
@ -924,7 +963,8 @@ g_socket_client_class_init (GSocketClientClass *class)
|
|||||||
G_TLS_CERTIFICATE_VALIDATE_ALL,
|
G_TLS_CERTIFICATE_VALIDATE_ALL,
|
||||||
G_PARAM_CONSTRUCT |
|
G_PARAM_CONSTRUCT |
|
||||||
G_PARAM_READWRITE |
|
G_PARAM_READWRITE |
|
||||||
G_PARAM_STATIC_STRINGS));
|
G_PARAM_STATIC_STRINGS |
|
||||||
|
G_PARAM_DEPRECATED));
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* GSocketClient:proxy-resolver:
|
* GSocketClient:proxy-resolver:
|
||||||
@ -1209,8 +1249,10 @@ g_socket_client_connect (GSocketClient *client,
|
|||||||
|
|
||||||
if (tlsconn)
|
if (tlsconn)
|
||||||
{
|
{
|
||||||
|
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
|
||||||
g_tls_client_connection_set_validation_flags (G_TLS_CLIENT_CONNECTION (tlsconn),
|
g_tls_client_connection_set_validation_flags (G_TLS_CLIENT_CONNECTION (tlsconn),
|
||||||
client->priv->tls_validation_flags);
|
client->priv->tls_validation_flags);
|
||||||
|
G_GNUC_END_IGNORE_DEPRECATIONS
|
||||||
g_socket_client_emit_event (client, G_SOCKET_CLIENT_TLS_HANDSHAKING, connectable, connection);
|
g_socket_client_emit_event (client, G_SOCKET_CLIENT_TLS_HANDSHAKING, connectable, connection);
|
||||||
if (g_tls_connection_handshake (G_TLS_CONNECTION (tlsconn),
|
if (g_tls_connection_handshake (G_TLS_CONNECTION (tlsconn),
|
||||||
cancellable, &error_info->tmp_error))
|
cancellable, &error_info->tmp_error))
|
||||||
@ -1635,8 +1677,10 @@ g_socket_client_tls_handshake (ConnectionAttempt *attempt)
|
|||||||
&data->error_info->tmp_error);
|
&data->error_info->tmp_error);
|
||||||
if (tlsconn)
|
if (tlsconn)
|
||||||
{
|
{
|
||||||
|
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
|
||||||
g_tls_client_connection_set_validation_flags (G_TLS_CLIENT_CONNECTION (tlsconn),
|
g_tls_client_connection_set_validation_flags (G_TLS_CLIENT_CONNECTION (tlsconn),
|
||||||
data->client->priv->tls_validation_flags);
|
data->client->priv->tls_validation_flags);
|
||||||
|
G_GNUC_END_IGNORE_DEPRECATIONS
|
||||||
g_socket_client_emit_event (data->client, G_SOCKET_CLIENT_TLS_HANDSHAKING, data->connectable, G_IO_STREAM (tlsconn));
|
g_socket_client_emit_event (data->client, G_SOCKET_CLIENT_TLS_HANDSHAKING, data->connectable, G_IO_STREAM (tlsconn));
|
||||||
g_tls_connection_handshake_async (G_TLS_CONNECTION (tlsconn),
|
g_tls_connection_handshake_async (G_TLS_CONNECTION (tlsconn),
|
||||||
G_PRIORITY_DEFAULT,
|
G_PRIORITY_DEFAULT,
|
||||||
|
@ -110,9 +110,9 @@ gboolean g_socket_client_get_tls (GSocket
|
|||||||
GLIB_AVAILABLE_IN_2_28
|
GLIB_AVAILABLE_IN_2_28
|
||||||
void g_socket_client_set_tls (GSocketClient *client,
|
void g_socket_client_set_tls (GSocketClient *client,
|
||||||
gboolean tls);
|
gboolean tls);
|
||||||
GLIB_AVAILABLE_IN_2_28
|
GLIB_DEPRECATED_IN_2_72
|
||||||
GTlsCertificateFlags g_socket_client_get_tls_validation_flags (GSocketClient *client);
|
GTlsCertificateFlags g_socket_client_get_tls_validation_flags (GSocketClient *client);
|
||||||
GLIB_AVAILABLE_IN_2_28
|
GLIB_DEPRECATED_IN_2_72
|
||||||
void g_socket_client_set_tls_validation_flags (GSocketClient *client,
|
void g_socket_client_set_tls_validation_flags (GSocketClient *client,
|
||||||
GTlsCertificateFlags flags);
|
GTlsCertificateFlags flags);
|
||||||
GLIB_AVAILABLE_IN_2_36
|
GLIB_AVAILABLE_IN_2_36
|
||||||
|
Loading…
x
Reference in New Issue
Block a user