Apply #63, make some general bug fixes.

This commit is contained in:
Jordan Bancino 2023-03-10 03:24:04 +00:00
parent 3af2d3d12b
commit 8ead9cc93a
6 changed files with 106 additions and 4 deletions

View file

@ -50,11 +50,11 @@ Milestone: v0.3.0
flow flow
- Ensure that registration tokens can be used even if - Ensure that registration tokens can be used even if
registration is disabled. registration is disabled.
[ ] 4: Account management [~] 4: Account management
[ ] Deactivate [ ] Deactivate
[ ] Make sure UserLogin() fails if user is deactivated. [ ] Make sure UserLogin() fails if user is deactivated.
[ ] Change password [ ] Change password
[ ] Whoami [x] Whoami
[ ] 9: User Data [ ] 9: User Data
[ ] 5: Capabilities negotiation [ ] 5: Capabilities negotiation
[ ] 10: Security (Rate Limiting) [ ] 10: Security (Rate Limiting)

View file

@ -86,6 +86,20 @@ ROUTE_IMPL(RouteMatrix, args)
{ {
response = RouteRefresh(args); response = RouteRefresh(args);
} }
else if (MATRIX_PATH_EQUALS(pathPart, "account"))
{
Free(pathPart);
pathPart = MATRIX_PATH_POP(args->path);
if (MATRIX_PATH_EQUALS(pathPart, "whoami"))
{
response = RouteWhoami(args);
}
else
{
HttpResponseStatus(args->context, HTTP_NOT_FOUND);
response = MatrixErrorCreate(M_NOT_FOUND);
}
}
else else
{ {
HttpResponseStatus(args->context, HTTP_NOT_FOUND); HttpResponseStatus(args->context, HTTP_NOT_FOUND);

87
src/Routes/RouteWhoami.c Normal file
View file

@ -0,0 +1,87 @@
/*
* 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 <string.h>
#include <Json.h>
#include <HashMap.h>
#include <Str.h>
#include <Memory.h>
#include <User.h>
ROUTE_IMPL(RouteWhoami, args)
{
Db *db = args->matrixArgs->db;
HashMap *response = NULL;
HashMap *tokenJson = NULL;
DbRef *ref;
char *token;
char *userID;
char *deviceID;
if (MATRIX_PATH_PARTS(args->path) != 0)
{
HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
return MatrixErrorCreate(M_UNRECOGNIZED);
}
/* Get the request */
response = MatrixGetAccessToken(args->context, &token);
if (response)
{
/* No token? */
return response;
}
/* Authenticate with our token */
if (!DbExists(db, 3, "tokens", "access", token))
{
HttpResponseStatus(args->context, HTTP_UNAUTHORIZED);
return MatrixErrorCreate(M_UNKNOWN_TOKEN);
}
ref = DbLock(db, 3, "tokens", "access", token);
tokenJson = DbJson(ref);
response = HashMapCreate();
userID = StrConcat(4, "@",
JsonValueAsString(HashMapGet(tokenJson, "user")),
":", args->matrixArgs->config->serverName);
deviceID = StrDuplicate(JsonValueAsString(HashMapGet(tokenJson, "device")));
DbUnlock(db, ref);
HashMapSet(response, "device_id", JsonValueString(deviceID));
HashMapSet(response, "user_id", JsonValueString(userID));
Free(userID);
Free(deviceID);
return response;
}

View file

@ -81,7 +81,7 @@ UserHistoricalValidate(char *localpart, char *domain)
return 0; return 0;
} }
if (!(c >= 0x21 && c <= 0x39) || (c >= 0x3B && c <= 0x7E)) if (!((c >= 0x21 && c <= 0x39) || (c >= 0x3B && c <= 0x7E)))
{ {
return 0; return 0;
} }

View file

@ -65,6 +65,7 @@ ROUTE(RouteLogin); /* /_matrix/client/(r0|v3)/login */
ROUTE(RouteLogout); /* /_matrix/client/(r0|v3)/logout */ ROUTE(RouteLogout); /* /_matrix/client/(r0|v3)/logout */
ROUTE(RouteRegister); /* /_matrix/client/(r0|v3)/register */ ROUTE(RouteRegister); /* /_matrix/client/(r0|v3)/register */
ROUTE(RouteRefresh); /* /_matrix/client/(r0|v3)/refresh */ ROUTE(RouteRefresh); /* /_matrix/client/(r0|v3)/refresh */
ROUTE(RouteWhoami); /* /_matrix/client/(r0|v3)/whoami */
#undef ROUTE #undef ROUTE

View file

@ -63,7 +63,7 @@ matrix_login() {
printf ' },' printf ' },'
printf ' "initial_device_display_name": "Telodendria Patch Script",' printf ' "initial_device_display_name": "Telodendria Patch Script",'
printf ' "type": "m.login.password",' printf ' "type": "m.login.password",'
printf ' "password": %s' "$(json -e $MXPW)" printf ' "password": %s' "$(json -e "$MXPW")"
printf '}' printf '}'
) )
curlec -X POST -d "$JSON" $HS_BASE/_matrix/client/v3/login curlec -X POST -d "$JSON" $HS_BASE/_matrix/client/v3/login