MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-06-09 05:29:00 +02:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️:request::x_matrix: Cleanup interface; simplify extra split; structured bindings.

Browse source
This commit is contained in:
Jason Volk 2020-04-12 14:15:22 -07:00
parent 8058fbc6e9
commit 3b985043d6
2 changed files with 40 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/ircd/m/request.h
View file

@ -72,6 +72,8 @@ struct ircd::m::request::x_matrix
string_view key;
string_view sig;
x_matrix(const string_view &);
x_matrix(const string_view &type, const string_view &values);
x_matrix(const pair<string_view> &authorization);
x_matrix(const string_view &authorization);
x_matrix() = default;
};

45
matrix/request.cc
View file

@ -306,10 +306,31 @@ ircd::m::request::verify(const ed25519::pk &pk,
// x_matrix
//
ircd::m::request::x_matrix::x_matrix(const string_view &input)
ircd::m::request::x_matrix::x_matrix(const string_view &authorization)
:x_matrix
{
split(authorization, ' ')
}
{
}
ircd::m::request::x_matrix::x_matrix(const pair<string_view> &authorization)
:x_matrix
{
authorization.first,
authorization.second
}
{
}
ircd::m::request::x_matrix::x_matrix(const string_view &type,
const string_view &values)
{
// Assumes caller determined this is X-Matrix lest they suffer exception.
assert(iequals(type, "X-Matrix"_sv));
string_view tokens[3];
if(ircd::tokens(split(input, ' ').second, ',', tokens) != 3)
if(ircd::tokens(values, ',', tokens) != 3)
throw std::out_of_range
{
"The x_matrix header is malformed"
@ -317,13 +338,21 @@ ircd::m::request::x_matrix::x_matrix(const string_view &input)
for(const auto &token : tokens)
{
const auto &kv{split(token, '=')};
const auto &val{unquote(kv.second)};
switch(hash(kv.first))
const auto &[key, val_]
{
case hash("origin"): origin = val; break;
case hash("key"): key = val; break;
case hash("sig"): sig = val; break;
split(token, '=')
};
const auto &val
{
unquote(val_)
};
switch(hash(key))
{
case hash("origin"): this->origin = val; break;
case hash("key"): this->key = val; break;
case hash("sig"): this->sig = val; break;
}
}