forked from Telodendria/Telodendria
Add route for requestToken endpoints.
This commit is contained in:
parent
b21d018daa
commit
e882693c78
6 changed files with 175 additions and 4 deletions
4
TODO.txt
4
TODO.txt
|
@ -44,10 +44,10 @@ Milestone: v0.3.0
|
||||||
[x] Pass TLS certs and keys into HttpServer
|
[x] Pass TLS certs and keys into HttpServer
|
||||||
[x] Debug OpenSSL
|
[x] Debug OpenSSL
|
||||||
[x] Replace all usages of curl with http
|
[x] Replace all usages of curl with http
|
||||||
[~] Proper HTTP request router
|
[x] Proper HTTP request router
|
||||||
[x] Support regex matching
|
[x] Support regex matching
|
||||||
[x] Replace current routing system
|
[x] Replace current routing system
|
||||||
[ ] Add route for requestToken endpoints
|
[x] Add route for requestToken endpoints
|
||||||
[x] Move TelodendriaBuildRouter() to Routes
|
[x] Move TelodendriaBuildRouter() to Routes
|
||||||
[ ] Token permissions
|
[ ] Token permissions
|
||||||
|
|
||||||
|
|
|
@ -60,10 +60,8 @@ RouterBuild(void)
|
||||||
|
|
||||||
R("/_matrix/client/v1/register/m.login.registration_token/validity", RouteTokenValid);
|
R("/_matrix/client/v1/register/m.login.registration_token/validity", RouteTokenValid);
|
||||||
|
|
||||||
#if 0
|
|
||||||
R("/_matrix/client/v3/account/password/(email|msisdn)/requestToken", RouteRequestToken);
|
R("/_matrix/client/v3/account/password/(email|msisdn)/requestToken", RouteRequestToken);
|
||||||
R("/_matrix/client/v3/register/(email|msisdn)/requestToken", RouteRequestToken);
|
R("/_matrix/client/v3/register/(email|msisdn)/requestToken", RouteRequestToken);
|
||||||
#endif
|
|
||||||
|
|
||||||
R("/_matrix/client/v3/profile/(.*)", RouteUserProfile);
|
R("/_matrix/client/v3/profile/(.*)", RouteUserProfile);
|
||||||
R("/_matrix/client/v3/profile/(.*)/(avatar_url|displayname)", RouteUserProfile);
|
R("/_matrix/client/v3/profile/(.*)/(avatar_url|displayname)", RouteUserProfile);
|
||||||
|
|
149
src/Routes/RouteRequestToken.c
Normal file
149
src/Routes/RouteRequestToken.c
Normal file
|
@ -0,0 +1,149 @@
|
||||||
|
/*
|
||||||
|
* 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 <Str.h>
|
||||||
|
#include <Json.h>
|
||||||
|
|
||||||
|
ROUTE_IMPL(RouteRequestToken, path, argp)
|
||||||
|
{
|
||||||
|
RouteArgs *args = argp;
|
||||||
|
char *type = ArrayGet(path, 0);
|
||||||
|
HashMap *request;
|
||||||
|
HashMap *response;
|
||||||
|
JsonValue *val;
|
||||||
|
char *str;
|
||||||
|
|
||||||
|
if (HttpRequestMethodGet(args->context) != HTTP_POST)
|
||||||
|
{
|
||||||
|
HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
|
||||||
|
return MatrixErrorCreate(M_UNRECOGNIZED);
|
||||||
|
}
|
||||||
|
|
||||||
|
request = JsonDecode(HttpServerStream(args->context));
|
||||||
|
if (!request)
|
||||||
|
{
|
||||||
|
HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
|
||||||
|
return MatrixErrorCreate(M_NOT_JSON);
|
||||||
|
}
|
||||||
|
|
||||||
|
val = HashMapGet(request, "client_secret");
|
||||||
|
if (!val || JsonValueType(val) != JSON_STRING)
|
||||||
|
{
|
||||||
|
HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
|
||||||
|
response = MatrixErrorCreate(M_BAD_JSON);
|
||||||
|
goto finish;
|
||||||
|
}
|
||||||
|
|
||||||
|
str = JsonValueAsString(val);
|
||||||
|
if (strlen(str) > 255 || StrBlank(str))
|
||||||
|
{
|
||||||
|
HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
|
||||||
|
response = MatrixErrorCreate(M_BAD_JSON);
|
||||||
|
goto finish;
|
||||||
|
}
|
||||||
|
|
||||||
|
val = HashMapGet(request, "send_attempt");
|
||||||
|
if (!val || JsonValueType(val) != JSON_INTEGER)
|
||||||
|
{
|
||||||
|
HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
|
||||||
|
response = MatrixErrorCreate(M_BAD_JSON);
|
||||||
|
goto finish;
|
||||||
|
}
|
||||||
|
|
||||||
|
val = HashMapGet(request, "next_link");
|
||||||
|
if (val && JsonValueType(val) != JSON_STRING)
|
||||||
|
{
|
||||||
|
HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
|
||||||
|
response = MatrixErrorCreate(M_BAD_JSON);
|
||||||
|
goto finish;
|
||||||
|
}
|
||||||
|
|
||||||
|
val = HashMapGet(request, "id_access_token");
|
||||||
|
if (val && JsonValueType(val) != JSON_STRING)
|
||||||
|
{
|
||||||
|
HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
|
||||||
|
response = MatrixErrorCreate(M_BAD_JSON);
|
||||||
|
goto finish;
|
||||||
|
}
|
||||||
|
|
||||||
|
val = HashMapGet(request, "id_server");
|
||||||
|
if (val && JsonValueType(val) != JSON_STRING)
|
||||||
|
{
|
||||||
|
HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
|
||||||
|
response = MatrixErrorCreate(M_BAD_JSON);
|
||||||
|
goto finish;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (strcmp(type, "email") == 0)
|
||||||
|
{
|
||||||
|
val = HashMapGet(request, "email");
|
||||||
|
if (val && JsonValueType(val) != JSON_STRING)
|
||||||
|
{
|
||||||
|
HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
|
||||||
|
response = MatrixErrorCreate(M_BAD_JSON);
|
||||||
|
goto finish;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (strcmp(type, "msisdn") == 0)
|
||||||
|
{
|
||||||
|
val = HashMapGet(request, "country");
|
||||||
|
if (val && JsonValueType(val) != JSON_STRING)
|
||||||
|
{
|
||||||
|
HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
|
||||||
|
response = MatrixErrorCreate(M_BAD_JSON);
|
||||||
|
goto finish;
|
||||||
|
}
|
||||||
|
|
||||||
|
str = JsonValueAsString(val);
|
||||||
|
if (strlen(str) != 2)
|
||||||
|
{
|
||||||
|
HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
|
||||||
|
response = MatrixErrorCreate(M_BAD_JSON);
|
||||||
|
goto finish;
|
||||||
|
}
|
||||||
|
|
||||||
|
val = HashMapGet(request, "phone_number");
|
||||||
|
if (val && JsonValueType(val) != JSON_STRING)
|
||||||
|
{
|
||||||
|
HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
|
||||||
|
response = MatrixErrorCreate(M_BAD_JSON);
|
||||||
|
goto finish;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
/* Should not be possible */
|
||||||
|
HttpResponseStatus(args->context, HTTP_INTERNAL_SERVER_ERROR);
|
||||||
|
response = MatrixErrorCreate(M_UNKNOWN);
|
||||||
|
goto finish;
|
||||||
|
}
|
||||||
|
|
||||||
|
HttpResponseStatus(args->context, HTTP_FORBIDDEN);
|
||||||
|
response = MatrixErrorCreate(M_THREEPID_DENIED);
|
||||||
|
|
||||||
|
finish:
|
||||||
|
JsonFree(request);
|
||||||
|
return response;
|
||||||
|
}
|
20
src/Str.c
20
src/Str.c
|
@ -29,6 +29,7 @@
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
#include <ctype.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
@ -194,6 +195,25 @@ StrConcat(size_t nStr,...)
|
||||||
return str;
|
return str;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
StrBlank(const char *str)
|
||||||
|
{
|
||||||
|
int blank = 1;
|
||||||
|
size_t i = 0;
|
||||||
|
|
||||||
|
while (str[i])
|
||||||
|
{
|
||||||
|
blank &= isspace(str[i]);
|
||||||
|
/* No need to continue if we don't have a blank */
|
||||||
|
if (!blank)
|
||||||
|
{
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
return blank;
|
||||||
|
}
|
||||||
|
|
||||||
char *
|
char *
|
||||||
StrRandom(size_t len)
|
StrRandom(size_t len)
|
||||||
{
|
{
|
||||||
|
|
|
@ -63,6 +63,7 @@ ROUTE(RouteWhoami);
|
||||||
ROUTE(RouteChangePwd);
|
ROUTE(RouteChangePwd);
|
||||||
ROUTE(RouteTokenValid);
|
ROUTE(RouteTokenValid);
|
||||||
ROUTE(RouteUserProfile);
|
ROUTE(RouteUserProfile);
|
||||||
|
ROUTE(RouteRequestToken);
|
||||||
|
|
||||||
ROUTE(RouteStaticDefault);
|
ROUTE(RouteStaticDefault);
|
||||||
ROUTE(RouteStaticLogin);
|
ROUTE(RouteStaticLogin);
|
||||||
|
|
|
@ -38,6 +38,9 @@ extern char *
|
||||||
extern char *
|
extern char *
|
||||||
StrConcat(size_t,...);
|
StrConcat(size_t,...);
|
||||||
|
|
||||||
|
extern int
|
||||||
|
StrBlank(const char *str);
|
||||||
|
|
||||||
extern char *
|
extern char *
|
||||||
StrRandom(size_t);
|
StrRandom(size_t);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue