aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-06-16 21:35:24 +00:00
Code

prevent setting invalid combination of libstrophe flags

Browse Source 
Signed-off-by: Steffen Jaeckel <jaeckel-floss@eyet-services.de>
This commit is contained in:
Steffen Jaeckel 2023-01-26 16:03:57 +01:00
parent 901ef21727
commit b602d619f6
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/xmpp/connection.c
View File

@ -198,6 +198,10 @@ _conn_apply_settings(const char* const jid, const char* const passwd, const char
long flags = xmpp_conn_get_flags(conn.xmpp_conn);
/* clear all TLS & auth related flags */
flags &= ~(XMPP_CONN_FLAG_DISABLE_TLS | XMPP_CONN_FLAG_MANDATORY_TLS
| XMPP_CONN_FLAG_LEGACY_SSL | XMPP_CONN_FLAG_TRUST_TLS
| XMPP_CONN_FLAG_LEGACY_AUTH);
if (!tls_policy || (g_strcmp0(tls_policy, "force") == 0)) {
flags |= XMPP_CONN_FLAG_MANDATORY_TLS;
} else if (g_strcmp0(tls_policy, "trust") == 0) {
@ -213,8 +217,6 @@ _conn_apply_settings(const char* const jid, const char* const passwd, const char
flags |= XMPP_CONN_FLAG_LEGACY_AUTH;
}
xmpp_conn_set_flags(conn.xmpp_conn, flags);
/* Print debug logs that can help when users share the logs */
if (flags != 0) {
log_debug("Connecting with flags (0x%lx):", flags);
@ -230,6 +232,12 @@ _conn_apply_settings(const char* const jid, const char* const passwd, const char
#undef LOG_FLAG_IF_SET
}
if (xmpp_conn_set_flags(conn.xmpp_conn, flags)) {
log_error("libstrophe doesn't accept this combination of flags: 0x%x", flags);
conn.conn_status = JABBER_DISCONNECTED;
return FALSE;
}
char* cert_path = prefs_get_tls_certpath();
if (cert_path) {
xmpp_conn_set_capath(conn.xmpp_conn, cert_path);