mike/biboumi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support a trusted SHA1 fingerprint to be configured for each IRC server

Browse Source
This commit is contained in:
Florent Le Coz
2016-01-04 13:47:27 +01:00
parent a38b17692e
commit 1f8333f23f
6 changed files with 47 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/irc/irc_client.cpp
+7
View File
@@ -89,6 +89,13 @@ void IrcClient::start()
this->bind_addr = Config::get("outgoing_bind", "");
#ifdef BOTAN_FOUND
# ifdef USE_DATABASE
auto options = Database::get_irc_server_options(this->bridge.get_bare_jid(),
this->get_hostname());
this->credential_manager.set_trusted_fingerprint(options.trustedFingerprint);
# endif
#endif
this->connect(this->hostname, port, tls);
}
src/xmpp/biboumi_adhoc_commands.cpp
+21 -1
View File
@@ -175,6 +175,19 @@ void ConfigureIrcServerStep1(XmppComponent&, AdhocSession& session, XmlNode& com
verify_cert_value.set_inner("false");
verify_cert.add_child(std::move(verify_cert_value));
x.add_child(std::move(verify_cert));
XmlNode fingerprint("field");
fingerprint["var"] = "fingerprint";
fingerprint["type"] = "text-single";
fingerprint["label"] = "SHA-1 fingerprint of the TLS certificate to trust.";
if (!options.trustedFingerprint.value().empty())
{
XmlNode fingerprint_value("value");
fingerprint_value.set_inner(options.trustedFingerprint.value());
fingerprint.add_child(std::move(fingerprint_value));
}
fingerprint.add_child(required);
x.add_child(std::move(fingerprint));
#endif
XmlNode pass("field");
@@ -295,12 +308,19 @@ void ConfigureIrcServerStep2(XmppComponent&, AdhocSession& session, XmlNode& com
options.tlsPorts = ports;
}
else if (field->get_tag("var") == "verify_cert" && value
else if (field->get_tag("var") == "verify_cert" && value
&& !value->get_inner().empty())
{
auto val = to_bool(value->get_inner());
options.verifyCert = val;
}
else if (field->get_tag("var") == "fingerprint" && value &&
!value->get_inner().empty())
{
options.trustedFingerprint = value->get_inner();
}
#endif // BOTAN_FOUND
else if (field->get_tag("var") == "pass" &&