plate/telodendria
1
0
Fork 0
forked from lda/telodendria
Code Pull requests Activity Actions

Finish up Uia fallback.

Browse source
This commit is contained in:
Jordan Bancino 2023-04-22 15:40:25 +00:00
parent 5431c2cd90
commit 737e060243
3 changed files with 33 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Routes/RouteStaticResources.c
View file

@ -67,7 +67,11 @@ ROUTE_IMPL(RouteStaticResources, path, argp)
" var xhr = new XMLHttpRequest();"
" xhr.open(meth, url);"
" xhr.setRequestHeader('Content-Type', 'application/json');"
" xhr.onreadystatechange = () => cb(xhr);"
" xhr.onreadystatechange = () => {"
" if (xhr.readyState == 4) {"
" cb(xhr);"
" }"
" };"
" xhr.send(JSON.stringify(json));"
"}"
"function onFormSubmit(frm, cb) {"

43
src/Routes/RouteUiaFallback.c
View file

@ -67,19 +67,14 @@ ROUTE_IMPL(RouteUiaFallback, path, argp)
return MatrixErrorCreate(M_NOT_JSON);
}
Log(LOG_DEBUG, "Building flows...");
flow = ArrayCreate();
flows = ArrayCreate();
ArrayAdd(flow, UiaStageBuild(authType, NULL));
ArrayAdd(flows, flow);
Log(LOG_DEBUG, "about to UiaComplete()...");
uiaResult = UiaComplete(flows, args->context,
args->matrixArgs->db, request, &response, config);
Log(LOG_DEBUG, "Freeing flows...");
UiaFlowsFree(flows);
Log(LOG_DEBUG, "Completed UIA.");
if (uiaResult < 0)
{
HttpResponseStatus(args->context, HTTP_INTERNAL_SERVER_ERROR);
@ -123,12 +118,26 @@ ROUTE_IMPL(RouteUiaFallback, path, argp)
"<input type=\"submit\" value=\"Authenticate\">");
HtmlEndForm(stream);
HtmlBeginJs(stream);
/* TODO */
StreamPuts(stream,
StreamPrintf(stream,
"function buildRequest() {"
" setFormError('Not implemented yet.');"
" return false;"
"}");
" let user = document.getElementById('user').value;"
" let pass = document.getElementById('password').value;"
" if (!user || !pass) {"
" setFormError('Please specify a username and password.');"
" return false;"
" }"
" return {"
" auth: {"
" type: '%s',"
" identifier: {"
" type: 'm.id.user',"
" user: user"
" },"
" password: pass,"
" session: '%s'"
" }"
" };"
"}", authType, sessionId);
HtmlEndJs(stream);
}
else if (strcmp(authType, "m.login.registration_token") == 0)
@ -171,9 +180,11 @@ ROUTE_IMPL(RouteUiaFallback, path, argp)
}
HtmlBeginJs(stream);
StreamPuts(stream,
StreamPrintf(stream,
"function processResponse(xhr) {"
" if (xhr.status == 200) {"
" let r = JSON.parse(xhr.responseText);"
" console.log(r);"
" if (xhr.status == 200 || r.completed.includes('%s')) {"
" if (window.onAuthDone) {"
" window.onAuthDone();"
" } else if (window.opener && window.opener.postMessage) {"
@ -181,12 +192,12 @@ ROUTE_IMPL(RouteUiaFallback, path, argp)
" } else {"
" setFormError('Client error.');"
" }"
" } else if (r.session != '%s') {"
" setFormError('Invalid session.');"
" } else {"
" console.log(xhr.responseText);"
" let r = JSON.parse(xhr.responseText);"
" setFormError(`${r.errcode}: ${r.error}`);"
" setFormError('Invalid credentials.');"
" }"
"}");
"}", authType, sessionId);
StreamPuts(stream,
"onFormSubmit('auth-form', (frm) => {"

1
tools/env.sh
View file

@ -33,3 +33,4 @@ fi
export PATH="$(pwd)/tools/bin:$(pwd)/build/tools:$PATH"
export MANPATH="$(pwd)/man:$MANPATH"
export MALLOC_OPTIONS="CFGJS"