From 9899aadcd2b194e9ea53f49245eb1ee3874b7c69 Mon Sep 17 00:00:00 2001 From: Load Accumulator Date: Thu, 2 Nov 2023 13:39:37 +0100 Subject: [PATCH] [MOD] Refactor registration to use j2s. --- Schema/Registration.json | 17 +++++ src/Routes/RouteRegister.c | 136 +++++++++++-------------------------- 2 files changed, 57 insertions(+), 96 deletions(-) create mode 100644 Schema/Registration.json diff --git a/Schema/Registration.json b/Schema/Registration.json new file mode 100644 index 0000000..f9db09c --- /dev/null +++ b/Schema/Registration.json @@ -0,0 +1,17 @@ +{ + "header": "Schema\/Registration.h", + "types": { + "RegistrationRequest": { + "fields": { + "username": { "type": "string" }, + "password": { "type": "string" }, + "device_id": { "type": "string" }, + "inhibit_login": { "type": "boolean" }, + "initial_device_display_name": { "type": "string" }, + "refresh_token": { "type": "boolean" } + }, + "type": "struct" + } + }, + "guard": "TELODENDRIA_SCHEMA_REGISTRATION_H" +} diff --git a/src/Routes/RouteRegister.c b/src/Routes/RouteRegister.c index 5422c58..68fc4bd 100644 --- a/src/Routes/RouteRegister.c +++ b/src/Routes/RouteRegister.c @@ -30,6 +30,8 @@ #include #include +#include + #include #include #include @@ -55,22 +57,15 @@ ROUTE_IMPL(RouteRegister, path, argp) HashMap *request = NULL; HashMap *response = NULL; - JsonValue *val; + RegistrationRequest regReq; char *kind; - - char *username = NULL; - char *password = NULL; - char *initialDeviceDisplayName = NULL; - int refreshToken = 0; - int inhibitLogin = 0; - char *deviceId = NULL; char *fullUsername; + char *msg; + char *username; Db *db = args->matrixArgs->db; - User *user = NULL; - Array *uiaFlows = NULL; int uiaResult; @@ -79,6 +74,16 @@ ROUTE_IMPL(RouteRegister, path, argp) Config *config = ConfigLock(db); + regReq.username = NULL; + regReq.password = NULL; + regReq.device_id = NULL; + regReq.initial_device_display_name = NULL; + regReq.refresh_token = 0; + regReq.inhibit_login = 0; + + + + if (!config) { Log(LOG_ERR, "Registration endpoint failed to lock configuration."); @@ -102,26 +107,23 @@ ROUTE_IMPL(RouteRegister, path, argp) response = MatrixErrorCreate(M_NOT_JSON, NULL); goto end; } - - val = HashMapGet(request, "username"); - if (val) + if (!RegistrationRequestFromJson(request, ®Req, &msg)) { - if (JsonValueType(val) != JSON_STRING) - { - HttpResponseStatus(args->context, HTTP_BAD_REQUEST); - response = MatrixErrorCreate(M_BAD_JSON, NULL); - goto finish; - } - username = StrDuplicate(JsonValueAsString(val)); + HttpResponseStatus(args->context, HTTP_BAD_REQUEST); + response = MatrixErrorCreate(M_NOT_JSON, msg); + goto end; + } - if (!UserValidate(username, config->serverName)) + if (regReq.username) + { + if (!UserValidate(regReq.username, config->serverName)) { HttpResponseStatus(args->context, HTTP_BAD_REQUEST); response = MatrixErrorCreate(M_INVALID_USERNAME, NULL); goto finish; } - if (UserExists(db, username)) + if (UserExists(db, regReq.username)) { HttpResponseStatus(args->context, HTTP_BAD_REQUEST); response = MatrixErrorCreate(M_USER_IN_USE, NULL); @@ -158,99 +160,44 @@ ROUTE_IMPL(RouteRegister, path, argp) /* We don't support guest accounts yet */ if (kind && !StrEquals(kind, "user")) { + msg = "Guest accounts are currently not supported"; HttpResponseStatus(args->context, HTTP_FORBIDDEN); - response = MatrixErrorCreate(M_INVALID_PARAM, NULL); + response = MatrixErrorCreate(M_INVALID_PARAM, msg); goto finish; } - val = HashMapGet(request, "password"); - if (!val) + if (!regReq.password) { + msg = "'password' field is unset"; HttpResponseStatus(args->context, HTTP_BAD_REQUEST); - response = MatrixErrorCreate(M_MISSING_PARAM, NULL); + response = MatrixErrorCreate(M_MISSING_PARAM, msg); goto finish; } - if (JsonValueType(val) != JSON_STRING) - { - HttpResponseStatus(args->context, HTTP_BAD_REQUEST); - response = MatrixErrorCreate(M_BAD_JSON, NULL); - goto finish; - } + /* All of the other fields are optional, we don't have to check + * them. */ - password = StrDuplicate(JsonValueAsString(val)); - - val = HashMapGet(request, "device_id"); - if (val) - { - if (JsonValueType(val) != JSON_STRING) - { - HttpResponseStatus(args->context, HTTP_BAD_REQUEST); - response = MatrixErrorCreate(M_BAD_JSON, NULL); - goto finish; - } - - deviceId = StrDuplicate(JsonValueAsString(val)); - } - - val = HashMapGet(request, "inhibit_login"); - if (val) - { - if (JsonValueType(val) != JSON_BOOLEAN) - { - HttpResponseStatus(args->context, HTTP_BAD_REQUEST); - response = MatrixErrorCreate(M_BAD_JSON, NULL); - goto finish; - } - - inhibitLogin = JsonValueAsBoolean(val); - } - - val = HashMapGet(request, "initial_device_display_name"); - if (val) - { - if (JsonValueType(val) != JSON_STRING) - { - HttpResponseStatus(args->context, HTTP_BAD_REQUEST); - response = MatrixErrorCreate(M_BAD_JSON, NULL); - goto finish; - } - - initialDeviceDisplayName = StrDuplicate(JsonValueAsString(val)); - } - - val = HashMapGet(request, "refresh_token"); - if (val) - { - if (JsonValueType(val) != JSON_BOOLEAN) - { - HttpResponseStatus(args->context, HTTP_BAD_REQUEST); - response = MatrixErrorCreate(M_BAD_JSON, NULL); - goto finish; - } - - refreshToken = JsonValueAsBoolean(val); - } - - user = UserCreate(db, username, password); + user = UserCreate(db, regReq.username, regReq.password); response = HashMapCreate(); - fullUsername = StrConcat(4, "@", UserGetName(user), ":", config->serverName); + fullUsername = StrConcat(4, + "@", UserGetName(user), ":", config->serverName); HashMapSet(response, "user_id", JsonValueString(fullUsername)); Free(fullUsername); HttpResponseStatus(args->context, HTTP_OK); - if (!inhibitLogin) + if (!regReq.inhibit_login) { - UserLoginInfo *loginInfo = UserLogin(user, password, deviceId, - initialDeviceDisplayName, refreshToken); + UserLoginInfo *loginInfo = UserLogin(user, regReq.password, + regReq.device_id, regReq.initial_device_display_name, + regReq.refresh_token); HashMapSet(response, "access_token", JsonValueString(loginInfo->accessToken->string)); HashMapSet(response, "device_id", JsonValueString(loginInfo->accessToken->deviceId)); - if (refreshToken) + if (regReq.refresh_token) { HashMapSet(response, "expires_in_ms", JsonValueInteger(loginInfo->accessToken->lifetime)); @@ -294,10 +241,7 @@ ROUTE_IMPL(RouteRegister, path, argp) UserUnlock(user); finish: UiaFlowsFree(uiaFlows); - Free(username); - Free(password); - Free(deviceId); - Free(initialDeviceDisplayName); + RegistrationRequestFree(®Req); JsonFree(request); } else