Begin working on User-Interactive authentication fallback.

This commit is contained in:
Jordan Bancino 2023-04-15 02:36:28 +00:00
parent e882693c78
commit 6ca1265076
5 changed files with 86 additions and 16 deletions

View file

@ -49,6 +49,9 @@ Milestone: v0.3.0
[x] Replace current routing system [x] Replace current routing system
[x] Add route for requestToken endpoints [x] Add route for requestToken endpoints
[x] Move TelodendriaBuildRouter() to Routes [x] Move TelodendriaBuildRouter() to Routes
[ ] User-Interactive fallback
[ ] Password
[ ] Registration token
[ ] Token permissions [ ] Token permissions
[ ] Move configuration to database [ ] Move configuration to database

View file

@ -47,6 +47,7 @@ RouterBuild(void)
R("/_matrix/static", RouteStaticDefault); R("/_matrix/static", RouteStaticDefault);
R("/_matrix/static/client/login", RouteStaticLogin); R("/_matrix/static/client/login", RouteStaticLogin);
R("/_matrix/client/v3/auth/(.*)/fallback/web", RouteUiaFallback);
R("/_matrix/client/v3/login", RouteLogin); R("/_matrix/client/v3/login", RouteLogin);
R("/_matrix/client/v3/logout", RouteLogout); R("/_matrix/client/v3/logout", RouteLogout);

View file

@ -0,0 +1,79 @@
/*
* 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 <Html.h>
ROUTE_IMPL(RouteUiaFallback, path, argp)
{
RouteArgs *args = argp;
Stream *stream = HttpServerStream(args->context);
HashMap *requestParams = HttpRequestParams(args->context);
char *authType = ArrayGet(path, 0);
char *sessionId;
if (!authType)
{
/* This should never happen */
HttpResponseStatus(args->context, HTTP_INTERNAL_SERVER_ERROR);
return MatrixErrorCreate(M_UNKNOWN);
}
sessionId = HashMapGet(requestParams, "session");
if (!sessionId)
{
HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
return MatrixErrorCreate(M_MISSING_PARAM);
}
HttpResponseHeader(args->context, "Content-Type", "text/html");
HttpSendHeaders(args->context);
HtmlBegin(stream, "Authentication");
if (strcmp(authType, "m.login.dummy") == 0)
{
/* TODO */
}
else if (strcmp(authType, "m.login.password") == 0)
{
/* TODO */
}
else if (strcmp(authType, "m.login.registration_token") == 0)
{
/* TODO */
}
/*
* TODO: implement m.login.recaptcha, m.login.sso,
* m.login.email.identity, m.login.msisdn here
*/
else
{
HttpResponseStatus(args->context, HTTP_NOT_FOUND);
StreamPrintf(stream,
"<p>Unknown auth type: <code>%s</code></p>", authType);
}
HtmlEnd(stream);
return NULL;
}

View file

@ -416,22 +416,8 @@ UiaComplete(Array * flows, HttpServerContext * context, Db * db,
RegTokenClose(tokenInfo); RegTokenClose(tokenInfo);
RegTokenFree(tokenInfo); RegTokenFree(tokenInfo);
} }
else if (strcmp(authType, "m.login.recaptcha") == 0) /* TODO: implement m.login.recaptcha, m.login.sso,
{ * m.login.email.identity, m.login.msisdn here */
/* TODO */
}
else if (strcmp(authType, "m.login.sso") == 0)
{
/* TODO */
}
else if (strcmp(authType, "m.login.email.identity") == 0)
{
/* TODO */
}
else if (strcmp(authType, "m.login.msisdn") == 0)
{
/* TODO */
}
else else
{ {
HttpResponseStatus(context, HTTP_UNAUTHORIZED); HttpResponseStatus(context, HTTP_UNAUTHORIZED);

View file

@ -65,6 +65,7 @@ ROUTE(RouteTokenValid);
ROUTE(RouteUserProfile); ROUTE(RouteUserProfile);
ROUTE(RouteRequestToken); ROUTE(RouteRequestToken);
ROUTE(RouteUiaFallback);
ROUTE(RouteStaticDefault); ROUTE(RouteStaticDefault);
ROUTE(RouteStaticLogin); ROUTE(RouteStaticLogin);