MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-29 10:12:39 +01:00
Code Issues Releases Wiki Activity

ircd: Reenable access token authentication.

Browse source
This commit is contained in:
Jason Volk 2018-02-10 21:42:55 -08:00
parent 3e603b86e9
commit 8044fdb3ce
1 changed files with 4 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
ircd/resource.cc
View file

@ -134,34 +134,14 @@ try
request.query.at("access_token")
};
// Sets up the query to find the access_token in the sessions room
const m::vm::query<m::vm::where::equal> query
{
{ "type", "ircd.access_token" },
{ "state_key", access_token },
{ "room_id", m::user::sessions.room_id },
};
const bool result
{
m::vm::test(query, [&request, &access_token](const m::event &event)
access_token &&
m::user::sessions.get(std::nothrow, "ircd.access_token"_sv, access_token, [&]
(const m::event &event)
{
// Checks if the access token has expired. Tokens are expired when
// an m.room.redaction event is issued for the ircd.access_token
// event. Instead of making another query here for the redaction
// we expect the original event to be updated with the following
// key which must be part of the redaction process.
const json::object &unsigned_
{
json::get<"unsigned"_>(event)
};
if(unsigned_.has("redacted_because"))
return false;
assert(at<"state_key"_>(event) == access_token);
// The user sent this access token to the sessions room.
request.user_id = m::user::id{at<"sender"_>(event)};
return true;
})
};