Compare commits

...

2 commits

Author SHA1 Message Date
e4ee22fa73
[ADD] Update changelog. 2023-09-17 20:05:59 +02:00
84f96a720f [ADD] Implement #27 2023-09-17 20:03:09 +02:00
6 changed files with 188 additions and 0 deletions

View file

@ -24,6 +24,11 @@ The following endpoints were added:
- Fixed a double-free in `RouteUserProfile()` that would cause errors with certain
Matrix clients. (#35)
### New Features
Implemented `/_telodendria/admin/deactivate/[localpart]` for admins to be able to
deactivate users.
## v0.3.0
**Saturday, June 10, 2023**

View file

@ -86,6 +86,7 @@ RouterBuild(void)
R("/_telodendria/admin/config", RouteConfig);
R("/_telodendria/admin/privileges", RoutePrivileges);
R("/_telodendria/admin/privileges/(.*)", RoutePrivileges);
R("/_telodendria/admin/deactivate/(.*)", RouteAdminDeactivate);
#undef R

View file

@ -0,0 +1,129 @@
/*
* 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 <Routes.h>
#include <Json.h>
#include <HashMap.h>
#include <Str.h>
#include <User.h>
#include <Log.h>
ROUTE_IMPL(RouteAdminDeactivate, path, argp)
{
RouteArgs *args = argp;
HashMap *request = NULL;
HashMap *response = NULL;
JsonValue *val;
char *reason = "Deactivated by admin";
char *removedLocalpart = ArrayGet(path, 0);
char *token;
Db *db = args->matrixArgs->db;
User *user = NULL;
User *removed = NULL;
HttpRequestMethod method = HttpRequestMethodGet(args->context);
if ((method != HTTP_DELETE) && (method != HTTP_PUT))
{
char * msg = "Route only supports DELETE and PUT as for now.";
HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
return MatrixErrorCreate(M_UNRECOGNIZED, msg);
}
if (method == HTTP_DELETE)
{
request = JsonDecode(HttpServerStream(args->context));
if (!request)
{
HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
return MatrixErrorCreate(M_NOT_JSON, NULL);
}
val = HashMapGet(request, "reason");
if (val && JsonValueType(val) == JSON_STRING)
{
reason = JsonValueAsString(val);
}
}
response = MatrixGetAccessToken(args->context, &token);
if (response)
{
goto finish;
}
user = UserAuthenticate(db, token);
removed = UserLock(db, removedLocalpart);
if (!user || !removed)
{
HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
response = MatrixErrorCreate(M_UNKNOWN_TOKEN, NULL);
goto finish;
}
if (!(UserGetPrivileges(user) & USER_DEACTIVATE))
{
char * msg = "User doesn't have the DEACTIVATE privilege.";
HttpResponseStatus(args->context, HTTP_FORBIDDEN);
response = MatrixErrorCreate(M_FORBIDDEN, msg);
goto finish;
}
if (method == HTTP_DELETE)
{
char * str;
UserDeactivateWithInfo(removed, UserGetName(user), reason);
response = HashMapCreate();
str = removedLocalpart;
JsonSet(response, JsonValueString(str), 1, "user");
str = reason;
JsonSet(response, JsonValueString(str), 1, "reason");
str = UserGetName(user);
JsonSet(response, JsonValueString(str), 1, "banned_by");
}
else
{
UserReactivate(removed);
HttpResponseStatus(args->context, HTTP_NO_CONTENT);
}
finish:
if (user)
{
UserUnlock(user);
}
if (removed)
{
UserUnlock(removed);
}
JsonFree(request);
return response;
}

View file

@ -430,6 +430,11 @@ UserSetPassword(User * user, char *password)
int
UserDeactivate(User * user)
{
return UserDeactivateWithInfo(user, NULL, NULL);
}
int
UserDeactivateWithInfo(User * user, char * admin, char * reason)
{
HashMap *json;
@ -442,6 +447,38 @@ UserDeactivate(User * user)
JsonValueFree(HashMapSet(json, "deactivated", JsonValueBoolean(1)));
if (admin && reason)
{
JsonValue * val;
val = JsonValueString(admin);
JsonSet(json, val, 2, "deactivate", "admin");
val = JsonValueString(reason);
JsonSet(json, val, 2, "deactivate", "reason");
}
return 1;
}
int
UserReactivate(User * user)
{
HashMap *json;
if (!user)
{
return 0;
}
json = DbJson(user->ref);
JsonValueFree(HashMapSet(json, "deactivated", JsonValueBoolean(0)));
JsonValueFree(HashMapDelete(json, "deactivate"));
return 1;
}

View file

@ -103,6 +103,8 @@ ROUTE(RouteCreateRoom);
ROUTE(RouteAliasDirectory);
ROUTE(RouteRoomAliases);
ROUTE(RouteAdminDeactivate);
#undef ROUTE
#endif

View file

@ -202,6 +202,20 @@ extern int UserSetPassword(User *, char *);
*/
extern int UserDeactivate(User *);
/**
* Acts just like
* .Fn UserDeactivate ,
* but saves the reason and admin that deactivated the user
*/
extern int UserDeactivateWithInfo(User *, char *, char *);
/**
* Reactivates the given user account if it has been deactvated with
* .Fn UserDeactivate ,
* otherwise, it simply doesn't do anything.
*/
extern int UserReactivate(User *);
/**
* Return a boolean value indicating whether or not the user was
* deactivated using