MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-09-28 19:58:53 +02:00
Code Issues Releases Wiki Activity

ircd/modules: Improve path param parsing related; various m:: related.

Browse source
This commit is contained in:
Jason Volk 2017-10-11 20:52:33 -07:00
parent 1a4c57653b
commit 18bbf758f3
16 changed files with 100 additions and 115 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/ircd/resource.h
View file

@ -78,8 +78,9 @@ struct ircd::resource::request
http::request::content &content;
http::query::string query;
m::user::id::buf user_id;
vector_view<string_view> parv;
request(const http::request::head &head, http::request::content &content, http::query::string query);
request(const http::request::head &head, http::request::content &content, http::query::string query, const vector_view<string_view> &parv);
};
template<class tuple>
@ -90,6 +91,7 @@ struct ircd::resource::request::object
const http::request::head &head;
const http::request::content &content;
const http::query::string &query;
const vector_view<string_view> &parv;
const json::object &body;
object(resource::request &r)
@ -98,6 +100,7 @@ struct ircd::resource::request::object
,head{r.head}
,content{r.content}
,query{r.query}
,parv{r.parv}
,body{r}
{}
};

21
ircd/resource.cc
View file

@ -31,8 +31,7 @@ resource::resources
ircd::resource &
ircd::resource::find(string_view path)
{
path = strip(path, '/');
path = rstrip(path, '/');
auto it(resources.lower_bound(path));
if(it == end(resources)) try
{
@ -176,9 +175,21 @@ ircd::resource::operator()(client &client,
{
auto &method(operator[](head.method));
http::request::content content{pc, head};
const auto pathparm
{
lstrip(head.path, this->path)
};
string_view param[8];
const vector_view<string_view> parv
{
param, tokens(pathparm, '/', param)
};
resource::request request
{
head, content, head.query
head, content, head.query, parv
};
if(method.flags & method.REQUIRES_AUTH)
@ -286,11 +297,13 @@ catch(const std::bad_function_call &e)
ircd::resource::request::request(const http::request::head &head,
http::request::content &content,
http::query::string query)
http::query::string query,
const vector_view<string_view> &parv)
:json::object{content}
,head{head}
,content{content}
,query{std::move(query)}
,parv{parv}
{
}

6
modules/client/account.cc
View file

@ -26,13 +26,13 @@ struct account
{
resource deactivate
{
"_matrix/client/r0/account/deactivate",
"/_matrix/client/r0/account/deactivate",
"Deactivate the user's account, removing all ability for the user to login again. (3.3.3)"
};
resource password
{
"_matrix/client/r0/account/password",
"/_matrix/client/r0/account/password",
"Changes the password for an account on this homeserver. (3.3.4)"
};
@ -40,7 +40,7 @@ struct account
}
account_resource
{
"_matrix/client/r0/account",
"/_matrix/client/r0/account",
"Account management (3.3)"
};

6
modules/client/createroom.cc
View file

@ -23,7 +23,7 @@ using namespace ircd;
resource createroom
{
"_matrix/client/r0/createRoom",
"/_matrix/client/r0/createRoom",
"Create a new room with various configuration options. (7.1.1)"
};
@ -94,11 +94,11 @@ catch(const db::not_found &e)
};
}
resource::method post
resource::method post_method
{
createroom, "POST", room_create,
{
post.REQUIRES_AUTH
post_method.REQUIRES_AUTH
}
};

2
modules/client/events.cc
View file

@ -23,7 +23,7 @@ using namespace ircd;
resource events_resource
{
"_matrix/client/r0/events",
"/_matrix/client/r0/events",
"Events (6.2.3) (10.x)"
};

2
modules/client/login.cc
View file

@ -23,7 +23,7 @@ using namespace ircd;
resource login_resource
{
"_matrix/client/r0/login",
"/_matrix/client/r0/login",
"Authenticates the user by password, and issues an access token "
"they can use to authorize themself in subsequent requests. (3.2.2)"
};

6
modules/client/logout.cc
View file

@ -23,7 +23,7 @@ using namespace ircd;
resource logout_resource
{
"_matrix/client/r0/logout",
"/_matrix/client/r0/logout",
"Invalidates an existing access token, so that it can no longer be used for "
"authorization. (3.2.3)"
};
@ -42,11 +42,11 @@ logout(client &client, const resource::request &request)
};
}
resource::method post
resource::method post_method
{
logout_resource, "POST", logout,
{
post.REQUIRES_AUTH
post_method.REQUIRES_AUTH
}
};

2
modules/client/publicrooms.cc
View file

@ -23,7 +23,7 @@ using namespace ircd;
resource publicrooms_resource
{
"_matrix/client/r0/publicRooms",
"/_matrix/client/r0/publicRooms",
"Lists the public rooms on the server. "
"This API returns paginated responses. (7.5)"
};

4
modules/client/pushrules.cc
View file

@ -23,7 +23,7 @@ using namespace ircd;
resource pushrules
{
"_matrix/client/r0/pushrules", R"(
"/_matrix/client/r0/pushrules", R"(
Retrieve all push rulesets for this user. Clients can "drill-down" on the rulesets by
suffixing a scope to this path e.g. /pushrules/global/. This will return a subset of this data
under the specified key e.g. the global key. (11.10.1.4.6)
@ -44,7 +44,7 @@ catch(...)
throw;
}
resource::method get
resource::method get_method
{
pushrules, "GET", get_pushrules
};

2
modules/client/register.cc
View file

@ -175,7 +175,7 @@ handle_post(client &client,
resource register_resource
{
"_matrix/client/r0/register",
"/_matrix/client/r0/register",
"Register for an account on this homeserver. (3.3.1)"
};

124
modules/client/rooms.cc
View file

@ -24,16 +24,11 @@ using namespace ircd;
struct room
:resource
{
static constexpr const auto base_url
{
"_matrix/client/r0/rooms"
};
using resource::resource;
}
rooms_resource
{
room::base_url, resource::opts
"/_matrix/client/r0/rooms/", resource::opts
{
resource::DIRECTORY,
"Rooms (7.0)"
@ -48,7 +43,6 @@ mapi::header IRCD_MODULE
resource::response
get_messages(client &client,
const resource::request &request,
const string_view &params,
const m::room::id &room_id)
{
const m::event::query<m::event::where::equal> event_in_room
@ -101,7 +95,6 @@ get_messages(client &client,
resource::response
get_members(client &client,
const resource::request &request,
const string_view &params,
const m::room::id &room_id)
{
@ -144,7 +137,6 @@ get_members(client &client,
resource::response
get_state(client &client,
const resource::request &request,
const string_view &params,
const m::event::query<> &query)
{
const auto count
@ -179,7 +171,6 @@ get_state(client &client,
resource::response
get_state(client &client,
const resource::request &request,
const string_view &params,
const m::room::id &room_id,
const string_view &type,
const string_view &state_key)
@ -191,13 +182,12 @@ get_state(client &client,
{ "state_key", state_key },
};
return get_state(client, request, params, query);
return get_state(client, request, query);
}
resource::response
get_state(client &client,
const resource::request &request,
const string_view &params,
const m::room::id &room_id,
const string_view &type)
{
@ -207,33 +197,29 @@ get_state(client &client,
{ "type", type }
};
return get_state(client, request, params, query);
return get_state(client, request, query);
}
resource::response
get_state(client &client,
const resource::request &request,
const string_view &params,
const m::room::id &room_id)
{
string_view token[4];
tokens(params, "/", token);
const string_view &type
{
token[2]
request.parv[2]
};
const string_view &state_key
{
token[3]
request.parv[3]
};
if(type && state_key)
return get_state(client, request, params, room_id, type, state_key);
return get_state(client, request, room_id, type, state_key);
if(type)
return get_state(client, request, params, room_id, type);
return get_state(client, request, room_id, type);
const m::event::query<m::event::where::equal> query
{
@ -241,18 +227,17 @@ get_state(client &client,
{ "state_key", "" },
};
return get_state(client, request, params, query);
return get_state(client, request, query);
}
resource::response
get_context(client &client,
const resource::request &request,
const string_view &params,
const m::room::id &room_id)
{
const m::event::id &event_id
{
token(params, '/', 2)
request.parv[2]
};
const auto it
@ -280,35 +265,35 @@ get_context(client &client,
resource::response
get_rooms(client &client, const resource::request &request)
{
const auto params
{
lstrip(request.head.path, room::base_url)
};
string_view token[2];
if(tokens(params, '/', token) != 2)
throw m::BAD_REQUEST{"/rooms command required"};
if(request.parv.size() != 2)
throw m::error
{
http::MULTIPLE_CHOICES, "/rooms command required"
};
m::room::id::buf room_id
{
urldecode(token[0], room_id)
urldecode(request.parv[0], room_id)
};
const string_view &cmd{token[1]};
const string_view &cmd{request.parv[1]};
if(cmd == "context")
return get_context(client, request, params, room_id);
return get_context(client, request, room_id);
if(cmd == "state")
return get_state(client, request, params, room_id);
return get_state(client, request, room_id);
if(cmd == "members")
return get_members(client, request, params, room_id);
return get_members(client, request, room_id);
if(cmd == "messages")
return get_messages(client, request, params, room_id);
return get_messages(client, request, room_id);
throw m::NOT_FOUND{"/rooms command not found"};
throw m::NOT_FOUND
{
"/rooms command not found"
};
}
resource::method method_get
@ -319,20 +304,16 @@ resource::method method_get
resource::response
put_send(client &client,
const resource::request &request,
const string_view &params,
const m::room::id &room_id)
{
string_view token[4];
tokens(params, '/', token);
const string_view &type
{
token[2]
request.parv[2]
};
const string_view &txnid
{
token[3]
request.parv[3]
};
json::iov event;
@ -374,27 +355,21 @@ put_send(client &client,
resource::response
put_rooms(client &client, const resource::request &request)
{
const auto params
{
lstrip(request.head.path, room::base_url)
};
string_view token[2];
if(tokens(params, "/", token) != 2)
if(request.parv.size() != 2)
throw m::BAD_REQUEST{"/rooms command required"};
const m::room::id &room_id
m::room::id::buf room_id
{
token[0]
urldecode(request.parv[0], room_id)
};
const string_view &cmd
{
token[1]
request.parv[1]
};
if(cmd == "send")
return put_send(client, request, params, room_id);
return put_send(client, request, room_id);
throw m::NOT_FOUND{"/rooms command not found"};
}
@ -410,42 +385,41 @@ resource::method method_put
resource::response
post_receipt(client &client,
const resource::request &request,
const string_view &params,
const m::room::id &room_id)
{
string_view token[4];
if(tokens(params, '/', token) != 4)
if(request.parv.size() != 4)
throw m::BAD_REQUEST{"receipt type and event_id required"};
const string_view &receipt_type{token[2]};
const string_view &event_id{token[3]};
const string_view &receipt_type{request.parv[2]};
const string_view &event_id{request.parv[3]};
std::cout << "type: " << receipt_type << " eid: " << event_id << std::endl;
}
resource::response
post_rooms(client &client, const resource::request &request)
post_rooms(client &client,
const resource::request &request)
{
const auto params
{
lstrip(request.head.path, room::base_url)
};
string_view token[2];
if(tokens(params, '/', token) != 2)
if(request.parv.size() != 2)
throw m::BAD_REQUEST{"/rooms command required"};
m::room::id::buf room_id;
urldecode(token[0], room_id);
const string_view &cmd{token[1]};
m::room::id::buf room_id
{
urldecode(request.parv[0], room_id)
};
const string_view &cmd
{
request.parv[1]
};
if(cmd == "receipt")
return post_receipt(client, request, params, room_id);
return post_receipt(client, request, room_id);
}
resource::method method_POST
resource::method method_post
{
rooms_resource, "POST", post_rooms,
{
method_put.REQUIRES_AUTH
method_post.REQUIRES_AUTH
}
};

2
modules/client/sync.cc
View file

@ -35,7 +35,7 @@ to the state, and to receive new messages.
resource sync_resource
{
"_matrix/client/r0/sync",
"/_matrix/client/r0/sync",
sync_description
};

18
modules/client/user.cc
View file

@ -23,7 +23,7 @@ using namespace ircd;
resource user_resource
{
"_matrix/client/r0/user",
"/_matrix/client/r0/user/",
"User resource",
{
resource::DIRECTORY
@ -35,12 +35,12 @@ get_filter(client &client, const resource::request &request)
{
m::user::id::buf user_id
{
urldecode(token(request.head.path, '/', 4), user_id)
urldecode(request.parv[4], user_id)
};
const auto filter_id
const auto &filter_id
{
token(request.head.path, '/', 6)
request.parv[6]
};
const m::event::query<m::event::where::equal> query
@ -74,11 +74,11 @@ get_filter(client &client, const resource::request &request)
return {};
}
resource::method get
resource::method get_method
{
user_resource, "GET", get_filter,
{
resource::method::REQUIRES_AUTH
get_method.REQUIRES_AUTH
}
};
@ -91,7 +91,7 @@ post_filter(client &client, const resource::request::object<const m::filter> &re
// token must be authorized to make requests for this user id.
m::user::id::buf user_id
{
urldecode(token(request.head.path, '/', 4), user_id)
urldecode(request.parv[4], user_id)
};
user_id.validate();
@ -161,11 +161,11 @@ post_filter(client &client, const resource::request::object<const m::filter> &re
};
}
resource::method post
resource::method post_method
{
user_resource, "POST", post_filter,
{
post.REQUIRES_AUTH
post_method.REQUIRES_AUTH
}
};

2
modules/client/versions.cc
View file

@ -23,7 +23,7 @@ using namespace ircd;
resource versions_resource
{
"_matrix/client/versions",
"/_matrix/client/versions",
"Gets the versions of the specification supported by the server (2.1)"
};

2
modules/client/voip/turnserver.cc
View file

@ -28,7 +28,7 @@ mapi::header IRCD_MODULE
resource turnserver_resource
{
"_matrix/client/r0/voip/turnServer",
"/_matrix/client/r0/voip/turnServer",
"This API provides credentials for the client to use when initiating calls."
"(11.3.3)"
};

11
modules/key/server.cc
View file

@ -29,16 +29,11 @@ mapi::header IRCD_MODULE
struct server
:resource
{
static constexpr const auto base_url
{
"_matrix/key/v2/server/"
};
using resource::resource;
}
server_resource
{
server::base_url, resource::opts
"/_matrix/key/v2/server/", resource::opts
{
resource::DIRECTORY,
"federation 2.2.1.1: Publishing Keys"
@ -52,11 +47,11 @@ handle_get(client &client,
char key_id_buf[256];
const auto key_id
{
urldecode(split(request.head.path, server_resource.base_url).second, key_id_buf)
urldecode(request.parv[0], key_id_buf)
};
std::string my_key;
m::keys::get(my_host(), [&my_key](const auto &key)
m::keys::get(my_host(), key_id, [&my_key](const auto &key)
{
my_key = json::string(key);
});