aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code

Allow /quit during TLS certificate verification prompt

Browse Source
This commit is contained in:
James Booth 2015-11-10 23:14:59 +00:00
parent 0bb596e14a
commit fcfdc175b6
3 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/event/server_events.c
View File

@ -47,6 +47,7 @@
#include "roster_list.h"
#include "window_list.h"
#include "config/tlscerts.h"
#include "profanity.h"
#ifdef HAVE_LIBOTR
#include "otr/otr.h"
@ -733,9 +734,9 @@ sv_ev_certfail(const char *const errormsg, TLSCertificate *cert)
cons_show_error("TLS certificate verification failed: %s", errormsg);
cons_show_tlscert(cert);
cons_show("");
cons_show("Use '/tls allow' to accept this certificate");
cons_show("Use '/tls always' to accept this certificate permanently");
cons_show("Use '/tls deny' to reject this certificate");
cons_show("Use '/tls allow' to accept this certificate.");
cons_show("Use '/tls always' to accept this certificate permanently.");
cons_show("Use '/tls deny' to reject this certificate.");
cons_show("");
ui_update();
@ -743,10 +744,11 @@ sv_ev_certfail(const char *const errormsg, TLSCertificate *cert)
while ((g_strcmp0(cmd, "/tls allow") != 0)
&& (g_strcmp0(cmd, "/tls always") != 0)
&& (g_strcmp0(cmd, "/tls deny") != 0)) {
cons_show("Use '/tls allow' to accept this certificate");
cons_show("Use '/tls always' to accept this certificate permanently");
cons_show("Use '/tls deny' to reject this certificate");
&& (g_strcmp0(cmd, "/tls deny") != 0)
&& (g_strcmp0(cmd, "/quit") != 0)) {
cons_show("Use '/tls allow' to accept this certificate.");
cons_show("Use '/tls always' to accept this certificate permanently.");
cons_show("Use '/tls deny' to reject this certificate.");
cons_show("");
ui_update();
free(cmd);
@ -754,16 +756,23 @@ sv_ev_certfail(const char *const errormsg, TLSCertificate *cert)
}
if (g_strcmp0(cmd, "/tls allow") == 0) {
cons_show("Coninuing with connection.");
tlscerts_set_current(cert->fingerprint);
free(cmd);
return 1;
} else if (g_strcmp0(cmd, "/tls always") == 0) {
cons_show("Adding %s to trusted certificates.", cert->fingerprint);
if (!tlscerts_exists(cert->fingerprint)) {
tlscerts_add(cert);
}
free(cmd);
return 1;
} else if (g_strcmp0(cmd, "/quit") == 0) {
prof_set_quit();
free(cmd);
return 0;
} else {
cons_show("Aborting connection.");
free(cmd);
return 0;
}

9
src/profanity.c
View File

@ -90,6 +90,7 @@ resource_presence_t saved_presence;
char *saved_status;
static gboolean cont = TRUE;
static gboolean force_quit = FALSE;
void
prof_run(char *log_level, char *account_name)
@ -104,7 +105,7 @@ prof_run(char *log_level, char *account_name)
saved_status = NULL;
char *line = NULL;
while(cont) {
while(cont && !force_quit) {
log_stderr_handler();
_check_autoaway();
@ -127,6 +128,12 @@ prof_run(char *log_level, char *account_name)
}
}
void
prof_set_quit(void)
{
force_quit = TRUE;
}
void
prof_handle_idle(void)
{

2
src/profanity.h
View File

@ -45,4 +45,6 @@ void prof_handle_activity(void);
gboolean process_input(char *inp);
void prof_set_quit(void);
#endif