pull sasl config out of registration
This commit is contained in:
@@ -4,6 +4,7 @@
|
||||
#include "connection.hpp"
|
||||
#include "openssl_utils.hpp"
|
||||
#include "registration.hpp"
|
||||
#include "sasl_mechanism.hpp"
|
||||
#include "settings.hpp"
|
||||
#include "ref.hpp"
|
||||
#include "irc_coroutine.hpp"
|
||||
@@ -15,11 +16,37 @@
|
||||
#include <openssl/pem.h>
|
||||
|
||||
#include <fstream>
|
||||
#include <iostream>
|
||||
#include <memory>
|
||||
|
||||
using namespace std::literals;
|
||||
|
||||
auto configure_sasl(const Settings &settings) -> std::unique_ptr<SaslMechanism>
|
||||
{
|
||||
if (settings.sasl_mechanism == "PLAIN" &&
|
||||
not settings.sasl_authcid.empty()
|
||||
) {
|
||||
return std::make_unique<SaslPlain>(
|
||||
settings.sasl_authcid,
|
||||
settings.sasl_authzid,
|
||||
settings.sasl_password);
|
||||
|
||||
} else if (settings.sasl_mechanism == "EXTERNAL") {
|
||||
return std::make_unique<SaslExternal>(settings.sasl_authzid);
|
||||
|
||||
} else if (
|
||||
settings.sasl_mechanism == "ECDSA" &&
|
||||
not settings.sasl_authcid.empty() &&
|
||||
not settings.sasl_key_file.empty()
|
||||
|
||||
) {
|
||||
if (auto sasl_key = key_from_file(settings.sasl_key_file, settings.sasl_key_password))
|
||||
return std::make_unique<SaslEcdsa>(
|
||||
settings.sasl_authcid,
|
||||
settings.sasl_authzid,
|
||||
std::move(sasl_key));
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
static auto start(boost::asio::io_context &io, const Settings &settings) -> void
|
||||
{
|
||||
@@ -35,11 +62,7 @@ static auto start(boost::asio::io_context &io, const Settings &settings) -> void
|
||||
tls_key = key_from_file(settings.tls_key_file, settings.tls_key_password);
|
||||
}
|
||||
|
||||
Ref<EVP_PKEY> sasl_key;
|
||||
if (not settings.sasl_key_file.empty())
|
||||
{
|
||||
sasl_key = key_from_file(settings.sasl_key_file, settings.sasl_key_password);
|
||||
}
|
||||
auto sasl_mech = configure_sasl(settings);
|
||||
|
||||
const auto connection = std::make_shared<Connection>(io);
|
||||
const auto client = Client::start(connection);
|
||||
@@ -48,11 +71,7 @@ static auto start(boost::asio::io_context &io, const Settings &settings) -> void
|
||||
.realname = settings.realname,
|
||||
.username = settings.username,
|
||||
.password = settings.password,
|
||||
.sasl_mechanism = settings.sasl_mechanism,
|
||||
.sasl_authcid = settings.sasl_authcid,
|
||||
.sasl_authzid = settings.sasl_authzid,
|
||||
.sasl_password = settings.sasl_password,
|
||||
.sasl_key = std::move(sasl_key),
|
||||
.sasl_mechanism = std::move(sasl_mech),
|
||||
}, client);
|
||||
const auto bot = Bot::start(client);
|
||||
|
||||
|
Reference in New Issue
Block a user