aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-01-03 14:57:42 -05:00
Code

Added TLS cert fail callback

Browse Source
This commit is contained in:
James Booth 2015-09-22 20:55:41 +01:00
parent b24529171f
commit 74151e6419
3 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/event/server_events.c
View File

@ -638,3 +638,18 @@ sv_ev_muc_occupant_online(const char * const room, const char * const nick, cons
occupantswin_occupants(room); occupantswin_occupants(room);
} }
} }
int
sv_ev_certfail(const char * const errormsg, const char * const certname, const char * const certfp,
const char * const notbefore, const char * const notafter)
{
cons_show("");
cons_show_error("TLS certficiate verification failed: %s", errormsg);
cons_show(" Issuer : %s", certname);
cons_show(" Fingerprint : %s", certfp);
cons_show(" Start : %s", notbefore);
cons_show(" End : %s", notafter);
cons_show("");
return 1;
}

3
src/event/server_events.h
View File

@ -86,5 +86,8 @@ void sv_ev_muc_occupant_online(const char * const room, const char * const nick,
void sv_ev_roster_update(const char * const barejid, const char * const name, void sv_ev_roster_update(const char * const barejid, const char * const name,
GSList *groups, const char * const subscription, gboolean pending_out); GSList *groups, const char * const subscription, gboolean pending_out);
void sv_ev_roster_received(void); void sv_ev_roster_received(void);
int sv_ev_certfail(const char * const errormsg, const char * const certname, const char * const certfp,
const char * const notbefore, const char * const notafter);
#endif #endif

12
src/xmpp/connection.c
View File

@ -94,13 +94,16 @@ static GTimer *reconnect_timer;
static log_level_t _get_log_level(xmpp_log_level_t xmpp_level); static log_level_t _get_log_level(xmpp_log_level_t xmpp_level);
static xmpp_log_level_t _get_xmpp_log_level(); static xmpp_log_level_t _get_xmpp_log_level();
static void _xmpp_file_logger(void * const userdata, static void _xmpp_file_logger(void * const userdata,
const xmpp_log_level_t level, const char * const area, const xmpp_log_level_t level, const char * const area,
const char * const msg); const char * const msg);
static xmpp_log_t * _xmpp_get_file_logger(); static xmpp_log_t * _xmpp_get_file_logger();
static jabber_conn_status_t _jabber_connect(const char * const fulljid, static jabber_conn_status_t _jabber_connect(const char * const fulljid,
const char * const passwd, const char * const altdomain, int port); const char * const passwd, const char * const altdomain, int port);
static void _jabber_reconnect(void); static void _jabber_reconnect(void);
static void _connection_handler(xmpp_conn_t * const conn, static void _connection_handler(xmpp_conn_t * const conn,
@ -357,6 +360,13 @@ _connection_free_session_data(void)
presence_clear_sub_requests(); presence_clear_sub_requests();
} }
static int
_connection_certfail_cb(const char * const certname, const char * const certfp,
char * const notbefore, const char * const notafter, const char * const errormsg)
{
return sv_ev_certfail(errormsg, certname, certfp, notbefore, notafter);
}
static jabber_conn_status_t static jabber_conn_status_t
_jabber_connect(const char * const fulljid, const char * const passwd, _jabber_connect(const char * const fulljid, const char * const passwd,
const char * const altdomain, int port) const char * const altdomain, int port)
@ -408,7 +418,7 @@ _jabber_connect(const char * const fulljid, const char * const passwd,
} }
int connect_status = xmpp_connect_client(jabber_conn.conn, altdomain, port, int connect_status = xmpp_connect_client(jabber_conn.conn, altdomain, port,
_connection_handler, jabber_conn.ctx); _connection_certfail_cb, _connection_handler, jabber_conn.ctx);
if (connect_status == 0) if (connect_status == 0)
jabber_conn.conn_status = JABBER_CONNECTING; jabber_conn.conn_status = JABBER_CONNECTING;