MirrorHub
/
construct
mirror of https://github.com/matrix-construct/construct
0
0
Fork 0
Code Issues Releases Wiki Activity

ircd:Ⓜ️:keys: Improve pretty output format.

This commit is contained in:
Jason Volk 2023-03-04 21:27:20 -08:00
parent 95ed5ad905
commit 9a74602523
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
matrix/keys.cc
View File

@ -17,23 +17,18 @@ ircd::m::pretty_oneline(std::ostream &s,
char smbuf[32];
s << smalldate(smbuf, json::get<"valid_until_ts"_>(keys) / 1000L)
<< " (" << json::get<"valid_until_ts"_>(keys) << ")"
<< ' ';
for(const auto &[domain, verify_key_] : json::get<"verify_keys"_>(keys))
{
s << "key[ " << domain << ' ';
for(const auto &[key_id, verify_key] : json::object(verify_key_))
s << key_id << ' ';
s << "] ";
}
for(const auto &[key_id, verify_key_] : json::get<"verify_keys"_>(keys))
s << "[ " << key_id << "] ";
s << "sig ";
for(const auto &[domain, signature_] : json::get<"signatures"_>(keys))
{
s << "sig[ " << domain << ' ';
s << "[ " << domain << ' ';
for(const auto &[key_id, signature] : json::object(signature_))
s << key_id << ' ';
s << "] ";
s << "]";
}
return s;
@ -53,10 +48,9 @@ ircd::m::pretty(std::ostream &s,
<< " (" << json::get<"valid_until_ts"_>(keys) << ")"
<< '\n';
for(const auto &[domain, verify_key_] : json::get<"verify_keys"_>(keys))
for(const auto &[key_id, verify_key] : json::object(verify_key_))
for(const auto &[key_id, verify_key_] : json::get<"verify_keys"_>(keys))
for(const auto &[_, verify_key] : json::object(verify_key_))
s << std::setw(16) << std::right << "[verify_key] "
<< domain << ' '
<< key_id << ' '
<< unquote(verify_key) << '\n';
@ -67,10 +61,9 @@ ircd::m::pretty(std::ostream &s,
<< key_id << ' '
<< unquote(signature) << '\n';
for(const auto &[domain, old_verify_key_] : json::get<"old_verify_keys"_>(keys))
for(const auto &[key_id, old_verify_key] : json::object(old_verify_key_))
for(const auto &[key_id, old_verify_key_] : json::get<"old_verify_keys"_>(keys))
for(const auto &[_, old_verify_key] : json::object(old_verify_key_))
s << std::setw(16) << std::right << "[old_verify_key] "
<< domain << ' '
<< key_id << ' '
<< unquote(old_verify_key) << '\n';