devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-26 15:46:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show current TLS certificate

Browse Source
This commit is contained in:
James Booth
2015-11-10 01:20:40 +00:00
parent bee27f4773
commit 9302188a32
9 changed files with 98 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/event/server_events.c
View File

@@ -716,56 +716,22 @@ sv_ev_muc_occupant_online(const char *const room, const char *const nick, const
}
int
sv_ev_certfail(const char *const errormsg, const char *const certname, const char *const certfp,
const char *const notbefore, const char *const notafter)
sv_ev_certfail(const char *const errormsg, TLSCertificate *cert)
{
// check profanity trusted certs
if (tlscerts_exists(certfp)) {
if (tlscerts_exists(cert->fingerprint)) {
return 1;
}
// check current cert
char *current_fp = tlscerts_get_current();
if (current_fp && g_strcmp0(current_fp, certfp) == 0) {
if (current_fp && g_strcmp0(current_fp, cert->fingerprint) == 0) {
return 1;
}
char *domain = NULL;
char *org = NULL;
char *email = NULL;
gchar** fields = g_strsplit(certname, "/", 0);
int i = 0;
for (i = 0; i < g_strv_length(fields); i++) {
gchar** keyval = g_strsplit(fields[i], "=", 2);
if (g_strv_length(keyval) == 2) {
if (g_strcmp0(keyval[0], "CN") == 0) {
domain = strdup(keyval[1]);
}
if (g_strcmp0(keyval[0], "O") == 0) {
org = strdup(keyval[1]);
}
if (g_strcmp0(keyval[0], "emailAddress") == 0) {
email = strdup(keyval[1]);
}
}
g_strfreev(keyval);
}
g_strfreev(fields);
cons_show("");
cons_show_error("TLS certificate verification failed: %s", errormsg);
if (domain) {
cons_show(" Domain : %s", domain);
}
if (org) {
cons_show(" Organisation : %s", org);
}
if (email) {
cons_show(" Email : %s", email);
}
cons_show(" Fingerprint : %s", certfp);
cons_show(" Start : %s", notbefore);
cons_show(" End : %s", notafter);
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");
@@ -788,28 +754,17 @@ sv_ev_certfail(const char *const errormsg, const char *const certname, const cha
}
if (g_strcmp0(cmd, "/tls allow") == 0) {
tlscerts_set_current(certfp);
tlscerts_set_current(cert->fingerprint);
free(cmd);
free(domain);
free(org);
free(email);
return 1;
} else if (g_strcmp0(cmd, "/tls always") == 0) {
if (!tlscerts_exists(certfp)) {
TLSCertificate *cert = tlscerts_new(certfp, domain, org, email, notbefore, notafter);
if (!tlscerts_exists(cert->fingerprint)) {
tlscerts_add(cert);
tlscerts_free(cert);
}
free(cmd);
free(domain);
free(org);
free(email);
return 1;
} else {
free(cmd);
free(domain);
free(org);
free(email);
return 0;
}
}

3
src/event/server_events.h
View File

@@ -85,8 +85,7 @@ void sv_ev_muc_occupant_online(const char *const room, const char *const nick, c
void sv_ev_roster_update(const char *const barejid, const char *const name,
GSList *groups, const char *const subscription, gboolean pending_out);
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);
int sv_ev_certfail(const char *const errormsg, TLSCertificate *cert);
void sv_ev_lastactivity_response(const char *const from, const int seconds, const char *const msg);
#endif