MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-06-28 23:08:20 +02:00
Code Issues Releases Wiki Activity

modules/console: Combine key / keys cmds.

Browse source
This commit is contained in:
Jason Volk 2019-06-23 16:23:10 -07:00
parent 37760fe251
commit 7906ca1060
1 changed files with 29 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
modules/console.cc
View file

@ -5409,19 +5409,34 @@ console_cmd__crt(opt &out, const string_view &line)
bool
console_cmd__key(opt &out, const string_view &line)
{
out << "origin: " << m::my_host() << std::endl;
out << "public key ID: " << m::self::public_key_id << std::endl;
out << "public key base64: " << m::self::public_key_b64 << std::endl;
out << "TLS cert sha256 base64: " << m::self::tls_cert_der_sha256_b64 << std::endl;
const params param{line, " ",
{
"server_name"
}};
return true;
}
const auto &server_name
{
param["server_name"]
};
// information on my current key
if(!server_name)
{
out << "origin: " << m::my_host() << std::endl;
out << "public key ID: " << m::self::public_key_id << std::endl;
out << "public key base64: " << m::self::public_key_b64 << std::endl;
out << "TLS cert sha256 base64: " << m::self::tls_cert_der_sha256_b64 << std::endl;
return true;
}
// keys cached for server by param.
m::keys::cache::for_each(server_name, [&out]
(const json::object &object)
{
out << object << std::endl;
return true;
});
bool
console_cmd__key__create(opt &out, const string_view &line)
{
m::self::create_my_key();
out << "done" << std::endl;
return true;
}
@ -5469,30 +5484,11 @@ console_cmd__key__get(opt &out, const string_view &line)
return true;
}
//
// keys
//
bool
console_cmd__keys(opt &out, const string_view &line)
console_cmd__key__create(opt &out, const string_view &line)
{
const params param{line, " ",
{
"server_name"
}};
const auto &server_name
{
param.at("server_name")
};
m::keys::cache::for_each(server_name, [&out]
(const json::object &object)
{
out << object << std::endl;
return true;
});
m::self::create_my_key();
out << "done" << std::endl;
return true;
}