From 92371040afe91722867dcebec7209e57e27b1dae Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Tue, 26 Feb 2019 10:28:30 -0800 Subject: [PATCH] modules/m_event: Move essential() definitions; minor reorg. --- modules/m_event.cc | 414 ++++++++++++++++++++++----------------------- 1 file changed, 207 insertions(+), 207 deletions(-) diff --git a/modules/m_event.cc b/modules/m_event.cc index 9b37ba81d..2aecc06f2 100644 --- a/modules/m_event.cc +++ b/modules/m_event.cc @@ -17,213 +17,6 @@ IRCD_MODULE "Matrix event library; modular components." }; -void -IRCD_MODULE_EXPORT -ircd::m::event::essential(json::iov &event, - const json::iov &contents, - const event::closure_iov_mutable &closure) -{ - const auto &type - { - event.at("type") - }; - - if(type == "m.room.aliases") - { - const json::iov::push _content{event, - { - "content", json::members - { - { "aliases", contents.at("aliases") } - } - }}; - - closure(event); - } - else if(type == "m.room.create") - { - const json::iov::push _content{event, - { - "content", json::members - { - { "creator", contents.at("creator") } - } - }}; - - closure(event); - } - else if(type == "m.room.history_visibility") - { - const json::iov::push _content{event, - { - "content", json::members - { - { "history_visibility", contents.at("history_visibility") } - } - }}; - - closure(event); - } - else if(type == "m.room.join_rules") - { - const json::iov::push _content{event, - { - "content", json::members - { - { "join_rule", contents.at("join_rule") } - } - }}; - - closure(event); - } - else if(type == "m.room.member") - { - const json::iov::push _content{event, - { - "content", json::members - { - { "membership", contents.at("membership") } - } - }}; - - closure(event); - } - else if(type == "m.room.power_levels") - { - const json::iov::push _content{event, - { - "content", json::members - { - { "ban", contents.at("ban") }, - { "events", contents.at("events") }, - { "events_default", contents.at("events_default") }, - { "kick", contents.at("kick") }, - { "redact", contents.at("redact") }, - { "state_default", contents.at("state_default") }, - { "users", contents.at("users") }, - { "users_default", contents.at("users_default") }, - } - }}; - - closure(event); - } - else if(type == "m.room.redaction") - { - // This simply finds the redacts key and swaps it with jsundefined for - // the scope's duration. The redacts key will still be present and - // visible in the json::iov which is incorrect if directly serialized. - // However, this iov is turned into a json::tuple (m::event) which ends - // up being serialized for signing. That serialization is where the - // jsundefined redacts value is ignored. - auto &redacts{event.at("redacts")}; - json::value temp(std::move(redacts)); - redacts = json::value{}; - const unwind _{[&redacts, &temp] - { - redacts = std::move(temp); - }}; - - const json::iov::push _content - { - event, { "content", "{}" } - }; - - closure(event); - } - else - { - const json::iov::push _content - { - event, { "content", "{}" } - }; - - closure(event); - } -} - -ircd::m::event -IRCD_MODULE_EXPORT -ircd::m::essential(m::event event, - const mutable_buffer &contentbuf) -{ - const auto &type - { - json::at<"type"_>(event) - }; - - json::object &content - { - json::get<"content"_>(event) - }; - - mutable_buffer essential - { - contentbuf - }; - - if(type == "m.room.aliases") - { - content = json::stringify(essential, json::members - { - { "aliases", unquote(content.at("aliases")) } - }); - } - else if(type == "m.room.create") - { - content = json::stringify(essential, json::members - { - { "creator", unquote(content.at("creator")) } - }); - } - else if(type == "m.room.history_visibility") - { - content = json::stringify(essential, json::members - { - { "history_visibility", unquote(content.at("history_visibility")) } - }); - } - else if(type == "m.room.join_rules") - { - content = json::stringify(essential, json::members - { - { "join_rule", unquote(content.at("join_rule")) } - }); - } - else if(type == "m.room.member") - { - content = json::stringify(essential, json::members - { - { "membership", unquote(content.at("membership")) } - }); - } - else if(type == "m.room.power_levels") - { - content = json::stringify(essential, json::members - { - { "ban", unquote(content.at("ban")) }, - { "events", unquote(content.at("events")) }, - { "events_default", unquote(content.at("events_default")) }, - { "kick", unquote(content.at("kick")) }, - { "redact", unquote(content.at("redact")) }, - { "state_default", unquote(content.at("state_default")) }, - { "users", unquote(content.at("users")) }, - { "users_default", unquote(content.at("users_default")) }, - }); - } - else if(type == "m.room.redaction") - { - json::get<"redacts"_>(event) = string_view{}; - content = "{}"_sv; - } - else - { - content = "{}"_sv; - } - - json::get<"signatures"_>(event) = {}; - return event; -} - std::ostream & IRCD_MODULE_EXPORT ircd::m::pretty(std::ostream &s, @@ -1238,3 +1031,210 @@ ircd::m::event::auth::is_power_event(const m::event &event) return false; } + +void +IRCD_MODULE_EXPORT +ircd::m::event::essential(json::iov &event, + const json::iov &contents, + const event::closure_iov_mutable &closure) +{ + const auto &type + { + event.at("type") + }; + + if(type == "m.room.aliases") + { + const json::iov::push _content{event, + { + "content", json::members + { + { "aliases", contents.at("aliases") } + } + }}; + + closure(event); + } + else if(type == "m.room.create") + { + const json::iov::push _content{event, + { + "content", json::members + { + { "creator", contents.at("creator") } + } + }}; + + closure(event); + } + else if(type == "m.room.history_visibility") + { + const json::iov::push _content{event, + { + "content", json::members + { + { "history_visibility", contents.at("history_visibility") } + } + }}; + + closure(event); + } + else if(type == "m.room.join_rules") + { + const json::iov::push _content{event, + { + "content", json::members + { + { "join_rule", contents.at("join_rule") } + } + }}; + + closure(event); + } + else if(type == "m.room.member") + { + const json::iov::push _content{event, + { + "content", json::members + { + { "membership", contents.at("membership") } + } + }}; + + closure(event); + } + else if(type == "m.room.power_levels") + { + const json::iov::push _content{event, + { + "content", json::members + { + { "ban", contents.at("ban") }, + { "events", contents.at("events") }, + { "events_default", contents.at("events_default") }, + { "kick", contents.at("kick") }, + { "redact", contents.at("redact") }, + { "state_default", contents.at("state_default") }, + { "users", contents.at("users") }, + { "users_default", contents.at("users_default") }, + } + }}; + + closure(event); + } + else if(type == "m.room.redaction") + { + // This simply finds the redacts key and swaps it with jsundefined for + // the scope's duration. The redacts key will still be present and + // visible in the json::iov which is incorrect if directly serialized. + // However, this iov is turned into a json::tuple (m::event) which ends + // up being serialized for signing. That serialization is where the + // jsundefined redacts value is ignored. + auto &redacts{event.at("redacts")}; + json::value temp(std::move(redacts)); + redacts = json::value{}; + const unwind _{[&redacts, &temp] + { + redacts = std::move(temp); + }}; + + const json::iov::push _content + { + event, { "content", "{}" } + }; + + closure(event); + } + else + { + const json::iov::push _content + { + event, { "content", "{}" } + }; + + closure(event); + } +} + +ircd::m::event +IRCD_MODULE_EXPORT +ircd::m::essential(m::event event, + const mutable_buffer &contentbuf) +{ + const auto &type + { + json::at<"type"_>(event) + }; + + json::object &content + { + json::get<"content"_>(event) + }; + + mutable_buffer essential + { + contentbuf + }; + + if(type == "m.room.aliases") + { + content = json::stringify(essential, json::members + { + { "aliases", unquote(content.at("aliases")) } + }); + } + else if(type == "m.room.create") + { + content = json::stringify(essential, json::members + { + { "creator", unquote(content.at("creator")) } + }); + } + else if(type == "m.room.history_visibility") + { + content = json::stringify(essential, json::members + { + { "history_visibility", unquote(content.at("history_visibility")) } + }); + } + else if(type == "m.room.join_rules") + { + content = json::stringify(essential, json::members + { + { "join_rule", unquote(content.at("join_rule")) } + }); + } + else if(type == "m.room.member") + { + content = json::stringify(essential, json::members + { + { "membership", unquote(content.at("membership")) } + }); + } + else if(type == "m.room.power_levels") + { + content = json::stringify(essential, json::members + { + { "ban", unquote(content.at("ban")) }, + { "events", unquote(content.at("events")) }, + { "events_default", unquote(content.at("events_default")) }, + { "kick", unquote(content.at("kick")) }, + { "redact", unquote(content.at("redact")) }, + { "state_default", unquote(content.at("state_default")) }, + { "users", unquote(content.at("users")) }, + { "users_default", unquote(content.at("users_default")) }, + }); + } + else if(type == "m.room.redaction") + { + json::get<"redacts"_>(event) = string_view{}; + content = "{}"_sv; + } + else + { + content = "{}"_sv; + } + + json::get<"signatures"_>(event) = {}; + return event; +}