mirror of
https://github.com/matrix-construct/construct
synced 2024-12-29 08:54:02 +01:00
ircd:Ⓜ️ Merge m_request.cc into m.cc
This commit is contained in:
Jason Volk
parent
cd30a01e9d
commit
f01a72c8f6
3 changed files with 280 additions and 284 deletions
|
|
@ -136,7 +136,6 @@ libircd_la_SOURCES = \
|
|||
m_dbs.cc \
|
||||
m_state.cc \
|
||||
m_room.cc \
|
||||
m_request.cc \
|
||||
m_v1.cc \
|
||||
m.cc \
|
||||
ircd.cc \
|
||||
|
|
|
|||
280
ircd/m.cc
280
ircd/m.cc
|
|
@ -3475,6 +3475,286 @@ ircd::m::txn::create_id(const mutable_buffer &out,
|
|||
return txnid;
|
||||
}
|
||||
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// m/request.h
|
||||
//
|
||||
|
||||
//
|
||||
// request
|
||||
//
|
||||
|
||||
ircd::m::request::request(const string_view &method,
|
||||
const string_view &uri,
|
||||
const mutable_buffer &body_buf,
|
||||
const json::members &body)
|
||||
:request
|
||||
{
|
||||
my_host(),
|
||||
string_view{},
|
||||
method,
|
||||
uri,
|
||||
json::stringify(mutable_buffer{body_buf}, body)
|
||||
}
|
||||
{}
|
||||
|
||||
ircd::m::request::request(const string_view &method,
|
||||
const string_view &uri)
|
||||
:request
|
||||
{
|
||||
my_host(),
|
||||
string_view{},
|
||||
method,
|
||||
uri,
|
||||
json::object{}
|
||||
}
|
||||
{}
|
||||
|
||||
ircd::m::request::request(const string_view &method,
|
||||
const string_view &uri,
|
||||
const json::object &content)
|
||||
:request
|
||||
{
|
||||
my_host(),
|
||||
string_view{},
|
||||
method,
|
||||
uri,
|
||||
content
|
||||
}
|
||||
{}
|
||||
|
||||
ircd::m::request::request(const string_view &origin,
|
||||
const string_view &destination,
|
||||
const string_view &method,
|
||||
const string_view &uri,
|
||||
const json::object &content)
|
||||
{
|
||||
json::get<"origin"_>(*this) = origin;
|
||||
json::get<"destination"_>(*this) = destination;
|
||||
json::get<"method"_>(*this) = method;
|
||||
json::get<"uri"_>(*this) = uri;
|
||||
json::get<"content"_>(*this) = content;
|
||||
}
|
||||
|
||||
ircd::string_view
|
||||
ircd::m::request::operator()(const mutable_buffer &out,
|
||||
const vector_view<const http::header> &addl_headers)
|
||||
const
|
||||
{
|
||||
const ctx::critical_assertion ca;
|
||||
static const size_t headers_max{32};
|
||||
thread_local http::header header[headers_max];
|
||||
size_t headers{0};
|
||||
|
||||
header[headers++] =
|
||||
{
|
||||
"User-Agent", info::user_agent
|
||||
};
|
||||
|
||||
thread_local char x_matrix[2_KiB];
|
||||
if(startswith(at<"uri"_>(*this), "/_matrix/federation"))
|
||||
{
|
||||
const auto &sk{self::secret_key};
|
||||
const auto &pkid{self::public_key_id};
|
||||
header[headers++] =
|
||||
{
|
||||
"Authorization", generate(x_matrix, sk, pkid)
|
||||
};
|
||||
}
|
||||
|
||||
assert(headers <= headers_max);
|
||||
assert(headers + addl_headers.size() <= headers_max);
|
||||
for(size_t i(0); i < addl_headers.size() && headers < headers_max; ++i)
|
||||
header[headers++] = addl_headers.at(i);
|
||||
|
||||
static const string_view content_type
|
||||
{
|
||||
"application/json; charset=utf-8"_sv
|
||||
};
|
||||
|
||||
const auto content_length
|
||||
{
|
||||
string_view(json::get<"content"_>(*this)).size()
|
||||
};
|
||||
|
||||
window_buffer sb{out};
|
||||
http::request
|
||||
{
|
||||
sb,
|
||||
at<"destination"_>(*this),
|
||||
at<"method"_>(*this),
|
||||
at<"uri"_>(*this),
|
||||
content_length,
|
||||
content_type,
|
||||
{ header, headers }
|
||||
};
|
||||
|
||||
return sb.completed();
|
||||
}
|
||||
|
||||
ircd::string_view
|
||||
ircd::m::request::generate(const mutable_buffer &out,
|
||||
const ed25519::sk &sk,
|
||||
const string_view &pkid)
|
||||
const
|
||||
{
|
||||
static const size_t request_content_max
|
||||
{
|
||||
1_MiB
|
||||
};
|
||||
|
||||
const ctx::critical_assertion ca;
|
||||
thread_local char buf[request_content_max];
|
||||
if(unlikely(json::serialized(*this) > sizeof(buf)))
|
||||
throw m::error
|
||||
{
|
||||
"M_REQUEST_TOO_LARGE", "This server generated a request of %zu bytes; limit is %zu",
|
||||
json::serialized(*this),
|
||||
sizeof(buf)
|
||||
};
|
||||
|
||||
const json::object object
|
||||
{
|
||||
stringify(mutable_buffer{buf}, *this)
|
||||
};
|
||||
|
||||
const ed25519::sig sig
|
||||
{
|
||||
self::secret_key.sign(object)
|
||||
};
|
||||
|
||||
const auto &origin
|
||||
{
|
||||
unquote(string_view{at<"origin"_>(*this)})
|
||||
};
|
||||
|
||||
thread_local char sigb64[1_KiB];
|
||||
return fmt::sprintf
|
||||
{
|
||||
out, "X-Matrix origin=%s,key=\"%s\",sig=\"%s\"",
|
||||
origin,
|
||||
pkid,
|
||||
b64encode_unpadded(sigb64, sig)
|
||||
};
|
||||
}
|
||||
|
||||
bool
|
||||
ircd::m::request::verify(const string_view &key,
|
||||
const string_view &sig_)
|
||||
const
|
||||
{
|
||||
const ed25519::sig sig
|
||||
{
|
||||
[&sig_](auto &buf)
|
||||
{
|
||||
b64decode(buf, sig_);
|
||||
}
|
||||
};
|
||||
|
||||
const m::node::id::buf node_id
|
||||
{
|
||||
m::node::id::origin, unquote(at<"origin"_>(*this))
|
||||
};
|
||||
|
||||
const m::node node
|
||||
{
|
||||
node_id
|
||||
};
|
||||
|
||||
bool verified{false};
|
||||
node.key(key, [this, &verified, &sig]
|
||||
(const ed25519::pk &pk)
|
||||
{
|
||||
verified = verify(pk, sig);
|
||||
});
|
||||
|
||||
return verified;
|
||||
}
|
||||
|
||||
bool
|
||||
ircd::m::request::verify(const ed25519::pk &pk,
|
||||
const ed25519::sig &sig)
|
||||
const
|
||||
{
|
||||
static const size_t request_max
|
||||
{
|
||||
1_MiB
|
||||
};
|
||||
|
||||
// Matrix spec sez that an empty content object {} is excluded entirely
|
||||
// from the verification. Our JSON only excludes members if they evaluate
|
||||
// to undefined i.e json::object{}/string_view{} but not json::object{"{}"}
|
||||
// or even json::object{""}; rather than burdening the caller with ensuring
|
||||
// their assignment conforms perfectly, we ensure correctness manually.
|
||||
auto _this(*this);
|
||||
if(empty(json::get<"content"_>(*this)))
|
||||
json::get<"content"_>(_this) = json::object{};
|
||||
|
||||
const size_t request_size
|
||||
{
|
||||
json::serialized(_this)
|
||||
};
|
||||
|
||||
const ctx::critical_assertion ca;
|
||||
thread_local char buf[request_max];
|
||||
if(unlikely(request_size > sizeof(buf)))
|
||||
throw m::error
|
||||
{
|
||||
http::PAYLOAD_TOO_LARGE, "M_REQUEST_TOO_LARGE",
|
||||
"The request size %zu bytes exceeds maximum of %zu bytes",
|
||||
request_size,
|
||||
request_max
|
||||
};
|
||||
|
||||
const json::object object
|
||||
{
|
||||
stringify(mutable_buffer{buf}, _this)
|
||||
};
|
||||
|
||||
return verify(pk, sig, object);
|
||||
}
|
||||
|
||||
bool
|
||||
ircd::m::request::verify(const ed25519::pk &pk,
|
||||
const ed25519::sig &sig,
|
||||
const json::object &object)
|
||||
{
|
||||
return pk.verify(object, sig);
|
||||
}
|
||||
|
||||
//
|
||||
// x_matrix
|
||||
//
|
||||
|
||||
ircd::m::request::x_matrix::x_matrix(const string_view &input)
|
||||
{
|
||||
string_view tokens[3];
|
||||
if(ircd::tokens(split(input, ' ').second, ',', tokens) != 3)
|
||||
throw std::out_of_range{"The x_matrix header is malformed"};
|
||||
|
||||
for(const auto &token : tokens)
|
||||
{
|
||||
const auto &kv{split(token, '=')};
|
||||
const auto &val{unquote(kv.second)};
|
||||
switch(hash(kv.first))
|
||||
{
|
||||
case hash("origin"): origin = val; break;
|
||||
case hash("key"): key = val; break;
|
||||
case hash("sig"): sig = val; break;
|
||||
}
|
||||
}
|
||||
|
||||
if(empty(origin))
|
||||
throw std::out_of_range{"The x_matrix header is missing 'origin='"};
|
||||
|
||||
if(empty(key))
|
||||
throw std::out_of_range{"The x_matrix header is missing 'key='"};
|
||||
|
||||
if(empty(sig))
|
||||
throw std::out_of_range{"The x_matrix header is missing 'sig='"};
|
||||
}
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// m/hook.h
|
||||
|
|
|
|||
|
|
@ -1,283 +0,0 @@
|
|||
// Matrix Construct
|
||||
//
|
||||
// Copyright (C) Matrix Construct Developers, Authors & Contributors
|
||||
// Copyright (C) 2016-2018 Jason Volk <jason@zemos.net>
|
||||
//
|
||||
// Permission to use, copy, modify, and/or distribute this software for any
|
||||
// purpose with or without fee is hereby granted, provided that the above
|
||||
// copyright notice and this permission notice is present in all copies. The
|
||||
// full license for this software is available in the LICENSE file.
|
||||
|
||||
//
|
||||
// request
|
||||
//
|
||||
|
||||
ircd::m::request::request(const string_view &method,
|
||||
const string_view &uri,
|
||||
const mutable_buffer &body_buf,
|
||||
const json::members &body)
|
||||
:request
|
||||
{
|
||||
my_host(),
|
||||
string_view{},
|
||||
method,
|
||||
uri,
|
||||
json::stringify(mutable_buffer{body_buf}, body)
|
||||
}
|
||||
{}
|
||||
|
||||
ircd::m::request::request(const string_view &method,
|
||||
const string_view &uri)
|
||||
:request
|
||||
{
|
||||
my_host(),
|
||||
string_view{},
|
||||
method,
|
||||
uri,
|
||||
json::object{}
|
||||
}
|
||||
{}
|
||||
|
||||
ircd::m::request::request(const string_view &method,
|
||||
const string_view &uri,
|
||||
const json::object &content)
|
||||
:request
|
||||
{
|
||||
my_host(),
|
||||
string_view{},
|
||||
method,
|
||||
uri,
|
||||
content
|
||||
}
|
||||
{}
|
||||
|
||||
ircd::m::request::request(const string_view &origin,
|
||||
const string_view &destination,
|
||||
const string_view &method,
|
||||
const string_view &uri,
|
||||
const json::object &content)
|
||||
{
|
||||
json::get<"origin"_>(*this) = origin;
|
||||
json::get<"destination"_>(*this) = destination;
|
||||
json::get<"method"_>(*this) = method;
|
||||
json::get<"uri"_>(*this) = uri;
|
||||
json::get<"content"_>(*this) = content;
|
||||
}
|
||||
|
||||
ircd::string_view
|
||||
ircd::m::request::operator()(const mutable_buffer &out,
|
||||
const vector_view<const http::header> &addl_headers)
|
||||
const
|
||||
{
|
||||
const ctx::critical_assertion ca;
|
||||
static const size_t headers_max{32};
|
||||
thread_local http::header header[headers_max];
|
||||
size_t headers{0};
|
||||
|
||||
header[headers++] =
|
||||
{
|
||||
"User-Agent", info::user_agent
|
||||
};
|
||||
|
||||
thread_local char x_matrix[2_KiB];
|
||||
if(startswith(at<"uri"_>(*this), "/_matrix/federation"))
|
||||
{
|
||||
const auto &sk{self::secret_key};
|
||||
const auto &pkid{self::public_key_id};
|
||||
header[headers++] =
|
||||
{
|
||||
"Authorization", generate(x_matrix, sk, pkid)
|
||||
};
|
||||
}
|
||||
|
||||
assert(headers <= headers_max);
|
||||
assert(headers + addl_headers.size() <= headers_max);
|
||||
for(size_t i(0); i < addl_headers.size() && headers < headers_max; ++i)
|
||||
header[headers++] = addl_headers.at(i);
|
||||
|
||||
static const string_view content_type
|
||||
{
|
||||
"application/json; charset=utf-8"_sv
|
||||
};
|
||||
|
||||
const auto content_length
|
||||
{
|
||||
string_view(json::get<"content"_>(*this)).size()
|
||||
};
|
||||
|
||||
window_buffer sb{out};
|
||||
http::request
|
||||
{
|
||||
sb,
|
||||
at<"destination"_>(*this),
|
||||
at<"method"_>(*this),
|
||||
at<"uri"_>(*this),
|
||||
content_length,
|
||||
content_type,
|
||||
{ header, headers }
|
||||
};
|
||||
|
||||
return sb.completed();
|
||||
}
|
||||
|
||||
ircd::string_view
|
||||
ircd::m::request::generate(const mutable_buffer &out,
|
||||
const ed25519::sk &sk,
|
||||
const string_view &pkid)
|
||||
const
|
||||
{
|
||||
static const size_t request_content_max
|
||||
{
|
||||
1_MiB
|
||||
};
|
||||
|
||||
const ctx::critical_assertion ca;
|
||||
thread_local char buf[request_content_max];
|
||||
if(unlikely(json::serialized(*this) > sizeof(buf)))
|
||||
throw m::error
|
||||
{
|
||||
"M_REQUEST_TOO_LARGE", "This server generated a request of %zu bytes; limit is %zu",
|
||||
json::serialized(*this),
|
||||
sizeof(buf)
|
||||
};
|
||||
|
||||
const json::object object
|
||||
{
|
||||
stringify(mutable_buffer{buf}, *this)
|
||||
};
|
||||
|
||||
const ed25519::sig sig
|
||||
{
|
||||
self::secret_key.sign(object)
|
||||
};
|
||||
|
||||
const auto &origin
|
||||
{
|
||||
unquote(string_view{at<"origin"_>(*this)})
|
||||
};
|
||||
|
||||
thread_local char sigb64[1_KiB];
|
||||
return fmt::sprintf
|
||||
{
|
||||
out, "X-Matrix origin=%s,key=\"%s\",sig=\"%s\"",
|
||||
origin,
|
||||
pkid,
|
||||
b64encode_unpadded(sigb64, sig)
|
||||
};
|
||||
}
|
||||
|
||||
bool
|
||||
ircd::m::request::verify(const string_view &key,
|
||||
const string_view &sig_)
|
||||
const
|
||||
{
|
||||
const ed25519::sig sig
|
||||
{
|
||||
[&sig_](auto &buf)
|
||||
{
|
||||
b64decode(buf, sig_);
|
||||
}
|
||||
};
|
||||
|
||||
const m::node::id::buf node_id
|
||||
{
|
||||
m::node::id::origin, unquote(at<"origin"_>(*this))
|
||||
};
|
||||
|
||||
const m::node node
|
||||
{
|
||||
node_id
|
||||
};
|
||||
|
||||
bool verified{false};
|
||||
node.key(key, [this, &verified, &sig]
|
||||
(const ed25519::pk &pk)
|
||||
{
|
||||
verified = verify(pk, sig);
|
||||
});
|
||||
|
||||
return verified;
|
||||
}
|
||||
|
||||
bool
|
||||
ircd::m::request::verify(const ed25519::pk &pk,
|
||||
const ed25519::sig &sig)
|
||||
const
|
||||
{
|
||||
static const size_t request_max
|
||||
{
|
||||
1_MiB
|
||||
};
|
||||
|
||||
// Matrix spec sez that an empty content object {} is excluded entirely
|
||||
// from the verification. Our JSON only excludes members if they evaluate
|
||||
// to undefined i.e json::object{}/string_view{} but not json::object{"{}"}
|
||||
// or even json::object{""}; rather than burdening the caller with ensuring
|
||||
// their assignment conforms perfectly, we ensure correctness manually.
|
||||
auto _this(*this);
|
||||
if(empty(json::get<"content"_>(*this)))
|
||||
json::get<"content"_>(_this) = json::object{};
|
||||
|
||||
const size_t request_size
|
||||
{
|
||||
json::serialized(_this)
|
||||
};
|
||||
|
||||
const ctx::critical_assertion ca;
|
||||
thread_local char buf[request_max];
|
||||
if(unlikely(request_size > sizeof(buf)))
|
||||
throw m::error
|
||||
{
|
||||
http::PAYLOAD_TOO_LARGE, "M_REQUEST_TOO_LARGE",
|
||||
"The request size %zu bytes exceeds maximum of %zu bytes",
|
||||
request_size,
|
||||
request_max
|
||||
};
|
||||
|
||||
const json::object object
|
||||
{
|
||||
stringify(mutable_buffer{buf}, _this)
|
||||
};
|
||||
|
||||
return verify(pk, sig, object);
|
||||
}
|
||||
|
||||
bool
|
||||
ircd::m::request::verify(const ed25519::pk &pk,
|
||||
const ed25519::sig &sig,
|
||||
const json::object &object)
|
||||
{
|
||||
return pk.verify(object, sig);
|
||||
}
|
||||
|
||||
//
|
||||
// x_matrix
|
||||
//
|
||||
|
||||
ircd::m::request::x_matrix::x_matrix(const string_view &input)
|
||||
{
|
||||
string_view tokens[3];
|
||||
if(ircd::tokens(split(input, ' ').second, ',', tokens) != 3)
|
||||
throw std::out_of_range{"The x_matrix header is malformed"};
|
||||
|
||||
for(const auto &token : tokens)
|
||||
{
|
||||
const auto &kv{split(token, '=')};
|
||||
const auto &val{unquote(kv.second)};
|
||||
switch(hash(kv.first))
|
||||
{
|
||||
case hash("origin"): origin = val; break;
|
||||
case hash("key"): key = val; break;
|
||||
case hash("sig"): sig = val; break;
|
||||
}
|
||||
}
|
||||
|
||||
if(empty(origin))
|
||||
throw std::out_of_range{"The x_matrix header is missing 'origin='"};
|
||||
|
||||
if(empty(key))
|
||||
throw std::out_of_range{"The x_matrix header is missing 'key='"};
|
||||
|
||||
if(empty(sig))
|
||||
throw std::out_of_range{"The x_matrix header is missing 'sig='"};
|
||||
}
|
||||
Loading…
Reference in a new issue