Update to release v2.

Let's try again.
Apparently on: [tags] doesn't work.
2024-09-21 17:03:14 -04:00 · 2024-09-21 16:59:42 -04:00 · 2024-09-21 16:55:55 -04:00 · 2024-09-21 16:52:41 -04:00 · 2024-09-21 16:36:26 -04:00 · 2024-09-21 16:35:18 -04:00
36 changed files with 1427 additions and 269 deletions
--- a/.forgejo/issue_template/bug_report.yaml
+++ b/.forgejo/issue_template/bug_report.yaml
--- a/.forgejo/issue_template/config.yaml
+++ b/.forgejo/issue_template/config.yaml
--- a/.forgejo/issue_template/feature_request.yaml
+++ b/.forgejo/issue_template/feature_request.yaml
--- a/.forgejo/pull_request_template.md
+++ b/.forgejo/pull_request_template.md
--- a/.forgejo/workflows/compile.yaml
+++ b/.forgejo/workflows/compile.yaml
@ -0,0 +1,27 @@
+name: Compile Telodendria
+run-name: Compile Telodendria on ${{ forgejo.actor }}
+on:
+  push:
+    branches:
+      - 'ma*'
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+    "Compile Telodendria":
+        strategy:
+            matrix:
+                os: [alpine]
+                arch: [aarch64]
+        runs-on: ["${{ matrix.os }}", "${{ matrix.arch }}"]
+        steps:
+            - name: Check out repository
+              uses: actions/checkout@v4
+              with:
+                submodules: true
+            - name: Configure Telodendria
+              run: ./configure
+            - name: Configure & Build Cytoplasm
+              run: make cytoplasm
+            - name: Build Telodendria
+              run: make
--- a/.forgejo/workflows/release.yaml
+++ b/.forgejo/workflows/release.yaml
@ -0,0 +1,44 @@
+name: Release Telodendria
+run-name: Release Telodendria on ${{ forgejo.actor }}
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+    "Release Telodendria":
+        strategy:
+            matrix:
+                os: [alpine]
+                arch: [aarch64]
+        runs-on: ["${{ matrix.os }}", "${{ matrix.arch }}"]
+        steps:
+            - name: Check out repository
+              uses: actions/checkout@v4
+              with:
+                submodules: true
+            - name: Archive submodules
+              run: git submodule foreach --recursive 'git archive --format tar --prefix=$displaypath/ -o submodule.tar HEAD'
+            - name: Archive repository
+              run: git archive --format tar -o release.tar HEAD
+            - name: Produce release archive
+              run: |
+                TOPDIR=$(pwd) git submodule --quiet foreach --recursive 'cd $TOPDIR; tar --concatenate --file=release.tar $displaypath/submodule.tar; rm -fv $displaypath/submodule.tar'
+                gzip release.tar
+                mkdir release
+                mv release.tar.gz release/Telodendria-$GITHUB_REF_NAME.tar.gz
+            - name: Upload artifact
+              uses: actions/upload-artifact@v3
+              with:
+                name: Telodendria-$GITHUB_REF_NAME.tar.gz
+                path: release/Telodendria-$GITHUB_REF_NAME.tar.gz
+            - name: Publish release
+              uses: actions/forgejo-release@v2
+              with:
+                tag: $GITHUB_REF_NAME
+                title: "Telodendria $GITHUB_REF_NAME"
+                release-dir: release/
+                release-notes: "docs/CHANGELOG.md"
+                direction: upload
+                prerelease: true
--- a/.gitmodules
+++ b/.gitmodules
@ -0,0 +1,3 @@
+[submodule "Cytoplasm"]
+	path = Cytoplasm
+	url = https://git.telodendria.io/Telodendria/Cytoplasm.git
--- a/1
+++ b/1
@ -0,0 +1 @@
+Subproject commit 4f316ff7b3a955b831ca4aefb8679ddf3396a7d0
--- a/Schema/UserDirectoryRequest.json
+++ b/Schema/UserDirectoryRequest.json
@ -0,0 +1,13 @@
+{
+  "header": "Schema\/UserDirectoryRequest.h",
+  "types": {
+    "UserDirectoryRequest": {
+      "fields": {
+        "search_term": { "type": "string" },
+        "limit": { "type": "integer" }
+      },
+      "type": "struct"
+    }
+  },
+  "guard": "TELODENDRIA_SCHEMA_USERDIRECTORYREQUEST_H"
+}
--- a/123
+++ b/123
@ -13,13 +13,40 @@ SRC="src"
 INCLUDE="src/include"
 TOOLS="tools/src"
 SCHEMA="Schema"
+CYTOPLASM="Cytoplasm"

-CFLAGS="-Wall -Wextra -pedantic -std=c89 -O3 -pipe -D_DEFAULT_SOURCE -I${INCLUDE} -I${BUILD}"
+CFLAGS="-O1 -D_DEFAULT_SOURCE -I${INCLUDE} -I${BUILD}"
 LIBS="-lm -pthread -lCytoplasm"


 # Set default args for all platforms
-SCRIPT_ARGS="--cc=cc --prefix=/usr/local --enable-ld-extra --bin-name=telodendria --version=1.7.0-alpha4 --static $@"
+SCRIPT_ARGS="--prefix=/usr/local --bin-name=telodendria --version=1.7.0-alpha4"
+
+if [ -f "${CYTOPLASM}/configure" ]; then
+    SCRIPT_ARGS="${SCRIPT_ARGS} --cytoplasm=${CYTOPLASM}"
+else
+    SCRIPT_ARGS="${SCRIPT_ARGS} --cytoplasm=" # No cytoplasm path.
+fi
+
+# Set compiler depending on the platform.
+case "$(uname)" in
+    Linux|NetBSD)
+        # These systems typically use GCC.
+        SCRIPT_ARGS="${SCRIPT_ARGS} --cc=gcc"
+        ;;
+    OpenBSD|FreeBSD|Darwin)
+        # These systems typically use Clang.
+        SCRIPT_ARGS="${SCRIPT_ARGS} --cc=clang"
+        ;;
+    *)
+        # Use default compiler which is required to be present on
+        # all POSIX-compliant systems.
+        SCRIPT_ARGS="${SCRIPT_ARGS} --cc=c99"
+        ;;
+esac
+
+# Append any additional args specified by user
+SCRIPT_ARGS="${SCRIPT_ARGS} $@"

 echo "Processing options..."
 echo "Ran with arguments: $SCRIPT_ARGS"
@ -29,16 +56,18 @@ for arg in $SCRIPT_ARGS; do
    case "$arg" in
        --cc=*)
            CC=$(echo "$arg" | cut -d '=' -f 2-)
+            case "${CC}" in
+                gcc*|clang*)
+                    # "Fancy" compilers that support a plethora of additional flags we
+                    # want to enable if present.
+                    CFLAGS="-Wall -Wextra -Werror -pedantic -std=c99 -O3 ${CFLAGS}"
+                    LDFLAGS="${LDFLAGS} -flto -fdata-sections -ffunction-sections -s -Wl,-gc-sections"
+                    ;;
+            esac
            ;;
        --prefix=*)
            PREFIX=$(echo "$arg" | cut -d '=' -f 2-)
            ;;
-        --enable-ld-extra)
-            LD_EXTRA="-flto -fdata-sections -ffunction-sections -s -Wl,-gc-sections"
-            ;;
-        --disable-ld-extra)
-            LD_EXTRA=""
-            ;;
        --bin-name=*)
            BIN_NAME=$(echo "$arg" | cut -d '=' -f 2-)
            ;;
@ -47,20 +76,22 @@ for arg in $SCRIPT_ARGS; do
            ;;
        --enable-debug)
            DEBUG="-O0 -g"
-            echo "Notice: --enable-debug implies --disable-ld-extra and --no-static."
-            echo "You must explicitly provide --enable-ld-extra and/or --static after"
-            echo "specifying --enable-debug if you wish to enable these features in debug mode."
-            LD_EXTRA=""
-            STATIC=""
            ;;
        --disable-debug)
            DEBUG=""
            ;;
-        --static)
-            STATIC="-static -Wl,-static"
-            ;;
-        --no-static)
-            STATIC=""
+        --cytoplasm=*)
+            CYTOPLASM=$(echo "$arg" | cut -d '=' -f 2-)
+            if [ -n "${CYTOPLASM}" ]; then
+                if [ ! -f "${CYTOPLASM}/configure" ]; then
+                    echo "Path for Cytoplasm does not appear to actually contain Cytoplasm source:"
+                    echo "${CYTOPLASM}"
+                    exit 1
+                fi
+
+                CFLAGS="${CFLAGS} -I${CYTOPLASM}/include"
+                LDFLAGS="-L${CYTOPLASM}/out/lib ${LDFLAGS}"
+            fi
            ;;
        *)
            echo "Invalid argument: $arg"
@ -70,7 +101,7 @@ for arg in $SCRIPT_ARGS; do
 done

 CFLAGS="${CFLAGS} '-DTELODENDRIA_VERSION=\"${VERSION}\"' ${DEBUG}"
-LDFLAGS="${LIBS} ${LD_EXTRA}"
+LDFLAGS="${LDFLAGS} ${LIBS}"

 #
 # Makefile generation
@ -103,6 +134,16 @@ prefix() {
    done
 }

+cytoplasm_tool() {
+    tool="$1"
+
+    if [ -n "${CYTOPLASM}" ]; then
+        echo "LD_LIBRARY_PATH=${CYTOPLASM}/out/lib ${CYTOPLASM}/out/bin/$tool"
+    else
+        echo "$tool"
+    fi
+}
+
 print_src() {
 	printf '%s ' "$1"
 }
@ -111,11 +152,27 @@ print_obj() {
 	printf '%s ' "$2"
 }

+get_deps() {
+    src="$1"
+
+    ${CC} -I${INCLUDE} -I${BUILD} $(if [ -n "${CYTOPLASM}" ]; then echo "-I${CYTOPLASM}/include"; fi) -E "$src" \
+        | grep '^#'                          \
+        | awk '{print $3}'                   \
+        | cut -d '"' -f 2                    \
+        | sort                               \
+        | uniq                               \
+        | grep -v '^[/<]'                    \
+        | grep -e "^${SRC}/" -e "^${BUILD}/" \
+        | while IFS= read -r dep; do
+        printf "%s " "$dep"
+    done
+}
+
 compile_obj() {
 	src="$1"
 	obj="$2"

-	pref=$(${CC} -I${INCLUDE} -I${BUILD} -MM -MT "${obj}" "${src}")
+	pref="${obj}: $(get_deps ${src})"
    echo "$pref $(collect ${SCHEMA}/ .json .h ${BUILD}/Schema/ print_obj)"
 	echo "${TAB}@mkdir -p $(dirname ${obj})"
 	echo "${TAB}\$(CC) \$(CFLAGS) -fPIC -c -o \"${obj}\" \"${src}\""
@ -129,7 +186,7 @@ compile_bin() {
    
    echo "${out}: ${src}"
    echo "${TAB}@mkdir -p ${OUT}/bin"
-    echo "${TAB}\$(CC) \$(CFLAGS) -o \"${out}\" \"${src}\" $depObjs \$(LDFLAGS) ${STATIC}"
+    echo "${TAB}\$(CC) \$(CFLAGS) -o \"${out}\" \"${src}\" $depObjs \$(LDFLAGS)"
 }

 compile_doc() {
@ -142,7 +199,7 @@ compile_doc() {

 	echo "${out}: ${src}"
 	echo "${TAB}@mkdir -p ${OUT}/man/man3"
-	echo "${TAB}hdoc -D \"Os=${BIN_NAME}\" -i \"${src}\" -o \"${out}\""
+	echo "${TAB}$(cytoplasm_tool hdoc) -D \"Os=${BIN_NAME}\" -i \"${src}\" -o \"${out}\""
 }

 print_doc() {
@ -160,11 +217,11 @@ compile_schema() {

    echo "${BUILD}/Schema/${out}.h:"
    echo "${TAB}@mkdir -p ${BUILD}/Schema"
-    echo "${TAB}j2s -s \"${src}\" -h \"${BUILD}/Schema/${out}.h\" -c \"${BUILD}/Schema/${out}.c\""
+    echo "${TAB}$(cytoplasm_tool j2s) -s \"${src}\" -h \"${BUILD}/Schema/${out}.h\" -c \"${BUILD}/Schema/${out}.c\""

    echo "${BUILD}/Schema/${out}.c:"
    echo "${TAB}@mkdir -p ${BUILD}/Schema"
-    echo "${TAB}j2s -s \"${src}\" -h \"${BUILD}/Schema/${out}.h\" -c \"${BUILD}/Schema/${out}.c\""
+    echo "${TAB}$(cytoplasm_tool j2s) -s \"${src}\" -h \"${BUILD}/Schema/${out}.h\" -c \"${BUILD}/Schema/${out}.c\""

    echo "${obj}: ${src} ${BUILD}/Schema/${out}.c"
    echo "${TAB}@mkdir -p ${BUILD}/Schema"
@ -174,15 +231,19 @@ compile_schema() {
 install_out() {
 	src="$1"
 	out="$2"
+	dir=$(dirname "$out")

-	echo "${TAB}install -D \"$src\" \"$out\""
+	echo "${TAB}mkdir -p \"$dir\""
+	echo "${TAB}cp \"$src\" \"$out\""
 }

 install_man() {
 	src="${OUT}/man/man3/${BIN_NAME}-$(basename $1 .h).3"
 	out="$2"
+	dir=$(dirname "$out")

-	echo "${TAB}install -D \"$src\" \"$out\""
+	echo "${TAB}mkdir -p \"$dir\""
+	echo "${TAB}cp \"$src\" \"$out\""
 }

 uninstall_out() {
@ -230,7 +291,8 @@ ${TAB}done
 ${BIN_NAME}: ${OUT}/bin/${BIN_NAME}

 install: ${BIN_NAME}
-${TAB}install -D ${OUT}/bin/${BIN_NAME} \$(PREFIX)/bin/${BIN_NAME}
+${TAB}mkdir -p \$(PREFIX)/bin
+${TAB}cp ${OUT}/bin/${BIN_NAME} \$(PREFIX)/bin/${BIN_NAME}

 uninstall:
 ${TAB}rm \$(PREFIX)/bin/${BIN_NAME}
@ -247,6 +309,13 @@ $(collect ${SRC}/ .c .o ${BUILD}/ compile_obj)
 $(collect ${TOOLS}/ .c '' ${OUT}/bin/ compile_bin)
 $(collect ${INCLUDE}/ .h .3 ${OUT}/man/man3/${BIN_NAME}- compile_doc)

+$(
+if [ -n "${CYTOPLASM}" ]; then
+    echo "cytoplasm:"
+    echo "${TAB}cd ${CYTOPLASM} && ./configure && \$(MAKE)"
+fi
+)
+
 EOF

 echo "Done. Run 'make' to build ${BIN_NAME}."
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@ -41,6 +41,8 @@ will now be maintained separately and have its own releases as well.
 custom scripts.
 - Greatly simplified some endpoint code by using Cytoplasm's `j2s` for
 parsing request bodies.
+- Create a parser API for grammars found in Matrix, and refactor the 
+User API to use it.

 ### New Features

@ -58,6 +60,10 @@ the ability to change only a subset of the configuration.
    - **GET** `/_telodendria/admin/tokens/[token]`
    - **POST** `/_telodendria/admin/tokens`
    - **DELETE** `/_telodendria/admin/tokens/[token]`
+    - **GET** `/_matrix/client/v3/directory/room/[alias]`
+    - **PUT** `/_matrix/client/v3/directory/room/[alias]`
+    - **DELETE** `/_matrix/client/v3/directory/room/[alias]`
+    - **GET** `/_matrix/client/v3/rooms/[id]/aliases`

 ## v0.3.0

--- a/docs/dev/hosting.md
+++ b/docs/dev/hosting.md
@ -0,0 +1,94 @@
+# Hosting Telodendria
+
+These are just my own personal notes for hosting Telodendria's code infrastructure. This document is not intended to be used by normal Telodendria users or developers. It may be useful if you are *forking* Telodendria, but I sincerely hope you'll contribute to the upstream project instead. I'm writing this document solely for my own reference, but I am placing it into Telodendria's code repository in the name of transparency.
+
+## Runners
+
+The general sequence of steps required for setting up a CI runner is as follows:
+
+1. Install the runner OS with all the defaults. I typically install my runners in virtual machines with 1 vcpu and 512mb RAM. Only Debian complained about this configuration, but since I didn't install a desktop environment, it worked out fine.
+2. Install the packages required to build and execute the runner. These are:
+    - Git for checking out the source code.
+    - NodeJS for running `actions/checkout`, I think. Not really sure, all I know is that the runner will fail all jobs without NodeJS.
+    - Go for compiling the runner itself.
+
+    Run these commands to install the packages:
+    - **OpenBSD:** `pkg_add git go node`
+    - **FreeBSD:** `pkg install git go node`
+    - **NetBSD:** `pkgin install git go nodejs openssl mozilla-rootcerts-openssl`
+      (Note that the `go` executable is `go121` or whatever version was installed. and that NetBSD has no root certificates installed by default)
+    - **Debian:** `apt install git golang nodejs`
+    - **Alpine:** `apk add git go nodejs`
+
+3. Install any development packages required to build Telodendria. For the BSDs, all development tools are built in so no additional packages are necessary. For the Linux distributions I've messed with, install these additional packages:
+    - **Debian:** `apt install make gcc libssl-dev`
+    - **Alpine:** `apk add make gcc musl-dev openssl-dev`
+4. Clone `https://git.telodendria.io/Telodendria/act_runner.git`.
+5. Run `go build` in the `act_runner` directory. On NetBSD, you may have to `umount /tmp` first because `/tmp` is by default very small. Otherwise, make `/tmp` larger during installation. 2GB should be plenty.
+6. Run `./act_runner register` to register the runner. When prompted for the tags, follow following convention:
+    - **Linux Distros:** `linux`, `<distro>-v<version>`, `<arch>`
+    - **BSD Derivatives:** `bsd`, `<osname>-v<version>`, `<arch>`
+    - **Windows:** `windows`, `windows-v<version>`, `<arch>`
+    - **MacOS:** `macos`, `macos-v<version>`, `<arch>`
+    - **Others:** `other`, `<osname>-v<version>`, `<arch>`
+
+    Where `<arch>` is one of `x86` or `x64` for now. ARM runners will be a future project.
+7. Run `./act_runner daemon`.
+
+### Startup Scripts
+
+We will obviously want `act_runner` to execute on bootup. Here are the start scripts I used:
+
+#### Alpine
+
+In `/etc/init.d/act_runner`:
+
+```shell
+#!/sbin/openrc-run
+
+directory="/home/runner/act_runner"
+command="/home/runner/act_runner/act_runner"
+command_args="daemon"
+command_user="runner:runner"
+command_background="true"
+pidfile="/run/act_runner.pid"
+```
+
+Don't forget to `chmod +x /etc/init.d/act_runner`.
+
+Then just `rc-update add act_runner` and `rc-service act_runner start`.
+
+#### Debian
+
+In `/etc/systemd/system/act_runner.service`:
+
+```
+[Unit]
+Description=Gitea Actions runner
+
+[Service]
+ExecStart=/home/runner/act_runner/act_runner daemon
+ExecReload=/bin/kill -s HUP $MAINPID
+WorkingDirectory=/home/runner/act_runner
+TimeoutSec=0
+RestartSec=10
+Restart=always
+User=runner
+
+[Install]
+WantedBy=multi-user.target
+```
+
+Then just `systemctl enable act_runner` and `systemctl start act_runner`.
+
+#### Other
+
+Eventually I got sick of writing init scripts for all the various operating systems.
+
+Just put this in `runner`'s `crontab`:
+
+```
+@reboot cd /home/runner/act_runner && ./act_runner daemon
+```
+
+That seems to do the job good enough, and it's cross platform.
--- a/docs/user/admin/privileges.md
+++ b/docs/user/admin/privileges.md
@ -16,10 +16,10 @@ registration tokens.
 configuration.
 - **GRANT_PRIVILEGES:** Allows a user to modify his or her own
 privileges or the privileges of other local users.
- **ALIAS:** Allows a user to modify room aliases created by other
-users. By default, users can only manage their own room aliases, but
-an administrator may wish to take over an alias or remove an offensive
-alias.
+- **ALIAS:** Allows a user to modify and see room aliases created by 
+other users. By default, users can only manage their own room aliases, 
+but an administrator may wish to take over an alias or remove an 
+offensive alias.
 - **PROC_CONTROL:** Allows a user to get statistics on the running
 process, as well as shutdown and resetart the Telodendria daemon
 itself. Typically this will pair well with **CONFIG**, because there
--- a/src/Config.c
+++ b/src/Config.c
@ -30,7 +30,6 @@
 #include <Cytoplasm/Str.h>
 #include <Cytoplasm/Db.h>
 #include <Cytoplasm/Log.h>
-#include <Cytoplasm/Int64.h>
 #include <Cytoplasm/Util.h>

 #include <sys/types.h>
@ -59,7 +58,7 @@ ConfigParse(HashMap * config, Config *tConfig)

    memset(tConfig, 0, sizeof(Config));

-    tConfig->maxCache = Int64Create(0, 0);
+    tConfig->maxCache = 0;

    if (!ConfigFromJson(config, tConfig, &tConfig->err))
    {
@ -85,17 +84,17 @@ ConfigParse(HashMap * config, Config *tConfig)
    for (i = 0; i < ArraySize(tConfig->listen); i++)
    {
        ConfigListener *listener = ArrayGet(tConfig->listen, i);
-        if (Int64Eq(listener->maxConnections, Int64Create(0, 0)))
+        if (!listener->maxConnections)
        {
-            listener->maxConnections = Int64Create(0, 32);
+            listener->maxConnections = 32;
        }
-        if (Int64Eq(listener->threads, Int64Create(0, 0)))
+        if (!listener->threads)
        {
-            listener->threads = Int64Create(0, 4);
+            listener->threads = 4;
        }
-        if (Int64Eq(listener->port, Int64Create(0, 0)))
+        if (!listener->port)
        {
-            listener->port = Int64Create(0, 8008);
+            listener->port = 8008;
        }
    }
    tConfig->ok = 1;
@ -148,9 +147,9 @@ ConfigCreateDefault(Db * db)
    /* Add simple listener without TLS. */
    config.listen = ArrayCreate();
    listener = Malloc(sizeof(ConfigListener));
-    listener->maxConnections = Int64Create(0, 32);
-    listener->port = Int64Create(0, 8008);
-    listener->threads = Int64Create(0, 4);
+    listener->maxConnections = 32;
+    listener->port = 8008;
+    listener->threads = 4;

    ArrayAdd(config.listen, listener);

--- a/src/Main.c
+++ b/src/Main.c
@ -36,14 +36,12 @@

 #include <Cytoplasm/Args.h>
 #include <Cytoplasm/Memory.h>
-#include <Config.h>
 #include <Cytoplasm/Log.h>
 #include <Cytoplasm/HashMap.h>
 #include <Cytoplasm/Json.h>
 #include <Cytoplasm/HttpServer.h>
 #include <Cytoplasm/Db.h>
 #include <Cytoplasm/Cron.h>
-#include <Uia.h>
 #include <Cytoplasm/Util.h>
 #include <Cytoplasm/Str.h>

@ -52,6 +50,9 @@
 #include <User.h>
 #include <RegToken.h>
 #include <Routes.h>
+#include <Uia.h>
+#include <Config.h>
+

 static Array *httpServers;
 static volatile int restart;
@ -248,7 +249,7 @@ start:
        }

        token = StrRandom(32);
-        info = RegTokenCreate(matrixArgs.db, token, NULL, UInt64Create(0, 0), Int64Create(0, 1), USER_ALL);
+        info = RegTokenCreate(matrixArgs.db, token, NULL, /* expires */ 0, /* uses */ 1, USER_ALL);
        if (!info)
        {
            Free(token);
@ -396,14 +397,14 @@ start:

        if (args.flags & HTTP_FLAG_TLS)
        {
-            if (UInt64Eq(UtilLastModified(serverCfg->tls.cert), UInt64Create(0, 0)))
+            if (!UtilLastModified(serverCfg->tls.cert))
            {
                Log(LOG_ERR, "%s: %s", strerror(errno), serverCfg->tls.cert);
                exit = EXIT_FAILURE;
                goto finish;
            }

-            if (UInt64Eq(UtilLastModified(serverCfg->tls.key), UInt64Create(0, 0)))
+            if (UtilLastModified(serverCfg->tls.key))
            {
                Log(LOG_ERR, "%s: %s", strerror(errno), serverCfg->tls.key);
                exit = EXIT_FAILURE;
--- a/src/Parser.c
+++ b/src/Parser.c
@ -0,0 +1,516 @@
+/*
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * other valuable contributors. See CONTRIBUTORS.txt for the full list.
+ *
+ * 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 <Parser.h>
+
+#include <Cytoplasm/Memory.h>
+#include <Cytoplasm/Str.h>
+
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+
+/* Iterate through a char **. */
+#define Iterate(s) (*(*s)++)
+
+/* Parse an extended localpart */
+static bool
+ParseUserLocalpart(char **str, char **out)
+{
+    char c;
+    char *start;
+    size_t length;
+
+    if (!str || !out)
+    {
+        return false;
+    }
+    /* An extended localpart contains every ASCII printable character, 
+     * except an ':'. */
+    start = *str;
+    while (isascii((c = Iterate(str))) && c != ':' && c)
+    {
+        /* Do nothing */
+    }
+    length = (size_t) (*str - start) - 1;
+    if (length < 1)
+    {
+        *str = start;
+        return false;
+    }
+    if (c == ':')
+    {
+        --(*str);
+    }
+
+    *out = Malloc(length + 1);
+    memcpy(*out, start, length);
+    (*out)[length] = '\0';
+
+    return true;
+}
+
+/* Parses an IPv4 address. */
+static int
+ParseIPv4(char **str, char **out)
+{
+    /* Be *very* careful with this buffer */
+    char buffer[4];
+    char *start;
+    size_t length;
+    char c;
+
+    int digit = 0;
+    int digits = 0;
+
+    memset(buffer, 0, sizeof(buffer));
+    start = *str;
+
+    /* An IPv4 address is made of 4 blocks between 1-3 digits, like so:
+     * (1-3)*DIGIT.(1-3)*DIGIT.(1-3)*DIGIT.(1-3)*DIGIT */
+    while ((isdigit(c = Iterate(str)) || c == '.') && c && digits < 4)
+    {
+        if (isdigit(c))
+        {
+            digit++;
+            continue;
+        }
+        if (digit < 1 || digit > 3)
+        {
+            /* Current digit is too long for the spec! */
+            *str = start;
+            return false;
+        }
+        memcpy(buffer, *str - digit - 1, digit);
+        if (atoi(buffer) > 255)
+        {
+            /* Current digit is too large for the spec! */
+            *str = start;
+            return false;
+        }
+        memset(buffer, 0, sizeof(buffer));
+        digit = 0;
+        digits++; /* We have parsed a digit. */
+    }
+    if (c == '.' || digits != 3)
+    {
+        *str = start;
+        return false;
+    }
+    length = (size_t) (*str - start) - 1;
+    *out = Malloc(length + 1);
+    memcpy(*out, start, length);
+    (*str)--;
+    return true;
+}
+
+static bool
+IsIPv6Char(char c)
+{
+    return (isxdigit(c) || c == ':' || c == '.');
+}
+
+static bool
+ParseIPv6(char **str, char **out)
+{
+    char *start;
+    size_t length;
+    char c;
+
+    int filled = 0;
+    int digit = 0;
+    int digits = 0;
+
+    start = *str;
+    length = 0;
+
+    if (Iterate(str) != '[')
+    {
+        goto fail;
+    }
+
+    while ((c = Iterate(str)) && IsIPv6Char(c) && digits < 8)
+    {
+        char *ipv4;
+        if (isxdigit(c))
+        {
+            digit++;
+            length++;
+            continue;
+        }
+        if (c == ':')
+        {
+            if (**str == ':')
+            {
+                digit = 0;
+                if (!filled)
+                {
+                    filled = 1;
+                    length++;
+                    c = Iterate(str); /* Skip over the character */
+                    continue;
+                }
+                /* RFC3513 says the following:
+                 * > 'The "::" can only appear once in an address.' */
+                *str = start;
+                return false;
+            }
+            if (digit < 1 || digit > 4)
+            {
+                goto fail;
+            }
+            /* We do not have to check whenever the digit here is valid, 
+             * because it has to be. */
+            digit = 0;
+            digits++;
+
+            length++;
+            continue;
+        }
+        /* The only remaining character being '.', we are probably dealing 
+         * with an IPv4 literal. */
+        *str -= digit + 1;
+        length -= digit + 1;
+        if (ParseIPv4(str, &ipv4))
+        {
+            length += strlen(ipv4);
+            Free(ipv4);
+            c = Iterate(str);
+            filled = 1;
+            goto end;
+        }
+    }
+end:
+    --(*str);
+    if (Iterate(str) != ']')
+    {
+        goto fail;
+    }
+
+    length = (size_t) (*str - start);
+    if (length < 4 || length > 47)
+    {
+        goto fail;
+    }
+    *out = Malloc(length + 1);
+    memset(*out, '\0', length + 1);
+    memcpy(*out, start, length);
+
+    return true;
+fail:
+    *str = start;
+    return false;
+}
+
+static bool
+ParseHostname(char **str, char **out)
+{
+    char *start;
+    size_t length = 0;
+    char c;
+
+    start = *str;
+    while ((c = Iterate(str)) && 
+        (isalnum(c) || c == '.' || c == '-') && 
+        ++length < 256)
+    {
+        /* Do nothing. */
+    }
+    if (length < 1 || length > 255)
+    {
+        *str = start;
+        return false;
+    }
+    length = (size_t) (*str - start) - 1;
+    *out = Malloc(length + 1);
+    memcpy(*out, start, length);
+    (*str)--;
+    return true;
+}
+
+static bool
+ParseServerName(char **str, ServerPart *out)
+{
+    char c;
+    char *start;
+    char *startPort;
+    size_t chars = 0;
+
+    char *host = NULL;
+    char *port = NULL;
+
+    if (!str || !out)
+    {
+        return false;
+    }
+
+    start = *str;
+
+    if (!host)
+    {
+        /* If we can parse an IPv4 address, use that. */
+        ParseIPv4(str, &host);
+    }
+    if (!host)
+    {
+        /* If we can parse an IPv6 address, use that. */
+        ParseIPv6(str, &host);
+    }
+    if (!host)
+    {
+        /* If we can parse an hostname, use that. */
+        ParseHostname(str, &host);
+    }
+    if (!host)
+    {
+        /* Can't parse a valid server name. */
+        return false;
+    }
+    /* Now, there's only 2 options: a ':', or the end(everything else.) */
+    if (**str != ':')
+    {
+        /* We're done. */
+        out->hostname = host;
+        out->port = NULL;
+        return true;
+    }
+    /* TODO: Separate this out */
+    startPort = ++(*str);
+    while(isdigit(c = Iterate(str)) && c && ++chars < 5)
+    {
+        /* Do nothing. */
+    }
+    if (chars < 1 || chars > 5)
+    {
+        *str = start;
+        Free(host);
+        host = NULL;
+        return false;
+    }
+
+    port = Malloc(chars + 1);
+    memcpy(port, startPort, chars);
+    port[chars] = '\0';
+    if (atol(port) > 65535)
+    {
+        Free(port);
+        Free(host);
+        *str = start;
+        return false;
+    }
+
+    out->hostname = host;
+    out->port = port;
+
+    return true;
+}
+
+bool
+ParseServerPart(char *str, ServerPart *part)
+{
+    /* This is a wrapper behind the internal ParseServerName. */
+    if (!str || !part)
+    {
+        return false;
+    }
+    return ParseServerName(&str, part);
+}
+
+void
+ServerPartFree(ServerPart part)
+{
+    if (part.hostname)
+    {
+        Free(part.hostname);
+    }
+    if (part.port)
+    {
+        Free(part.port);
+    }
+}
+
+bool
+ParseCommonID(char *str, CommonID *id)
+{
+    char sigil;
+
+    if (!str || !id)
+    {
+        return false;
+    }
+    
+    /* There must at least be 2 chararacters: the sigil and a string.*/
+    if (strlen(str) < 2)
+    {
+        return false;
+    }
+
+    sigil = *str++;
+    /* Some sigils have the following restriction:
+     * > MUST NOT exceed 255 bytes (including the # sigil and the domain).
+     */
+    if ((sigil == '#' || sigil == '@') && strlen(str) > 255)
+    {
+        return false;
+    }
+    id->sigil = sigil;
+    id->local = NULL;
+    id->server.hostname = NULL;
+    id->server.port = NULL;
+    
+    switch (sigil)
+    {
+        case '$':
+            /* For event IDs, it depends on the version, so we're just 
+             * accepting it all. */
+            if (!ParseUserLocalpart(&str, &id->local))
+            {
+                return false;
+            }
+            if (*str == ':')
+            {
+                (*str)++;
+                if (!ParseServerName(&str, &id->server))
+                {
+                    Free(id->local);
+                    id->local = NULL;
+                    return false;
+                }
+                return true;
+            }
+            break;
+        case '!':
+        case '#': /* It seems like the localpart should be the same as the 
+                     user's: everything, except ':'. */
+        case '@':
+            if (!ParseUserLocalpart(&str, &id->local))
+            {
+                return false;
+            }
+            if (*str++ != ':')
+            {
+                Free(id->local);
+                id->local = NULL;
+                return false;
+            }
+            if (!ParseServerName(&str, &id->server))
+            {
+                Free(id->local);
+                id->local = NULL;
+                return false;
+            }
+            break;
+    }
+    return true;
+}
+
+void
+CommonIDFree(CommonID id)
+{
+    if (id.local)
+    {
+        Free(id.local);
+    }
+    ServerPartFree(id.server);
+}
+
+bool
+ValidCommonID(char *str, char sigil)
+{
+    CommonID id;
+    bool ret;
+
+    memset(&id, 0, sizeof(CommonID));
+
+    if (!str)
+    {
+        return false;
+    }
+
+    ret = ParseCommonID(str, &id) && id.sigil == sigil;
+    
+    CommonIDFree(id);
+    return ret;
+}
+
+char *
+ParserRecomposeServerPart(ServerPart serverPart)
+{
+    if (serverPart.hostname && serverPart.port)
+    {
+        return StrConcat(3, serverPart.hostname, ":", serverPart.port);
+    }
+    if (serverPart.hostname)
+    {
+        return StrDuplicate(serverPart.hostname);
+    }
+    return NULL;
+}
+
+char *
+ParserRecomposeCommonID(CommonID id)
+{
+    char *ret = Malloc(2 * sizeof(char));
+    ret[0] = id.sigil;
+    ret[1] = '\0';
+
+    if (id.local)
+    {
+        char *tmp = StrConcat(2, ret, id.local);
+        Free(ret);
+
+        ret = tmp;
+    }
+    if (id.server.hostname)
+    {
+        char *server = ParserRecomposeServerPart(id.server);
+        char *tmp = StrConcat(4, "@", ret, ":", server);
+        Free(ret);
+        Free(server);
+
+        ret = tmp;
+    }
+    return ret;
+}
+
+bool
+ParserServerNameEquals(ServerPart serverPart, char *str)
+{
+    char *idServer;
+    bool ret;
+
+    if (!str)
+    {
+        return false;
+    }
+
+    idServer = ParserRecomposeServerPart(serverPart);
+
+    ret = StrEquals(idServer, str);
+    Free(idServer);
+    
+    return ret;
+}
--- a/src/RegToken.c
+++ b/src/RegToken.c
@ -31,7 +31,6 @@
 #include <Cytoplasm/Json.h>
 #include <Cytoplasm/Util.h>
 #include <Cytoplasm/Str.h>
-#include <Cytoplasm/Int64.h>
 #include <Cytoplasm/Log.h>

 #include <User.h>
@ -40,9 +39,9 @@ int
 RegTokenValid(RegTokenInfo * token)
 {
    HashMap *tokenJson;
-    Int64 uses, used;
+    int64_t uses, used;

-    UInt64 expiration;
+    uint64_t expiration;

    if (!token || !RegTokenExists(token->db, token->name))
    {
@ -54,9 +53,7 @@ RegTokenValid(RegTokenInfo * token)
    used = JsonValueAsInteger(HashMapGet(tokenJson, "used"));
    expiration = JsonValueAsInteger(HashMapGet(tokenJson, "expires_on"));

-    return (UInt64Eq(expiration, UInt64Create(0, 0)) ||
-            UInt64Geq(UtilServerTs(), expiration)) &&
-            (Int64Eq(uses, Int64Neg(Int64Create(0, 1))) || Int64Lt(used, uses));
+    return (!expiration || (UtilTsMillis() < expiration)) && (uses == -1 || used < uses);
 }
 void
 RegTokenUse(RegTokenInfo * token)
@ -68,13 +65,12 @@ RegTokenUse(RegTokenInfo * token)
        return;
    }

-    if (Int64Geq(token->uses, Int64Create(0, 0)) &&
-        Int64Geq(token->used, token->uses))
+    if (token->uses >= 0 && token->used >= token->uses)
    {
        return;
    }

-    token->used = Int64Add(token->used, Int64Create(0, 1));
+    token->used++;

    /* Write the information to the hashmap */
    tokenJson = DbJson(token->ref);
@ -199,11 +195,11 @@ RegTokenVerify(char *token)
 }

 RegTokenInfo *
-RegTokenCreate(Db * db, char *name, char *owner, UInt64 expires, Int64 uses, int privileges)
+RegTokenCreate(Db * db, char *name, char *owner, uint64_t expires, int64_t uses, int privileges)
 {
    RegTokenInfo *ret;

-    UInt64 timestamp = UtilServerTs();
+    uint64_t timestamp = UtilTsMillis();

    if (!db || !name)
    {
@ -213,13 +209,13 @@ RegTokenCreate(Db * db, char *name, char *owner, UInt64 expires, Int64 uses, int
    /* -1 indicates infinite uses; zero and all positive values are a
     * valid number of uses; althought zero would be rather useless.
     * Anything less than -1 doesn't make sense. */
-    if (Int64Lt(uses, Int64Neg(Int64Create(0, 1))))
+    if (uses < -1)
    {
        return NULL;
    }

    /* Verify the token */
-    if (!RegTokenVerify(name) || (UInt64Gt(expires, UInt64Create(0, 0)) && UInt64Lt(expires, timestamp)))
+    if (!RegTokenVerify(name) || ((expires > 0) && (expires < timestamp)))
    {
        return NULL;
    }
@ -235,7 +231,7 @@ RegTokenCreate(Db * db, char *name, char *owner, UInt64 expires, Int64 uses, int
    }
    ret->name = StrDuplicate(name);
    ret->created_by = StrDuplicate(owner);
-    ret->used = Int64Create(0, 0);
+    ret->used = 0;
    ret->uses = uses;
    ret->created_on = timestamp;
    ret->expires_on = expires;
--- a/src/Routes.c
+++ b/src/Routes.c
@ -72,6 +72,7 @@ RouterBuild(void)

    R("/_matrix/client/v3/profile/(.*)", RouteUserProfile);
    R("/_matrix/client/v3/profile/(.*)/(avatar_url|displayname)", RouteUserProfile);
+    R("/_matrix/client/v3/user_directory/search", RouteUserDirectory);

    R("/_matrix/client/v3/user/(.*)/filter", RouteFilter);
    R("/_matrix/client/v3/user/(.*)/filter/(.*)", RouteFilter);
--- a/src/Routes/RouteAliasDirectory.c
+++ b/src/Routes/RouteAliasDirectory.c
@ -25,8 +25,12 @@

 #include <Routes.h>

+#include <Cytoplasm/Memory.h>
 #include <Cytoplasm/Json.h>
 #include <Cytoplasm/Str.h>
+
+#include <Config.h>
+#include <Parser.h>
 #include <User.h>

 ROUTE_IMPL(RouteAliasDirectory, path, argp)
@ -38,20 +42,40 @@ ROUTE_IMPL(RouteAliasDirectory, path, argp)
    HashMap *response;

    Db *db = args->matrixArgs->db;
-    DbRef *ref;
+    DbRef *ref = NULL;
    HashMap *aliases;
+    HashMap *idObject;
    JsonValue *val;
+    Array *arr;

    char *token;
+    char *msg;
    User *user = NULL;

-    /* TODO: Return HTTP 400 M_INVALID_PARAM if alias is invalid */
+    CommonID aliasID;
+    Config config;
+
+    aliasID.sigil = '\0';
+    aliasID.local = NULL;
+    aliasID.server.hostname = NULL;
+    aliasID.server.port = NULL;
+
+    ConfigLock(db, &config);
+
+    if (!ParseCommonID(alias, &aliasID) || aliasID.sigil != '#')
+    {
+        msg = "Invalid room alias.";
+        HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
+        response = MatrixErrorCreate(M_INVALID_PARAM, msg);
+        goto finish;
+    }

    ref = DbLock(db, 1, "aliases");
    if (!ref && !(ref = DbCreate(db, 1, "aliases")))
    {
+        msg = "Unable to access alias database.",
        HttpResponseStatus(args->context, HTTP_INTERNAL_SERVER_ERROR);
-        response = MatrixErrorCreate(M_UNKNOWN, "Unable to access alias database.");
+        response = MatrixErrorCreate(M_UNKNOWN, msg);
        goto finish;
    }

@ -69,8 +93,9 @@ ROUTE_IMPL(RouteAliasDirectory, path, argp)
            }
            else
            {
+                msg = "There is no mapped room ID for this room alias.";
                HttpResponseStatus(args->context, HTTP_NOT_FOUND);
-                response = MatrixErrorCreate(M_NOT_FOUND, "There is no mapped room ID for this room alias.");
+                response = MatrixErrorCreate(M_NOT_FOUND, msg);
            }
            break;
        case HTTP_PUT:
@ -92,9 +117,21 @@ ROUTE_IMPL(RouteAliasDirectory, path, argp)
            if (HttpRequestMethodGet(args->context) == HTTP_PUT)
            {
                HashMap *newAlias;
+                char *id;
+                char *serverPart;

-                /* TODO: Validate alias domain and make sure it matches
-                 * server name and is well formed. */
+                serverPart = ParserRecomposeServerPart(aliasID.server);
+                if (!StrEquals(serverPart, config.serverName))
+                {
+                    msg = "Invalid server name.";
+                    HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
+                    response = MatrixErrorCreate(M_INVALID_PARAM, msg);
+
+                    Free(serverPart);
+                    goto finish;
+                }
+
+                Free(serverPart);

                if (JsonGet(aliases, 2, "alias", alias))
                {
@ -111,40 +148,81 @@ ROUTE_IMPL(RouteAliasDirectory, path, argp)
                    goto finish;
                }

-                if (!JsonValueAsString(HashMapGet(request, "room_id")))
+                id = JsonValueAsString(HashMapGet(request, "room_id"));
+                if (!id)
                {
                    HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
                    response = MatrixErrorCreate(M_BAD_JSON, "Missing or invalid room_id.");
                    goto finish;
                }
                
-                /* TODO: Validate room ID to make sure it is well
-                 * formed. */
+                if (!ValidCommonID(id, '!'))
+                {
+                    msg = "Invalid room ID.";
+                    HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
+                    response = MatrixErrorCreate(M_INVALID_PARAM, msg);
+                    goto finish;
+                }

                newAlias = HashMapCreate();
                HashMapSet(newAlias, "createdBy", JsonValueString(UserGetName(user)));
-                HashMapSet(newAlias, "id", JsonValueDuplicate(HashMapGet(request, "room_id")));
+                HashMapSet(newAlias, "id", JsonValueString(id));
                HashMapSet(newAlias, "servers", JsonValueArray(ArrayCreate()));

                JsonSet(aliases, JsonValueObject(newAlias), 2, "alias", alias);
+
+                if (!(idObject = JsonValueAsObject(JsonGet(aliases, 2, "id", id))))
+                {
+                    arr = ArrayCreate();
+                    idObject = HashMapCreate();
+                    HashMapSet(idObject, "aliases", JsonValueArray(arr));
+                    JsonSet(aliases, JsonValueObject(idObject), 2, "id", id);
+                }
+                val = HashMapGet(idObject, "aliases");
+                arr = JsonValueAsArray(val);
+                ArrayAdd(arr, JsonValueString(alias));
+
            }
            else
            {
-                if (!JsonGet(aliases, 2, "alias", alias))
+                HashMap *roomAlias;
+                char *id;
+
+                if (!(val = JsonGet(aliases, 2, "alias", alias)))
                {
                    HttpResponseStatus(args->context, HTTP_NOT_FOUND);
                    response = MatrixErrorCreate(M_NOT_FOUND, "Room alias not found.");
                    goto finish;
                }
+                roomAlias = JsonValueAsObject(val);
+                id = StrDuplicate(JsonValueAsString(HashMapGet(roomAlias, "id")));

-                if (!(UserGetPrivileges(user) & USER_ALIAS) && !StrEquals(UserGetName(user), JsonValueAsString(JsonGet(aliases, 3, "alias", alias, "createdBy"))))
+                if (!(UserGetPrivileges(user) & USER_ALIAS) && !StrEquals(UserGetName(user), JsonValueAsString(JsonGet(roomAlias, 1, "createdBy"))))
                {
                    HttpResponseStatus(args->context, HTTP_UNAUTHORIZED);
                    response = MatrixErrorCreate(M_UNAUTHORIZED, NULL);
+                    Free(id);
                    goto finish;
                }

                JsonValueFree(HashMapDelete(JsonValueAsObject(HashMapGet(aliases, "alias")), alias));
+
+                idObject = JsonValueAsObject(JsonGet(aliases, 2, "id", id));
+                if (idObject)
+                {
+                    size_t i;
+                    val = HashMapGet(idObject, "aliases");
+                    arr = JsonValueAsArray(val);
+                    for (i = 0; i < ArraySize(arr); i++)
+                    {
+                        if (StrEquals(JsonValueAsString(ArrayGet(arr, i)), alias))
+                        {
+                            JsonValueFree(ArrayDelete(arr, i));
+                            break;
+                        }
+                    }
+                }
+                Free(id);
            }
            response = HashMapCreate();

@ -156,6 +234,8 @@ ROUTE_IMPL(RouteAliasDirectory, path, argp)
    }

 finish:
+    CommonIDFree(aliasID);
+    ConfigUnlock(&config);
    UserUnlock(user);
    DbUnlock(db, ref);
    JsonFree(request);
--- a/src/Routes/RouteFilter.c
+++ b/src/Routes/RouteFilter.c
@ -64,7 +64,7 @@ ROUTE_IMPL(RouteFilter, path, argp)
    HashMap *response = NULL;

    User *user = NULL;
-    UserId *id = NULL;
+    CommonID *id = NULL;
    char *token = NULL;

    char *serverName = NULL;
@ -97,7 +97,7 @@ ROUTE_IMPL(RouteFilter, path, argp)
        goto finish;
    }

-    if (!StrEquals(id->server, serverName))
+    if (!ParserServerNameEquals(id->server, serverName))
    {
        msg = "Cannot use /filter for non-local users.";
        HttpResponseStatus(args->context, HTTP_UNAUTHORIZED);
@ -119,7 +119,7 @@ ROUTE_IMPL(RouteFilter, path, argp)
        goto finish;
    }

-    if (!StrEquals(id->localpart, UserGetName(user)))
+    if (!StrEquals(id->local, UserGetName(user)))
    {
        msg = "Unauthorized to use /filter.";
        HttpResponseStatus(args->context, HTTP_UNAUTHORIZED);
--- a/src/Routes/RouteLogin.c
+++ b/src/Routes/RouteLogin.c
@ -49,7 +49,7 @@ ROUTE_IMPL(RouteLogin, path, argp)
    LoginRequest loginRequest;
    LoginRequestUserIdentifier userIdentifier;

-    UserId *userId = NULL;
+    CommonID *userId = NULL;

    Db *db = args->matrixArgs->db;

@ -160,8 +160,8 @@ ROUTE_IMPL(RouteLogin, path, argp)
                break;
            }

-            if (!StrEquals(userId->server, config.serverName)
-                || !UserExists(db, userId->localpart))
+            if (!ParserServerNameEquals(userId->server, config.serverName)
+                || !UserExists(db, userId->local))
            {
                msg = "Unknown user ID.";
                HttpResponseStatus(args->context, HTTP_FORBIDDEN);
@ -175,7 +175,7 @@ ROUTE_IMPL(RouteLogin, path, argp)
            password = loginRequest.password;
            refreshToken = loginRequest.refresh_token;

-            user = UserLock(db, userId->localpart);
+            user = UserLock(db, userId->local);

            if (!user)
            {
--- a/src/Routes/RouteProcControl.c
+++ b/src/Routes/RouteProcControl.c
@ -24,7 +24,6 @@
 */
 #include <Routes.h>

-#include <Cytoplasm/Int64.h>
 #include <User.h>
 #include <Cytoplasm/Memory.h>
 #include <Cytoplasm/Str.h>
@ -86,24 +85,11 @@ ROUTE_IMPL(RouteProcControl, path, argp)
            if (StrEquals(op, "stats"))
            {
                size_t allocated = MemoryAllocated();
-                Int64 a;

                response = HashMapCreate();

-                if (sizeof(size_t) == sizeof(Int64))
-                {
-                    UInt32 high = (UInt32) (allocated >> 32);
-                    UInt32 low = (UInt32) (allocated);
-
-                    a = Int64Create(high, low);
-                }
-                else
-                {
-                    a = Int64Create(0, allocated);
-                }
-
                HashMapSet(response, "version", JsonValueString(TELODENDRIA_VERSION));
-                HashMapSet(response, "memory_allocated", JsonValueInteger(a));
+                HashMapSet(response, "memory_allocated", JsonValueInteger(allocated));

                goto finish;
            }
--- a/src/Routes/RouteRequestToken.c
+++ b/src/Routes/RouteRequestToken.c
@ -40,8 +40,6 @@ ROUTE_IMPL(RouteRequestToken, path, argp)

    RequestToken reqTok;

-    Int64 minusOne = Int64Neg(Int64Create(0, 1));
-
    reqTok.client_secret = NULL;
    reqTok.next_link = NULL;
    reqTok.id_access_token = NULL;
@ -51,7 +49,7 @@ ROUTE_IMPL(RouteRequestToken, path, argp)
    reqTok.country = NULL;
    reqTok.phone_number = NULL;

-    reqTok.send_attempt = minusOne;
+    reqTok.send_attempt = -1;

    if (HttpRequestMethodGet(args->context) != HTTP_POST)
    {
@ -90,7 +88,7 @@ ROUTE_IMPL(RouteRequestToken, path, argp)
        goto finish;
    }

-    if (Int64Eq(reqTok.send_attempt, minusOne))
+    if (reqTok.send_attempt == -1)
    {
        msg = "Invalid or inexistent 'send_attempt'";
        HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
--- a/src/Routes/RouteRoomAliases.c
+++ b/src/Routes/RouteRoomAliases.c
@ -25,25 +25,80 @@

 #include <Routes.h>

+#include <Cytoplasm/Memory.h>
 #include <Cytoplasm/Json.h>
+#include <Cytoplasm/Db.h>
+
+#include <Matrix.h>
+#include <User.h>

 ROUTE_IMPL(RouteRoomAliases, path, argp)
 {
    RouteArgs *args = argp;
    char *roomId = ArrayGet(path, 0);
+    char *token;
+    char *msg;

-    HashMap *request = NULL;
    HashMap *response = NULL;
+    HashMap *aliases = NULL;
+    HashMap *reversealias = NULL;
+
+    JsonValue *val;

    Db *db = args->matrixArgs->db;
    DbRef *ref = NULL;

-    (void) roomId;
+    User *user = NULL;

-    /* TODO: Placeholder; remove. */
-    goto finish;
+    if (HttpRequestMethodGet(args->context) != HTTP_GET)
+    {
+        msg = "Route only accepts GET.";
+        HttpResponseStatus(args->context, HTTP_FORBIDDEN);
+        response = MatrixErrorCreate(M_FORBIDDEN, msg);
+        goto finish;
+    }
+
+    response = MatrixGetAccessToken(args->context, &token);
+    if (response)
+    {
+        goto finish;
+    }
+    user = UserAuthenticate(db, token);
+    if (!user)
+    {
+        HttpResponseStatus(args->context, HTTP_UNAUTHORIZED);
+        response = MatrixErrorCreate(M_UNKNOWN_TOKEN, NULL);
+        goto finish;
+    }
+
+    /* TODO: Check whenever the user is in the room or if its world readable 
+     * once this is implemented instead of just checking for the ALIAS 
+     * privilege. */
+    if (!(UserGetPrivileges(user) & USER_ALIAS))
+    {
+        msg = "User is not allowed to get this room's aliases.";
+        HttpResponseStatus(args->context, HTTP_FORBIDDEN);
+        response = MatrixErrorCreate(M_FORBIDDEN, msg);
+        goto finish;
+    }
+
+    ref = DbLock(db, 1, "aliases");
+    aliases = DbJson(ref);
+    reversealias = JsonValueAsObject(JsonGet(aliases, 2, "id", roomId));
+    if (!reversealias)
+    {
+        /* We do not know about the room ID. */
+        msg = "Unknown room ID.";
+        HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
+        response = MatrixErrorCreate(M_INVALID_PARAM, msg);
+        goto finish;
+    }
+
+    response = HashMapCreate();
+    val = JsonGet(reversealias, 1, "aliases");
+    HashMapSet(response, "aliases", JsonValueDuplicate(val));
 finish:
    DbUnlock(db, ref);
-    JsonFree(request);
+    UserUnlock(user);
    return response;
 }
--- a/src/Routes/RouteUserDirectory.c
+++ b/src/Routes/RouteUserDirectory.c
@ -0,0 +1,199 @@
+/*
+ * 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 dirRequest.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 <Cytoplasm/Array.h>
+#include <Cytoplasm/HashMap.h>
+#include <Cytoplasm/Json.h>
+#include <Cytoplasm/Str.h>
+#include <Cytoplasm/Memory.h>
+#include <Cytoplasm/Db.h>
+
+#include <Schema/UserDirectoryRequest.h>
+
+#include <User.h>
+
+ROUTE_IMPL(RouteUserDirectory, path, argp)
+{
+    RouteArgs *args = argp;
+    HashMap *response = NULL;
+    HashMap *request = NULL;
+
+    Array *users = NULL;
+    Array *results = NULL;
+
+    Db *db = args->matrixArgs->db;
+
+    Config config = { .ok = 0 };
+
+    User *user = NULL;
+
+    char *token = NULL;
+    char *requesterName = NULL;
+    char *msg = NULL;
+
+    UserDirectoryRequest dirRequest;
+
+    size_t i, included;
+
+    (void) path;
+
+    dirRequest.search_term = NULL;
+    dirRequest.limit = 10;
+
+
+    if (HttpRequestMethodGet(args->context) != HTTP_POST)
+    {
+        msg = "Request supports only POST.";
+        HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
+        response = MatrixErrorCreate(M_UNRECOGNIZED, msg);
+        goto finish;
+    }
+
+    request = JsonDecode(HttpServerStream(args->context));
+    if (!request)
+    {
+        HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
+        response = MatrixErrorCreate(M_NOT_JSON, NULL);
+        goto finish;
+    }
+    if (!UserDirectoryRequestFromJson(request, &dirRequest, &msg))
+    {
+        HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
+        response = MatrixErrorCreate(M_BAD_JSON, msg);
+        goto finish;
+    }
+    if (!dirRequest.search_term)
+    {
+        msg = "Field 'search_term' not set.";
+        HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
+        response = MatrixErrorCreate(M_BAD_JSON, msg);
+        goto finish;
+
+    }
+
+    response = MatrixGetAccessToken(args->context, &token);
+    if (response)
+    {
+        return response;
+    }
+
+    /* TODO: Actually use information related to the user. */
+    user = UserAuthenticate(db, token);
+    if (!user)
+    {
+        HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
+        response = MatrixErrorCreate(M_UNKNOWN_TOKEN, NULL);
+        goto finish;
+    }
+    requesterName = UserGetName(user);
+
+    response = HashMapCreate();
+    results = ArrayCreate();
+
+    /* TODO: Check for users matching search term and users outside our 
+     * local server. */
+    users = DbList(db, 1, "users");
+
+    ConfigLock(db, &config);
+    if (!config.ok)
+    {
+        Log(LOG_ERR, "Directory endpoint failed to lock configuration.");
+        HttpResponseStatus(args->context, HTTP_INTERNAL_SERVER_ERROR);
+        response = MatrixErrorCreate(M_UNKNOWN, config.err);
+
+        goto finish;
+    }
+
+#define IncludedLtLimit ((int64_t) included < dirRequest.limit)
+    for (i = 0, included = 0; i < ArraySize(users) && IncludedLtLimit; i++)
+#undef IncludedLtLimit
+    {
+        HashMap *obj;
+        User *currentUser;
+        char *name = ArrayGet(users, i);
+        char *displayName;
+        char *lowerDisplayName;
+        char *avatarUrl;
+
+        if (!StrEquals(name, requesterName))
+        {
+            currentUser = UserLock(db, name);
+        }
+        else
+        {
+            currentUser = user;
+        }
+
+        displayName = UserGetProfile(currentUser, "displayname");
+        lowerDisplayName = StrLower(displayName);
+        avatarUrl = UserGetProfile(currentUser, "avatar_url");
+
+        /* Check for the user ID and display name. */
+        if (strstr(name, dirRequest.search_term) ||
+            (lowerDisplayName && 
+             strstr(lowerDisplayName, dirRequest.search_term)))
+        {
+            included++;
+
+            obj = HashMapCreate();
+            if (displayName)
+            {
+                JsonSet(obj, JsonValueString(displayName), 1, "display_name");
+            }
+            if (avatarUrl)
+            {
+                JsonSet(obj, JsonValueString(displayName), 1, "avatar_url");
+            }
+            if (name)
+            {
+                char *uID = StrConcat(4, "@", name, ":", config.serverName);
+                JsonSet(obj, JsonValueString(uID), 1, "user_id");
+                Free(uID);
+            }
+            ArrayAdd(results, JsonValueObject(obj));
+        }
+        if (lowerDisplayName)
+        {
+            Free(lowerDisplayName);
+        }
+        if (!StrEquals(name, requesterName))
+        {
+            UserUnlock(currentUser);
+        }
+    }
+    JsonSet(response, JsonValueArray(results), 1, "results");
+    JsonSet(response, 
+        JsonValueBoolean((int64_t) included == dirRequest.limit), 
+        1, "limited"
+    );
+
+finish:
+    UserUnlock(user);
+    JsonFree(request);
+    DbListFree(users);
+    ConfigUnlock(&config);
+    UserDirectoryRequestFree(&dirRequest);
+    return response;
+}
--- a/src/Routes/RouteUserProfile.c
+++ b/src/Routes/RouteUserProfile.c
@ -40,7 +40,7 @@ ROUTE_IMPL(RouteUserProfile, path, argp)
    HashMap *request = NULL;
    HashMap *response = NULL;

-    UserId *userId = NULL;
+    CommonID *userId = NULL;
    User *user = NULL;

    char *serverName;
@ -73,7 +73,7 @@ ROUTE_IMPL(RouteUserProfile, path, argp)
        response = MatrixErrorCreate(M_INVALID_PARAM, msg);
        goto finish;
    }
-    if (strcmp(userId->server, serverName))
+    if (!ParserServerNameEquals(userId->server, serverName))
    {
        /* TODO: Implement lookup over federation. */
        msg =   "User profile endpoint currently doesn't support lookup over "
@ -87,7 +87,7 @@ ROUTE_IMPL(RouteUserProfile, path, argp)
    switch (HttpRequestMethodGet(args->context))
    {
        case HTTP_GET:
-            user = UserLock(db, userId->localpart);
+            user = UserLock(db, userId->local);
            if (!user)
            {
                msg = "Couldn't lock user.";
@ -147,11 +147,11 @@ ROUTE_IMPL(RouteUserProfile, path, argp)
                    StrEquals(entry, "avatar_url"))
                {
                    /* Check if user has privilege to do that action. */
-                    if (StrEquals(userId->localpart, UserGetName(user)))
+                    if (StrEquals(userId->local, UserGetName(user)))
                    {
                        value = JsonValueAsString(HashMapGet(request, entry));
-                        /* TODO: Make UserSetProfile notify other
-                         * parties of the change */
+                        /* TODO: Make UserSetProfile notify other parties of 
+                         * the change */
                        UserSetProfile(user, entry, value);
                        response = HashMapCreate();
                        goto finish;
@ -185,8 +185,6 @@ ROUTE_IMPL(RouteUserProfile, path, argp)
 finish:
    ConfigUnlock(&config);

-    /* Username is handled by the router, freeing it would cause issues. */
-    Free(entry);
    UserIdFree(userId);
    UserUnlock(user);
    JsonFree(request);
--- a/src/Routes/RouteVersions.c
+++ b/src/Routes/RouteVersions.c
@ -37,9 +37,14 @@ ROUTE_IMPL(RouteVersions, path, argp)
    (void) argp;

 #define DECLARE_SPEC_VERSION(x) ArrayAdd(versions, JsonValueString(x))
+    DECLARE_SPEC_VERSION("v1.2");
+    DECLARE_SPEC_VERSION("v1.3");
+    DECLARE_SPEC_VERSION("v1.4");
+    DECLARE_SPEC_VERSION("v1.5");
+    DECLARE_SPEC_VERSION("v1.6");

+    /* The curently supported version. */
    DECLARE_SPEC_VERSION("v1.7");
-    /* Declare additional spec version support here. */

 #undef DECLARE_SPEC_VERSION

--- a/src/Routes/RouteWhoami.c
+++ b/src/Routes/RouteWhoami.c
@ -43,7 +43,6 @@ ROUTE_IMPL(RouteWhoami, path, argp)
    char *token;
    char *userID;
    char *deviceID;
-    char *msg;

    Config config;

--- a/src/Telodendria.c
+++ b/src/Telodendria.c
@ -133,7 +133,7 @@ TelodendriaPrintHeader(void)
        Log(LOG_INFO, "%s", TelodendriaHeader[i]);
    }

-    Log(LOG_INFO, "Telodendria v" TELODENDRIA_VERSION " (%s v%s)", CytoplasmGetName(), CytoplasmGetVersion());
+    Log(LOG_INFO, "Telodendria v" TELODENDRIA_VERSION " (Cytoplasm v%s)", CytoplasmGetVersionStr());
    Log(LOG_INFO, "");
    Log(LOG_INFO,
        "Copyright (C) 2024 Jordan Bancino <@jordan:bancino.net>");
--- a/src/Uia.c
+++ b/src/Uia.c
@ -135,7 +135,7 @@ BuildResponse(Array * flows, Db * db, HashMap ** response, char *session, DbRef

        json = DbJson(ref);
        HashMapSet(json, "completed", JsonValueArray(ArrayCreate()));
-        HashMapSet(json, "last_access", JsonValueInteger(UtilServerTs()));
+        HashMapSet(json, "last_access", JsonValueInteger(UtilTsMillis()));
        DbUnlock(db, ref);

        HashMapSet(*response, "completed", JsonValueArray(ArrayCreate()));
@ -351,7 +351,7 @@ UiaComplete(Array * flows, HttpServerContext * context, Db * db,
        char *password = JsonValueAsString(HashMapGet(auth, "password"));
        HashMap *identifier = JsonValueAsObject(HashMapGet(auth, "identifier"));
        char *type;
-        UserId *userId;
+        CommonID *userId;
        User *user;

        if (!password || !identifier)
@ -366,7 +366,8 @@ UiaComplete(Array * flows, HttpServerContext * context, Db * db,
                             config.serverName);

        if (!type || !StrEquals(type, "m.id.user")
-         || !userId || !StrEquals(userId->server, config.serverName))
+         || !userId
+         || !ParserServerNameEquals(userId->server, config.serverName))
        {
            HttpResponseStatus(context, HTTP_UNAUTHORIZED);
            ret = BuildResponse(flows, db, response, session, dbRef);
@ -374,7 +375,7 @@ UiaComplete(Array * flows, HttpServerContext * context, Db * db,
            goto finish;
        }

-        user = UserLock(db, userId->localpart);
+        user = UserLock(db, userId->local);
        if (!user)
        {
            HttpResponseStatus(context, HTTP_UNAUTHORIZED);
@ -451,7 +452,7 @@ UiaComplete(Array * flows, HttpServerContext * context, Db * db,

 finish:
    ArrayFree(possibleNext);
-    JsonValueFree(HashMapSet(dbJson, "last_access", JsonValueInteger(UtilServerTs())));
+    JsonValueFree(HashMapSet(dbJson, "last_access", JsonValueInteger(UtilTsMillis())));
    DbUnlock(db, dbRef);
    return ret;
 }
@ -497,7 +498,7 @@ UiaCleanup(MatrixHttpHandlerArgs * args)
        char *session = ArrayGet(sessions, i);
        DbRef *ref = DbLock(args->db, 2, "user_interactive", session);

-        UInt64 lastAccess;
+        uint64_t lastAccess;

        if (!ref)
        {
@ -512,7 +513,7 @@ UiaCleanup(MatrixHttpHandlerArgs * args)

        /* If last access was greater than 15 minutes ago, remove this
         * session */
-        if (UInt64Gt(UInt64Sub(UtilServerTs(), lastAccess), UInt64Create(0, 1000 * 60 * 15)))
+        if ((UtilTsMillis() - lastAccess) > (1000 * 60 * 15))
        {
            DbDelete(args->db, 2, "user_interactive", session);
            Log(LOG_DEBUG, "Deleted session %s", session);
--- a/src/User.c
+++ b/src/User.c
@ -28,8 +28,8 @@
 #include <Cytoplasm/Str.h>
 #include <Cytoplasm/Sha.h>
 #include <Cytoplasm/Json.h>
-#include <Cytoplasm/Int64.h>
-#include <Cytoplasm/UInt64.h>
+
+#include <Parser.h>

 #include <string.h>

@ -42,7 +42,7 @@ struct User
    char *deviceId;
 };

-int
+bool
 UserValidate(char *localpart, char *domain)
 {
    size_t maxLen = 255 - strlen(domain) - 1;
@ -54,23 +54,23 @@ UserValidate(char *localpart, char *domain)

        if (i > maxLen)
        {
-            return 0;
+            return false;
        }

        if (!((c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') ||
              (c == '.') || (c == '_') || (c == '=') || (c == '-') ||
              (c == '/')))
        {
-            return 0;
+            return false;
        }

        i++;
    }

-    return 1;
+    return true;
 }

-int
+bool
 UserHistoricalValidate(char *localpart, char *domain)
 {
    size_t maxLen = 255 - strlen(domain) - 1;
@ -82,21 +82,21 @@ UserHistoricalValidate(char *localpart, char *domain)

        if (i > maxLen)
        {
-            return 0;
+            return false;
        }

        if (!((c >= 0x21 && c <= 0x39) || (c >= 0x3B && c <= 0x7E)))
        {
-            return 0;
+            return false;
        }

        i++;
    }

-    return 1;
+    return true;
 }

-int
+bool
 UserExists(Db * db, char *name)
 {
    return DbExists(db, 2, "users", name);
@ -131,7 +131,7 @@ UserAuthenticate(Db * db, char *accessToken)

    char *userName;
    char *deviceId;
-    UInt64 expires;
+    uint64_t expires;

    if (!db || !accessToken)
    {
@ -155,8 +155,7 @@ UserAuthenticate(Db * db, char *accessToken)
        return NULL;
    }

-    if (UInt64Neq(expires, UInt64Create(0, 0)) &&
-        UInt64Geq(UtilServerTs(), expires))
+    if (expires && UtilTsMillis() >= expires)
    {
        UserUnlock(user);
        DbUnlock(db, atRef);
@ -169,14 +168,14 @@ UserAuthenticate(Db * db, char *accessToken)
    return user;
 }

-int
+bool
 UserUnlock(User * user)
 {
-    int ret;
+    bool ret;

    if (!user)
    {
-        return 0;
+        return false;
    }

    Free(user->name);
@ -194,7 +193,7 @@ UserCreate(Db * db, char *name, char *password)
    User *user = NULL;
    HashMap *json = NULL;

-    UInt64 ts = UtilServerTs();
+    uint64_t ts = UtilTsMillis();

    /* TODO: Put some sort of password policy(like for example at least
     * 8 chars, or maybe check it's entropy)? */
@ -231,7 +230,7 @@ UserCreate(Db * db, char *name, char *password)

    json = DbJson(user->ref);
    HashMapSet(json, "createdOn", JsonValueInteger(ts));
-    HashMapSet(json, "deactivated", JsonValueBoolean(0));
+    HashMapSet(json, "deactivated", JsonValueBoolean(false));

    return user;
 }
@ -354,7 +353,7 @@ UserGetDeviceId(User * user)
    return user ? user->deviceId : NULL;
 }

-int
+bool
 UserCheckPassword(User * user, char *password)
 {
    HashMap *json;
@ -366,11 +365,11 @@ UserCheckPassword(User * user, char *password)
    char *hashedPwd;
    char *tmp;

-    int result;
+    bool result;

    if (!user || !password)
    {
-        return 0;
+        return false;
    }

    json = DbJson(user->ref);
@ -380,12 +379,12 @@ UserCheckPassword(User * user, char *password)

    if (!storedHash || !salt)
    {
-        return 0;
+        return false;
    }

    tmp = StrConcat(2, password, salt);
    hashBytes = Sha256(tmp);
-    hashedPwd = ShaToHex(hashBytes);
+    hashedPwd = ShaToHex(hashBytes, HASH_SHA256);
    Free(tmp);
    Free(hashBytes);

@ -396,7 +395,7 @@ UserCheckPassword(User * user, char *password)
    return result;
 }

-int
+bool
 UserSetPassword(User * user, char *password)
 {
    HashMap *json;
@ -408,7 +407,7 @@ UserSetPassword(User * user, char *password)

    if (!user || !password)
    {
-        return 0;
+        return false;
    }

    json = DbJson(user->ref);
@ -416,7 +415,7 @@ UserSetPassword(User * user, char *password)
    salt = StrRandom(16);
    tmpstr = StrConcat(2, password, salt);
    hashBytes = Sha256(tmpstr);
-    hash = ShaToHex(hashBytes);
+    hash = ShaToHex(hashBytes, HASH_SHA256);

    JsonValueFree(HashMapSet(json, "salt", JsonValueString(salt)));
    JsonValueFree(HashMapSet(json, "password", JsonValueString(hash)));
@ -426,10 +425,10 @@ UserSetPassword(User * user, char *password)
    Free(hashBytes);
    Free(tmpstr);

-    return 1;
+    return true;
 }

-int
+bool
 UserDeactivate(User * user, char * from, char * reason)
 {
    HashMap *json;
@ -437,7 +436,7 @@ UserDeactivate(User * user, char * from, char * reason)

    if (!user)
    {
-        return 0;
+        return false;
    }
    
    /* By default, it's the target's username */
@ -448,7 +447,7 @@ UserDeactivate(User * user, char * from, char * reason)

    json = DbJson(user->ref);

-    JsonValueFree(HashMapSet(json, "deactivated", JsonValueBoolean(1)));
+    JsonValueFree(HashMapSet(json, "deactivated", JsonValueBoolean(true)));

    val = JsonValueString(from);
    JsonValueFree(JsonSet(json, val, 2, "deactivate", "by"));
@ -458,38 +457,38 @@ UserDeactivate(User * user, char * from, char * reason)
        JsonValueFree(JsonSet(json, val, 2, "deactivate", "reason"));
    }

-    return 1;
+    return true;

 }

-int
+bool
 UserReactivate(User * user)
 {
    HashMap *json;

    if (!user)
    {
-        return 0;
+        return false;
    }

    json = DbJson(user->ref);


-    JsonValueFree(HashMapSet(json, "deactivated", JsonValueBoolean(0)));
+    JsonValueFree(HashMapSet(json, "deactivated", JsonValueBoolean(false)));
    
    JsonValueFree(HashMapDelete(json, "deactivate"));

-    return 1;
+    return true;
 }

-int
+bool
 UserDeactivated(User * user)
 {
    HashMap *json;

    if (!user)
    {
-        return 1;
+        return true;
    }

    json = DbJson(user->ref);
@ -535,17 +534,17 @@ UserAccessTokenGenerate(User * user, char *deviceId, int withRefresh)

    if (withRefresh)
    {
-        token->lifetime = Int64Create(0, 1000 * 60 * 60 * 24 * 7); /* 1 Week */
+        token->lifetime = 1000 * 60 * 60 * 24 * 7; /* 1 Week */
    }
    else
    {
-        token->lifetime = Int64Create(0, 0);
+        token->lifetime = 0;
    }

    return token;
 }

-int
+bool
 UserAccessTokenSave(Db * db, UserAccessToken * token)
 {
    DbRef *ref;
@ -553,14 +552,14 @@ UserAccessTokenSave(Db * db, UserAccessToken * token)

    if (!token)
    {
-        return 0;
+        return false;
    }

    ref = DbCreate(db, 3, "tokens", "access", token->string);

    if (!ref)
    {
-        return 0;
+        return false;
    }

    json = DbJson(ref);
@ -568,9 +567,9 @@ UserAccessTokenSave(Db * db, UserAccessToken * token)
    HashMapSet(json, "user", JsonValueString(token->user));
    HashMapSet(json, "device", JsonValueString(token->deviceId));

-    if (Int64Neq(token->lifetime, Int64Create(0, 0)))
+    if (token->lifetime)
    {
-        HashMapSet(json, "expires", JsonValueInteger(UInt64Add(UtilServerTs(), token->lifetime)));
+        HashMapSet(json, "expires", JsonValueInteger(UtilTsMillis() + token->lifetime));
    }

    return DbUnlock(db, ref);
@ -590,7 +589,7 @@ UserAccessTokenFree(UserAccessToken * token)
    Free(token);
 }

-int
+bool
 UserDeleteToken(User * user, char *token)
 {
    char *username;
@ -608,14 +607,14 @@ UserDeleteToken(User * user, char *token)

    if (!user || !token)
    {
-        return 0;
+        return false;
    }

    db = user->db;
    /* First check if the token even exists */
    if (!DbExists(db, 3, "tokens", "access", token))
    {
-        return 0;
+        return false;
    }

    /* If it does, get it's username. */
@ -623,7 +622,7 @@ UserDeleteToken(User * user, char *token)

    if (!tokenRef)
    {
-        return 0;
+        return false;
    }
    tokenJson = DbJson(tokenRef);
    username = JsonValueAsString(HashMapGet(tokenJson, "user"));
@ -633,7 +632,7 @@ UserDeleteToken(User * user, char *token)
    {
        /* Token does not match user, do not delete it */
        DbUnlock(db, tokenRef);
-        return 0;
+        return false;
    }

    userJson = DbJson(user->ref);
@ -641,7 +640,7 @@ UserDeleteToken(User * user, char *token)

    if (!deviceObj)
    {
-        return 0;
+        return false;
    }

    /* Delete refresh token, if present */
@ -655,17 +654,17 @@ UserDeleteToken(User * user, char *token)
    deletedVal = HashMapDelete(deviceObj, deviceId);
    if (!deletedVal)
    {
-        return 0;
+        return false;
    }
    JsonValueFree(deletedVal);

    /* Delete the access token. */
    if (!DbUnlock(db, tokenRef) || !DbDelete(db, 3, "tokens", "access", token))
    {
-        return 0;
+        return false;
    }

-    return 1;
+    return true;
 }

 char *
@ -697,7 +696,7 @@ UserSetProfile(User * user, char *name, char *val)
    JsonValueFree(JsonSet(json, JsonValueString(val), 2, "profile", name));
 }

-int
+bool
 UserDeleteTokens(User * user, char *exempt)
 {
    HashMap *devices;
@ -706,13 +705,13 @@ UserDeleteTokens(User * user, char *exempt)

    if (!user)
    {
-        return 0;
+        return false;
    }

    devices = JsonValueAsObject(HashMapGet(DbJson(user->ref), "devices"));
    if (!devices)
    {
-        return 0;
+        return false;
    }

    while (HashMapIterate(devices, &deviceId, (void **) &deviceObj))
@ -739,7 +738,7 @@ UserDeleteTokens(User * user, char *exempt)
        JsonValueFree(HashMapDelete(devices, deviceId));
    }

-    return 1;
+    return true;
 }

 int
@ -753,30 +752,30 @@ UserGetPrivileges(User * user)
    return UserDecodePrivileges(JsonValueAsArray(HashMapGet(DbJson(user->ref), "privileges")));
 }

-int
+bool
 UserSetPrivileges(User * user, int privileges)
 {
    JsonValue *val;

    if (!user)
    {
-        return 0;
+        return false;
    }

    if (!privileges)
    {
        JsonValueFree(HashMapDelete(DbJson(user->ref), "privileges"));
-        return 1;
+        return true;
    }

    val = JsonValueArray(UserEncodePrivileges(privileges));
    if (!val)
    {
-        return 0;
+        return false;
    }

    JsonValueFree(HashMapSet(DbJson(user->ref), "privileges", val));
-    return 1;
+    return true;
 }

 int
@ -882,10 +881,11 @@ finish:
    return arr;
 }

-UserId *
+CommonID *
 UserIdParse(char *id, char *defaultServer)
 {
-    UserId *userId;
+    CommonID *userId;
+    char *server;

    if (!id)
    {
@ -898,48 +898,38 @@ UserIdParse(char *id, char *defaultServer)
        return NULL;
    }

-    userId = Malloc(sizeof(UserId));
+    userId = Malloc(sizeof(CommonID));
    if (!userId)
    {
        goto finish;
    }
+    memset(userId, 0, sizeof(CommonID));

    /* Fully-qualified user ID */
    if (*id == '@')
    {
-        char *localStart = id + 1;
-        char *serverStart = localStart;
-
-        while (*serverStart != ':' && *serverStart != '\0')
+        if (!ParseCommonID(id, userId) || !userId->server.hostname)
        {
-            serverStart++;
-        }
+            UserIdFree(userId);

-        if (*serverStart == '\0')
-        {
-            Free(userId);
            userId = NULL;
            goto finish;
        }
-
-        *serverStart = '\0';
-        serverStart++;
-
-        userId->localpart = StrDuplicate(localStart);
-        userId->server = StrDuplicate(serverStart);
    }
    else
    {
        /* Treat it as just a localpart */
-        userId->localpart = StrDuplicate(id);
-        userId->server = StrDuplicate(defaultServer);
+        userId->local = StrDuplicate(id);
+        ParseServerPart(defaultServer, &userId->server);
    }

-    if (!UserHistoricalValidate(userId->localpart, userId->server))
+    server = ParserRecomposeServerPart(userId->server);
+    if (!UserHistoricalValidate(userId->local, server))
    {
        UserIdFree(userId);
        userId = NULL;
    }
+    Free(server);

 finish:
    Free(id);
@ -947,12 +937,11 @@ finish:
 }

 void
-UserIdFree(UserId * id)
+UserIdFree(CommonID * id)
 {
    if (id)
    {
-        Free(id->localpart);
-        Free(id->server);
+        CommonIDFree(*id);
        Free(id);
    }
 }
--- a/src/include/Parser.h
+++ b/src/include/Parser.h
@ -0,0 +1,108 @@
+/*
+ * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * other valuable contributors. See CONTRIBUTORS.txt for the full list.
+ *
+ * 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.
+ */
+#ifndef TELODENDRIA_PARSER_H
+#define TELODENDRIA_PARSER_H
+
+#include <stdbool.h>
+
+/***
+ * @Nm Parser
+ * @Nd Functions for dealing with grammars found in Matrix
+ * @Dd November 25 2023
+ * @Xr User
+ *
+ * The
+ * .Nm
+ * API provides an interface for parsing grammars within the 
+ * Matrix specification
+ */
+
+/**
+ * The host[:port] format in a servername.
+ */
+typedef struct ServerPart {
+    char *hostname;
+    char *port;
+} ServerPart;
+/**
+ * A common identifier in the form '&local[:server]', where & determines the 
+ * *type* of the identifier.
+ */
+typedef struct CommonID {
+    char sigil;
+    char *local;
+    ServerPart server;
+} CommonID;
+
+/** 
+ * Parses a common identifier, as per the Common Identifier Format as defined 
+ * by the [matrix] specification.
+ */
+extern bool ParseCommonID(char *, CommonID *);
+
+/** 
+ * Parses the server part in a common identifier.
+ */
+extern bool ParseServerPart(char *, ServerPart *);
+
+/** 
+ * Checks whenever the string is a valid common ID with the correct sigil.
+ */
+extern bool ValidCommonID(char *, char);
+
+/** 
+ * Frees a CommonID's values. Note that it doesn't free the CommonID itself.
+ */
+extern void CommonIDFree(CommonID);
+
+/** 
+ * Frees a ServerPart's values. Note that it doesn't free the ServerPart 
+ * itself, and that 
+ * .Fn CommonIDFree 
+ * automatically deals with its server part.
+ */
+extern void ServerPartFree(ServerPart);
+
+/**
+ * Recompose a Common ID into a string which lives in the heap, and must 
+ * therefore be freed with 
+ * .Fn Free .
+ */
+extern char * ParserRecomposeCommonID(CommonID);
+
+/**
+ * Recompose a server part into a string which lives in the heap, and must 
+ * therefore be freed with 
+ * .Fn Free .
+ */
+extern char * ParserRecomposeServerPart(ServerPart);
+
+/**
+ * Compares whenever a ServerName is equivalent to a server name string.
+ */
+extern bool ParserServerNameEquals(ServerPart, char *);
+
+
+#endif                             /* TELODENDRIA_PARSER_H */
--- a/src/include/RegToken.h
+++ b/src/include/RegToken.h
@ -41,7 +41,6 @@
 */

 #include <Cytoplasm/Db.h>
-#include <Cytoplasm/Int64.h>

 #include <Schema/RegToken.h>

@ -78,7 +77,7 @@ extern RegTokenInfo * RegTokenGetInfo(Db *, char *);
 * structure will be returned. Otherwise, NULL will be returned.
 */
 extern RegTokenInfo *
-RegTokenCreate(Db *, char *, char *, UInt64, Int64, int);
+RegTokenCreate(Db *, char *, char *, uint64_t, int64_t, int);

 /**
 * Free the memory associated with the registration token. This should
--- a/src/include/Routes.h
+++ b/src/include/Routes.h
@ -86,6 +86,7 @@ ROUTE(RouteChangePwd);
 ROUTE(RouteDeactivate);
 ROUTE(RouteTokenValid);
 ROUTE(RouteUserProfile);
+ROUTE(RouteUserDirectory);
 ROUTE(RouteRequestToken);

 ROUTE(RouteUiaFallback);
--- a/src/include/User.h
+++ b/src/include/User.h
@ -39,10 +39,13 @@
 * users, among many other tasks.
 */

-#include <Cytoplasm/Int64.h>
 #include <Cytoplasm/Db.h>
 #include <Cytoplasm/Json.h>

+#include <Parser.h>
+
+#include <stdbool.h>
+
 /**
 * Many functions here operate on an opaque user structure.
 */
@ -75,7 +78,7 @@ typedef struct UserAccessToken
    char *user;
    char *string;
    char *deviceId;
-    Int64 lifetime;
+    uint64_t lifetime;
 } UserAccessToken;

 /**
@ -88,15 +91,6 @@ typedef struct UserLoginInfo
    char *refreshToken;
 } UserLoginInfo;

-/**
- * A description of a Matrix user ID.
- */
-typedef struct UserId
-{
-    char *localpart;
-    char *server;
-} UserId;
-
 /**
 * Take a localpart and domain as separate parameters and validate them
 * against the rules of the Matrix specification. The reasion the
@ -105,7 +99,7 @@ typedef struct UserId
 * the local part is allowed to be. This function is used to ensure
 * that client-provided Matrix IDs are valid on this server.
 */
-extern int UserValidate(char *, char *);
+extern bool UserValidate(char *, char *);

 /**
 * This function behaves just like
@ -116,13 +110,13 @@ extern int UserValidate(char *, char *);
 * spec compliant but remain in use since before the new restrictions
 * were put in place.
 */
-extern int UserHistoricalValidate(char *, char *);
+extern bool UserHistoricalValidate(char *, char *);

 /**
 * Determine whether the user identified by the specified localpart
 * exists in the database.
 */
-extern int UserExists(Db *, char *);
+extern bool UserExists(Db *, char *);

 /**
 * Create a new user with the specified localpart and password, in
@ -153,7 +147,7 @@ extern User * UserAuthenticate(Db *, char *);
 * .Fn DbUnlock
 * under the hood.
 */
-extern int UserUnlock(User *);
+extern bool UserUnlock(User *);

 /**
 * Log in a user. This function takes the user's password, desired
@ -186,13 +180,13 @@ extern char * UserGetDeviceId(User *);
 * does not store passwords in plain text, so this function hashes the
 * password and checks it against what is stored in the database.
 */
-extern int UserCheckPassword(User *, char *);
+extern bool UserCheckPassword(User *, char *);

 /**
 * Reset the given user's password by hashing a plain text password and
 * storing it in the database.
 */
-extern int UserSetPassword(User *, char *);
+extern bool UserSetPassword(User *, char *);

 /**
 * Immediately deactivate the given user account such that it can no
@ -205,21 +199,21 @@ extern int UserSetPassword(User *, char *);
 * responsible for deactivating the target user is NULL, then it is 
 * set to the target's own name.
 */
-extern int UserDeactivate(User *, char *, char *);
+extern bool UserDeactivate(User *, char *, char *);

 /**
 * Reactivates the given user account if it has been deactvated with 
 * .Fn UserDeactivate ,
 * otherwise, it simply doesn't do anything.
 */
-extern int UserReactivate(User *);
+extern bool UserReactivate(User *);

 /**
 * Return a boolean value indicating whether or not the user was
 * deactivated using
 * .Fn UserDeactivate .
 */
-extern int UserDeactivated(User *);
+extern bool UserDeactivated(User *);

 /**
 * Fetches the devices that belong to the user, in JSON format,
@ -240,7 +234,7 @@ extern UserAccessToken * UserAccessTokenGenerate(User *, char *, int);
 * Write the specified access token to the database, returning a
 * boolean value indicating success.
 */
-extern int UserAccessTokenSave(Db *, UserAccessToken *);
+extern bool UserAccessTokenSave(Db *, UserAccessToken *);

 /**
 * Free the memory associated with the given access token.
@ -250,7 +244,7 @@ extern void UserAccessTokenFree(UserAccessToken *);
 /**
 * Delete a specific access token by name.
 */
-extern int UserDeleteToken(User *, char *);
+extern bool UserDeleteToken(User *, char *);

 /**
 * Get a string property from the user's profile given the specified
@ -269,7 +263,7 @@ extern void UserSetProfile(User *, char *, char *);
 * except for the one provided by name, unless NULL is provided for
 * the name.
 */
-extern int UserDeleteTokens(User *, char *);
+extern bool UserDeleteTokens(User *, char *);

 /**
 * Get the current privileges of the user as a packed bit field. Use
@ -281,7 +275,7 @@ extern int UserGetPrivileges(User *);
 /**
 * Set the privileges of the user.
 */
-extern int UserSetPrivileges(User *, int);
+extern bool UserSetPrivileges(User *, int);

 /**
 * Decode the JSON that represents the user privileges into a packed
@ -303,15 +297,15 @@ extern Array *UserEncodePrivileges(int);
 extern int UserDecodePrivilege(const char *);

 /**
- * Parse either a localpart or a fully qualified Matrix ID. If the
+ * Parse either a localpart or a fully qualified Matrix common ID. If the
 * first argument is a localpart, then the second argument is used as
 * the server name.
 */
-extern UserId * UserIdParse(char *, char *);
+extern CommonID * UserIdParse(char *, char *);

 /**
- * Free the memory associated with the parsed Matrix ID.
+ * Frees the user's common ID and the memory allocated for it.
 */
-extern void UserIdFree(UserId *);
+extern void UserIdFree(CommonID *);

 #endif                             /* TELODENDRIA_USER_H */
--- a/tools/src/json.c
+++ b/tools/src/json.c
@ -64,47 +64,23 @@ query(char *select, HashMap * json, int canonical)
        int expectArr = 0;
        int func = 0;

-        expectArr = (sscanf(key, "%127[^[][%lu]", keyName, &arrInd) == 2);
+        expectArr = (sscanf(key, "%127[^[][%zu]", keyName, &arrInd) == 2);

        if (keyName[0] == '@')
        {
            if (StrEquals(keyName + 1, "length"))
            {
-                UInt64 len;
+                uint64_t len;

                switch (JsonValueType(val))
                {
                    case JSON_ARRAY:
-                        if (sizeof(size_t) == sizeof(UInt64))
-                        {
-                            size_t slen = ArraySize(JsonValueAsArray(val));
-                            UInt32 high = slen >> 32;
-                            UInt32 low = slen;
-
-                            len = UInt64Create(high, low);
-                        }
-                        else
-                        {
-                            len = UInt64Create(0, ArraySize(JsonValueAsArray(val)));
-                        }
-
+                        len = ArraySize(JsonValueAsArray(val));
                        val = JsonValueInteger(len);
                        ArrayAdd(cleanUp, val);
                        break;
                    case JSON_STRING:
-                        if (sizeof(size_t) == sizeof(UInt64))
-                        {
-                            size_t slen = strlen(JsonValueAsString(val));
-                            UInt32 high = slen >> 32;
-                            UInt32 low = slen;
-
-                            len = UInt64Create(high, low);
-                        }
-                        else
-                        {
-                            len = UInt64Create(0, strlen(JsonValueAsString(val)));
-                        }
-
+                        len = strlen(JsonValueAsString(val));
                        val = JsonValueInteger(len);
                        ArrayAdd(cleanUp, val);
                        break;
@ -154,7 +130,7 @@ query(char *select, HashMap * json, int canonical)
            {
                size_t i;

-                if (sscanf(keyName + 1, "%lu", &i) == 1)
+                if (sscanf(keyName + 1, "%zu", &i) == 1)
                {
                    JsonValueFree(ArrayDelete(JsonValueAsArray(val), i));
                }
				`@ -0,0 +1 @@`
				`Subproject commit 4f316ff7b3a955b831ca4aefb8679ddf3396a7d0`