[ADD/WIP] Start work to send messages
Some checks are pending
Compile Telodendria / Compile Telodendria (x86, alpine-v3.19) (push) Waiting to run
Compile Telodendria / Compile Telodendria (x86, debian-v12.4) (push) Waiting to run
Compile Telodendria / Compile Telodendria (x86, freebsd-v14.0) (push) Waiting to run
Compile Telodendria / Compile Telodendria (x86, netbsd-v9.3) (push) Waiting to run
Compile Telodendria / Compile Telodendria (x86_64, alpine-v3.19) (push) Waiting to run
Compile Telodendria / Compile Telodendria (x86_64, debian-v12.4) (push) Waiting to run
Compile Telodendria / Compile Telodendria (x86_64, freebsd-v14.0) (push) Waiting to run
Compile Telodendria / Compile Telodendria (x86_64, netbsd-v9.3) (push) Waiting to run
Compile Telodendria / Compile Telodendria (x86_64, openbsd-v7.4) (push) Waiting to run

This commit *works*  but I don't quite like it.
This commit is contained in:
lda 2024-06-07 18:24:13 +02:00
parent 39c4af8d4d
commit e268471dba
5 changed files with 181 additions and 8 deletions

View file

@ -341,6 +341,7 @@ RoomCreate(Db * db, User *user, RoomCreateRequest * req, ServerPart s)
JsonSet(json, JsonValueArray(ArrayCreate()), 1, "leaves"); JsonSet(json, JsonValueArray(ArrayCreate()), 1, "leaves");
full_creator = ParserRecomposeServerPart(room->creator); full_creator = ParserRecomposeServerPart(room->creator);
JsonSet(json, JsonValueString(full_creator), 1, "creator"); JsonSet(json, JsonValueString(full_creator), 1, "creator");
JsonSet(json, JsonValueInteger(version_num), 1, "version");
Free(full_creator); Free(full_creator);
RoomPopulate(room, user, req, s); RoomPopulate(room, user, req, s);
@ -380,6 +381,7 @@ RoomLock(Db * db, char *id)
room->state_ref = state_ref; room->state_ref = state_ref;
room->leaves_ref = leaves_ref; room->leaves_ref = leaves_ref;
room->id = StrDuplicate(id); room->id = StrDuplicate(id);
room->version = JsonValueAsInteger(HashMapGet(DbJson(leaves_ref), "version"));
json = DbJson(room->leaves_ref); json = DbJson(room->leaves_ref);
ParseServerPart( ParseServerPart(

View file

@ -142,6 +142,7 @@ RouterBuild(void)
R("/_matrix/client/v3/user/(.*)/filter", RouteFilter); R("/_matrix/client/v3/user/(.*)/filter", RouteFilter);
R("/_matrix/client/v3/user/(.*)/filter/(.*)", RouteFilter); R("/_matrix/client/v3/user/(.*)/filter/(.*)", RouteFilter);
R("/_matrix/client/v3/rooms/(.*)/send/(.*)/(.*)", RouteSendEvent);
R("/_matrix/client/v3/createRoom", RouteCreateRoom); R("/_matrix/client/v3/createRoom", RouteCreateRoom);

173
src/Routes/RouteSendEvent.c Normal file
View file

@ -0,0 +1,173 @@
/*
* Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
* other valuable contributors. See CONTRIBUTORS.txt for the full list.
*
* 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 <Routes.h>
#include <Cytoplasm/HashMap.h>
#include <Cytoplasm/Memory.h>
#include <Cytoplasm/Json.h>
#include <Cytoplasm/Str.h>
#include <User.h>
#include <Room.h>
#include <string.h>
#include <Schema/Filter.h>
static char *
GetServerName(Db * db)
{
char *name;
Config config;
ConfigLock(db, &config);
if (!config.ok)
{
return NULL;
}
name = StrDuplicate(config.serverName);
ConfigUnlock(&config);
return name;
}
ROUTE_IMPL(RouteSendEvent, path, argp)
{
RouteArgs *args = argp;
Db *db = args->matrixArgs->db;
HashMap *request = NULL, *event = NULL;
HashMap *response = NULL, *filled = NULL;
User *user = NULL;
CommonID *id = NULL;
char *token = NULL;
char *serverName = NULL;
char *roomId = ArrayGet(path, 0);
char *eventType = ArrayGet(path, 1);
char *transId = ArrayGet(path, 2);
char *sender = NULL;
Room *room = NULL;
char *err;
if (!roomId || !eventType || !transId)
{
/* Should be impossible */
HttpResponseStatus(args->context, HTTP_INTERNAL_SERVER_ERROR);
return MatrixErrorCreate(M_UNKNOWN, NULL);
}
if (HttpRequestMethodGet(args->context) != HTTP_PUT)
{
err = "Unknown request method.";
HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
response = MatrixErrorCreate(M_UNRECOGNIZED, err);
goto finish;
}
serverName = GetServerName(db);
if (!serverName)
{
HttpResponseStatus(args->context, HTTP_INTERNAL_SERVER_ERROR);
response = MatrixErrorCreate(M_UNKNOWN, NULL);
goto finish;
}
response = MatrixGetAccessToken(args->context, &token);
if (response)
{
goto finish;
}
request = JsonDecode(HttpServerStream(args->context));
if (!request)
{
HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
response = MatrixErrorCreate(M_NOT_JSON, NULL);
goto finish;
}
user = UserAuthenticate(db, token);
if (!user)
{
HttpResponseStatus(args->context, HTTP_UNAUTHORIZED);
response = MatrixErrorCreate(M_UNKNOWN_TOKEN, NULL);
goto finish;
}
id = UserIdParse(UserGetName(user), serverName);
id->sigil = '@';
sender = ParserRecomposeCommonID(*id);
if ((response = UserGetTransaction(user, transId, "send")))
{
goto finish;
}
room = RoomLock(db, roomId);
if (!RoomContainsUser(room, sender))
{
err = "User is not in the room.";
HttpResponseStatus(args->context, HTTP_UNAUTHORIZED);
response = MatrixErrorCreate(M_FORBIDDEN, err);
goto finish;
}
event = RoomEventCreate(sender, eventType, NULL, JsonDuplicate(request));
filled = RoomEventSend(room, event);
JsonFree(event);
if (!filled)
{
err = "User is not allowed to send event.";
HttpResponseStatus(args->context, HTTP_UNAUTHORIZED);
response = MatrixErrorCreate(M_FORBIDDEN, err);
goto finish;
}
response = HashMapCreate();
HashMapSet(
response, "event_id",
JsonValueDuplicate(HashMapGet(filled, "event_id"))
);
JsonFree(filled);
UserSetTransaction(user, transId, "send", response);
finish:
RoomUnlock(room);
Free(serverName);
if (sender)
{
Free(sender);
}
UserIdFree(id);
UserUnlock(user);
JsonFree(request);
return response;
}

View file

@ -240,18 +240,13 @@ StateResolveV2(Array * states)
static HashMap * static HashMap *
StateFromPrevs(Room *room, Array *states) StateFromPrevs(Room *room, Array *states)
{ {
HashMap *ret_state;
switch (RoomVersionGet(room)) switch (RoomVersionGet(room))
{ {
case 1: case 1:
ret_state = StateResolveV1(room, states); return StateResolveV1(room, states);
break;
default: default:
ret_state = StateResolveV2(states); return StateResolveV2(states);
break;
} }
return ret_state;
} }
HashMap * HashMap *
@ -357,9 +352,10 @@ StateCurrent(Room *room)
for (i = 0; i < ArraySize(prevEvents); i++) for (i = 0; i < ArraySize(prevEvents); i++)
{ {
HashMap *event = HashMap *event =
RoomEventFetch(room, JsonValueAsString(ArrayGet(prevEvents, i))); JsonValueAsObject(ArrayGet(prevEvents, i));
HashMap *state = StateResolve(room, event); HashMap *state = StateResolve(room, event);
if (HashMapGet(event, "state_key")) if (HashMapGet(event, "state_key"))
{ {
StateSet( StateSet(

View file

@ -100,6 +100,7 @@ ROUTE(RouteConfig);
ROUTE(RoutePrivileges); ROUTE(RoutePrivileges);
ROUTE(RouteCreateRoom); ROUTE(RouteCreateRoom);
ROUTE(RouteSendEvent);
ROUTE(RouteAliasDirectory); ROUTE(RouteAliasDirectory);
ROUTE(RouteRoomAliases); ROUTE(RouteRoomAliases);