From e0af88145ec90c5027b36843d3a1395a7996b29a Mon Sep 17 00:00:00 2001 From: Jordan Bancino Date: Tue, 8 Aug 2023 15:11:50 +0000 Subject: [PATCH] Add RouteCreateRoom stub. --- src/Room.c | 4 +- src/Routes.c | 3 ++ src/Routes/RouteCreateRoom.c | 73 ++++++++++++++++++++++++++++++++++++ src/include/Room.h | 16 ++------ src/include/Routes.h | 2 + 5 files changed, 85 insertions(+), 13 deletions(-) create mode 100644 src/Routes/RouteCreateRoom.c diff --git a/src/Room.c b/src/Room.c index 1ff762a..55de283 100644 --- a/src/Room.c +++ b/src/Room.c @@ -28,6 +28,8 @@ #include #include +#include + struct Room { Db *db; @@ -38,7 +40,7 @@ struct Room }; Room * -RoomCreate(Db * db, HashMap * json) +RoomCreate(Db * db, RoomCreateRequest *req) { return NULL; } diff --git a/src/Routes.c b/src/Routes.c index 3867875..e1aab92 100644 --- a/src/Routes.c +++ b/src/Routes.c @@ -75,6 +75,8 @@ RouterBuild(void) R("/_matrix/client/v3/user/(.*)/filter", RouteFilter); R("/_matrix/client/v3/user/(.*)/filter/(.*)", RouteFilter); + R("/_matrix/client/v3/createRoom", RouteCreateRoom); + /* Telodendria Admin API Routes */ R("/_telodendria/admin/(restart|shutdown|stats)", RouteProcControl); @@ -82,6 +84,7 @@ RouterBuild(void) R("/_telodendria/admin/privileges", RoutePrivileges); R("/_telodendria/admin/privileges/(.*)", RoutePrivileges); + #undef R return router; diff --git a/src/Routes/RouteCreateRoom.c b/src/Routes/RouteCreateRoom.c new file mode 100644 index 0000000..6072baa --- /dev/null +++ b/src/Routes/RouteCreateRoom.c @@ -0,0 +1,73 @@ +/* + * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net> + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation files + * (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, + * publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#include + +#include + +#include + +ROUTE_IMPL(RouteCreateRoom, path, argp) +{ + RouteArgs *args = argp; + + HashMap *request = NULL; + HashMap *response; + RoomCreateRequest parsed; + char *err; + + (void) path; + + if (HttpRequestMethodGet(args->context) != HTTP_POST) + { + HttpResponseStatus(args->context, HTTP_BAD_REQUEST); + response = MatrixErrorCreate(M_UNRECOGNIZED, "Unknown request method."); + goto finish; + } + + request = JsonDecode(HttpServerStream(args->context)); + if (!request) + { + HttpResponseStatus(args->context, HTTP_BAD_REQUEST); + response = MatrixErrorCreate(M_NOT_JSON, NULL); + goto finish; + } + + if (!RoomCreateRequestFromJson(request, &parsed, &err)) + { + HttpResponseStatus(args->context, HTTP_BAD_REQUEST); + response = MatrixErrorCreate(M_BAD_JSON, err); + goto finish; + } + + /* No longer need this now that it is parsed */ + JsonFree(request); + request = NULL; + + response = HashMapCreate(); + +finish: + JsonFree(request); + return response; +} diff --git a/src/include/Room.h b/src/include/Room.h index a1e7c7b..fbe4358 100644 --- a/src/include/Room.h +++ b/src/include/Room.h @@ -39,6 +39,8 @@ #include #include +#include + /** * The functions in this API operate on an opaque structure. */ @@ -46,19 +48,9 @@ typedef struct Room Room; /** * Create a new room in the given database using the given - * JSON body. The JSON body is the request body from the - * room creation API, which is used to configure the room - * as requested. A handle to the newly created room is - * returned, or NULL if there was an error creating the - * room. - * .Pp - * The JSON should be validated before being passed into - * this function. Malformed JSON will cause this function - * to fail, but since the only way it can indicate an - * error is by returning NULL, it's impossible to tell - * the client what the specific error is. + * RoomCreateRequest. */ -extern Room * RoomCreate(Db *, HashMap *); +extern Room * RoomCreate(Db *, RoomCreateRequest *); /** * Lock the existing room in the specified database, diff --git a/src/include/Routes.h b/src/include/Routes.h index 35d3123..0cc7692 100644 --- a/src/include/Routes.h +++ b/src/include/Routes.h @@ -98,6 +98,8 @@ ROUTE(RouteProcControl); ROUTE(RouteConfig); ROUTE(RoutePrivileges); +ROUTE(RouteCreateRoom); + #undef ROUTE #endif