[MOD] Reunite steps

Oops, how did I *not* catch this?

.forgejo/workflows/compile.yaml

@@ -1,27 +0,0 @@
-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

.forgejo/workflows/release.yaml

@@ -1,44 +0,0 @@
-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

.gitea/actions/setup-build/action.yml

@@ -0,0 +1,22 @@
+name: Setup a basic build environment
+description: Setup a basic build environment with a proper SSL library
+
+inputs:
+  compiler:
+    description: Compiler used for setting up everything
+    required: false
+    default: gcc
+  ssl:
+    description: SSL library used for Cytoplasm later on
+    required: false
+    default: openssl
+
+outputs:
+  compiler:
+    description: Compiler binary
+      value: '${{ steps.install.outputs.compiler }}'
+
+runs:
+  - run: 'echo We are on "${{runner.os}}", requested "${{inputs.compiler}}" as CC'
+  - run: 'echo hi && setup "${{ runner.os }}" "${{inputs.compiler}}" "${{inputs.ssl}}"'
+    shell: bash 

.gitea/actions/setup-build/setup

@@ -0,0 +1,60 @@
+#!/bin/bash
+
+COMPILER=$2
+SSL=$3
+
+DISTRO=$(grep -E '^NAME=' /etc/os-release | 
+         cut -d'=' -f2 | 
+         tr -d '"')
+
+# Installs a package using the native OS's package manager.
+install_pkg() {
+    case $DISTRO in
+        "Ubuntu")
+        "Debian GNU/Linux" )
+            apt install -y $1
+            ;;
+        "Arch Linux" )
+            pacman -Syu --noconfirm $1
+            ;;
+    esac
+}
+
+install_compiler() {
+    echo '::group::Setting up a compiler'
+    case $DISTRO in
+        "Ubuntu" )
+        "Debian GNU/Linux" )
+            install_pkg build-essential
+            [ $COMPILER = 'clang' ] && install_pkg clang
+
+            CC=gcc
+            [ $COMPILER = 'clang' ] && CC=clang
+            ;;
+        "Arch Linux" )
+            install_pkg $COMPILER make
+            CC=gcc
+            [ $COMPILER = 'clang' ] && CC=clang
+    esac
+    echo '::endgroup::'
+}
+install_ssl() {
+    echo '::group::Setting up SSL'
+    case $DISTRO in
+        "Ubuntu" )
+        "Debian GNU/Linux" )
+            # Doesn't seem like Debian got LibreSSL
+            [ $SSL = 'libressl' ] && echo "::error ::LibreSSL is not on Debian"
+            install_pkg openssl
+            ;;
+        "Arch Linux" )
+            install_pkg $SSL
+    esac
+    echo '::endgroup::'
+}
+
+# Install the compiler and SSL
+install_compiler
+install_ssl
+
+echo "compiler=$CC" >> "$GITHUB_OUTPUT"

.gitea/workflows/test-push.yaml

@@ -0,0 +1,28 @@
+name: Testing pushed commits
+run-name: "Testing pushed changes (HEAD@${{ github.head_ref }}) on ${{ runner.os }}"
+on: [push]
+
+jobs:
+  # Compiles out everything.
+  setup-repo:
+    # TODO: More architectures
+    runs-on: debian
+    steps:
+      # Checks out Telodendria, and setups a basic build environment.
+      - name: Checking out Telodendria
+        uses: actions/checkout@v4
+      - name: Setup build environment
+        uses: https://git.freetards.xyz/lda/ci-setup-cc-ssl@master
+        with:
+          compiler: gcc
+          ssl: openssl
+      # TODO: Implement all of this
+      # Compile out Cytoplasm
+      #- name: Compiles Cytoplasm
+      #  uses: ./.gitea/actions/build-latest-cytoplasm
+
+      # Finally, builds out Telodendria with everything.
+      #- name: Compiles Telodendria
+      #  uses: ./.gitea/actions/build-telodendria
+          
+

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "Cytoplasm"]
-	path = Cytoplasm
-	url = https://git.telodendria.io/Telodendria/Cytoplasm.git

CONTRIBUTORS.txt

@@ -1,16 +0,0 @@
-N: Jordan Bancino
-E: jordan@bancino.net
-M: @jordan:bancino.net
-W: https://bancino.net
-D: Project Lead
-L: United States
-
-N: LDA
-E: marie@doskel.net
-E: ldasta@tedomum.fr
-E: lda@freetards.xyz
-M: @lda:a.freetards.xyz
-M: @lda:pain.agency
-M: @fourier:ari.lt
-D: Developer
-L: France

Cytoplasm

@@ -1 +0,0 @@
-Subproject commit 4f316ff7b3a955b831ca4aefb8679ddf3396a7d0

LICENSE.txt

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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

README.md

@@ -1,6 +1,7 @@
-<h1 style="text-align: center;">Lightweight, Decentralized Chat.</h1>
+<p align="center"><img src="https://telodendria.io/assets/Telodendria-500x500.png"></p>
+<h1 align="center">Telodendria</h1>
 
-**Telodendria** is an extremely powerful, yet lightweight and portable
+Telodendria is an extremely powerful, yet lightweight and portable
 chat server designed to be easy to install and configure. Powered by
 the [Matrix](https://matrix.org) protocol, Telodendria empowers
 everyone to run their own chat server on ordinary hardware, including
@@ -11,7 +12,7 @@ hosting a complicated, high-maintenance homeserver or joining an
 existing homeserver for privacy or other reasons, then Telodendria
 might be for you.
 
-!!!! **Note:** Telodendria still in development. See **Status** below.
+> **Note:** Telodendria still in development. See [Status](#status).
 
 ## What is Matrix?
 
@@ -63,13 +64,12 @@ incredibly outdated. Telodendria, on the other hand, aims to be stable.
 It should *just work* for long periods of time between upgrades, and
 you should never feel like Telodendria is going to change significantly
 between upgrades.
-- **Well-Documented:** Telodendria places as much emphasis on documentation as on code, which means you can be sure that the documentation will always remain up-to-date, accurate, and most importantly, reasonably exhaustive.
 
-[Read Technical Rationale &rightarrow;](https://git.telodendria.io/Telodendria/Telodendria/src/branch/master/docs/dev/rationale.md)
+[Read Technical Rationale &rightarrow;](docs/dev/rationale.md)
 
 ## Get Started
 
-Check out the [Documentation](https://git.telodendria.io/Telodendria/telodendria/src/branch/master/docs/README.md) to get started with
+Check out the [Documentation](docs/README.md) to get started with
 Telodendria.
 
 ## Status
@@ -79,13 +79,13 @@ not yet deliver on all of its promises. Currently, Telodendria is not
 ready for end-users yet. While it features very basic user
 authentication, it does not actually work as a chat server yet.
 
-We are hoping to ship Telodendria `v1.7.0-alpha4` by January of 2025. This
+We are hoping to ship Telodendria `v0.4.0` by May of 2024. This
 release should be usable for communication between **local users**
 only. Additional features, including federation with other Matrix
 homeservers will be added in future releases.
 
-You can help speed up development by **sponsoring**
+You can help speed up development by [sponsoring](#sponsorship)
-Telodendria or [getting involved](https://git.telodendria.io/Telodendria/Telodendria/src/branch/master/docs/CONTRIBUTING.md).
+Telodendria or [getting involved](docs/CONTRIBUTING.md).
 
 ## Sponsorship
 
@@ -96,7 +96,7 @@ Telodendria's long-term success, please consider sponsoring the
 project.
 
 You can make a recurring donation to Telodendria using
-[LiberaPay](https://liberapay.com/Telodendria/donate). You can also make
+[LiberaPay](https://bancino.net/Telodendria/donate). You can also make
 one-time donations using
 [Stripe](https://donate.stripe.com/8wM29AfF5bRJc48eUU). If you would
 like to make a recurring donation larger than that allowed by
@@ -108,7 +108,7 @@ LiberaPay, please contact Jordan Bancino over Matrix at
 While there are no set sponsorship tiers at this time, sponsoring
 Telodendria is a mutually beneficial relationship. Depending on the
 amount you donate, you can get your name, logo, and website links
-on the [Sponsors](../sponsors) page, the project `README`, or the
+on the [Sponsors](docs/SPONSORS.md) page, the project `README`, or the
 main website.
 
 ## License
@@ -116,7 +116,7 @@ main website.
 All of the code and documentation for Telodendria is licensed under a
 modified MIT license. The MIT license is an extremely permissive
 license that has very few restrictions. Please consult the
-[`LICENSE.txt`](https://git.telodendria.io/Telodendria/Telodendria/src/branch/master/LICENSE.txt) file for the actual license text. It is
+[`LICENSE.txt`](LICENSE.txt) file for the actual license text. It is
 important to note that the Telodendria license text differs from the
 original MIT license in the following ways:
 
@@ -133,3 +133,4 @@ to use the logo in any way as long as it represents or links to the
 official project. If Telodendria is forked, the logo must be removed
 completely from the project, and optionally replaced by a different
 one.
+

Schema/Config.json

@@ -1,88 +0,0 @@
-{
-  "guard": "TELODENDRIA_SCHEMA_CONFIG_H",
-  "header": "Schema\/Config.h",
-  "include": [ "Cytoplasm\/Db.h", "Cytoplasm/HttpServer.h" ],
-
-  "types": {
-    "ConfigTls": {
-      "fields": {
-        "cert": { "type": "string",                     "required": true }, 
-        "key":  { "type": "string",                     "required": true } 
-      },
-      "type": "struct"
-    },
-
-    "ConfigListener": {
-      "fields": {
-        "port":           { "type": "integer",          "required": true },
-        "threads":        { "type": "integer",          "required": false },
-        "maxConnections": { "type": "integer",          "required": false },
-        "tls":            { "type": "ConfigTls",        "required": false }
-      },
-      "type": "struct"
-    },
-    "ConfigRunAs": {
-      "fields": {
-        "uid":            { "type": "string",     "required": false },
-        "gid":            { "type": "string",     "required": true }
-      },
-      "type": "struct"
-    },
-    "ConfigLogOutput": {
-      "fields": {
-        "stdout":         { "name": "CONFIG_LOG_OUTPUT_STDOUT" },
-        "file":           { "name": "CONFIG_LOG_OUTPUT_FILE" },
-        "syslog":         { "name": "CONFIG_LOG_OUTPUT_SYSLOG" }
-      },
-      "type": "enum"
-    },
-    "ConfigLogLevel": {
-      "fields": {
-        "message":        { "name": "CONFIG_LOG_LEVEL_MESSAGE" },
-        "debug":          { "name": "CONFIG_LOG_LEVEL_DEBUG" },
-        "notice":         { "name": "CONFIG_LOG_LEVEL_NOTICE" },
-        "warning":        { "name": "CONFIG_LOG_LEVEL_WARNING" },
-        "error":          { "name": "CONFIG_LOG_LEVEL_ERROR" }
-      },
-      "type": "enum"
-    },
-    "ConfigLogConfig": {
-      "fields": {
-        "output":         { "type": "ConfigLogOutput",  "required": true },
-        "level":          { "type": "ConfigLogLevel",   "required": false },
-        "timestampFormat":{ "type": "string",           "required": false },
-        "color":          { "type": "boolean",          "required": false }
-      },
-      "type": "struct"
-    },
-
-    "Db *": { "type": "extern" },
-    "DbRef *": { "type": "extern" },
-    "char *": { "type": "extern" },
-
-    "Config": {
-      "fields": {
-        "db":             { "type": "Db *",             "ignore": true },
-        "ref":            { "type": "DbRef *",          "ignore": true },
-
-        "ok":             { "type": "boolean",          "ignore": true },
-        "err":            { "type": "char *",           "ignore": true },
-
-        "listen":         { "type": "[ConfigListener]", "required": true },
-        "runAs":          { "type": "ConfigRunAs",      "required": false },
-        "log":            { "type": "ConfigLogConfig",  "required": true },
-
-        "serverName":     { "type": "string",           "required": true },
-        "baseUrl":        { "type": "string",           "required": false },
-        "identityServer": { "type": "string",           "required": false },
-        "pid":            { "type": "string",           "required": false },
-
-        "maxCache":       { "type": "integer",          "required": false },
-
-        "federation":     { "type": "boolean",          "required": true },
-        "registration":   { "type": "boolean",          "required": true }
-      },
-      "type": "struct"
-    }
-  }
-}

Schema/Filter.json

@@ -1,5 +1,4 @@
 {
-  "guard": "TELODENDRIA_SCHEMA_FILTER_H",
   "header": "Schema\/Filter.h",
   "types": {
     "FilterRoom": {
@@ -117,5 +116,6 @@
       },
       "type": "struct"
     }
-  }
+  },
+  "guard": "TELODENDRIA_SCHEMA_FILTER_H"
 }

Schema/LoginRequest.json

@@ -1,38 +0,0 @@
-{
-  "header": "Schema\/LoginRequest.h",
-  "types": {
-    "LoginRequestType": {
-      "fields": {
-        "m.login.password": { "name": "REQUEST_TYPE_PASSWORD" }
-      },
-      "type": "enum"
-    },
-    "LoginRequestUserIdentifier": {
-      "fields": {
-        "type": { "type": "string" },
-        "user": { "type": "string" }
-      },
-      "type": "struct"
-    },
-    "LoginRequest": {
-      "fields": {
-        "type": { "type": "LoginRequestType" },
-           
-        "identifier": { "type": "object" },
-        
-        "password": { "type": "string" },
-        "address": { "type": "string" },
-        "user": { "type": "string" },
-        "device_id": { "type": "string" },
-        "initial_device_display_name": { "type": "string" },
-        "medium": { "type": "string" },
-        "token": { "type": "string" },
-
-        "refresh_token": { "type": "boolean" }
-      },
-      "type": "struct"
-    }
-  },
-  "guard": "TELODENDRIA_SCHEMA_LOGIN_REQUEST_H"
-}
-

Schema/RegToken.json

@@ -1,49 +0,0 @@
-{
-  "guard": "TELODENDRIA_SCHEMA_REGTOKEN_H",
-  "header": "Schema\/RegToken.h",
-  "include": [
-    "Cytoplasm\/Db.h"
-  ],
-  "types": {
-    "Db *": {
-      "type": "extern"
-    },
-    "DbRef *": {
-      "type": "extern"
-    },
-    "RegTokenInfo": {
-      "fields": {
-        "db": {
-          "type": "Db *",
-          "ignore": true
-        },
-        "ref": {
-          "type": "DbRef *",
-          "ignore": true
-        },
-        "name": {
-          "type": "string"
-        },
-        "created_by": {
-          "type": "string"
-        },
-        "created_on": {
-          "type": "integer"
-        },
-        "expires_on": {
-          "type": "integer"
-        },
-        "used": {
-          "type": "integer"
-        },
-        "uses": {
-          "type": "integer"
-        },
-        "grants": {
-          "type": "array"
-        }
-      },
-      "type": "struct"
-    }
-  }
-}

Schema/Registration.json

@@ -1,17 +0,0 @@
-{
-  "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"
-}

Schema/RequestToken.json

@@ -1,21 +0,0 @@
-{
-  "header": "Schema\/RequestToken.h",
-  "types": {
-    "RequestToken": {
-      "fields": {
-        "client_secret": { "type": "string" },
-        "send_attempt": { "type": "integer" },
-        "next_link": { "type": "string" },
-        "id_access_token": { "type": "string" },
-        "id_server": { "type": "string" },
-        
-        "email": { "type": "string" },
-
-        "country": { "type": "string" },
-        "phone_number": { "type": "string" }
-      },
-      "type": "struct"
-    }
-  },
-  "guard": "TELODENDRIA_SCHEMA_REQUESTTOKEN_H"
-}

configure

@@ -13,40 +13,13 @@ SRC="src"
 INCLUDE="src/include"
 TOOLS="tools/src"
 SCHEMA="Schema"
-CYTOPLASM="Cytoplasm"
 
-CFLAGS="-O1 -D_DEFAULT_SOURCE -I${INCLUDE} -I${BUILD}"
+CFLAGS="-Wall -Wextra -pedantic -std=c89 -O3 -pipe -D_DEFAULT_SOURCE -I${INCLUDE}"
 LIBS="-lm -pthread -lCytoplasm"
 
 
 # Set default args for all platforms
-SCRIPT_ARGS="--prefix=/usr/local --bin-name=telodendria --version=1.7.0-alpha4"
+SCRIPT_ARGS="--prefix=/usr/local --enable-ld-extra --bin-name=telodendria --version=0.4.0 --static $@"
-
-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"
@@ -54,20 +27,15 @@ echo "Ran with arguments: $SCRIPT_ARGS"
 # Process all arguments
 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-)
             ;;
@@ -76,32 +44,30 @@ 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=""
             ;;
-        --cytoplasm=*)
+        --static)
-            CYTOPLASM=$(echo "$arg" | cut -d '=' -f 2-)
+            STATIC="-static -Wl,-static"
-            if [ -n "${CYTOPLASM}" ]; then
+            ;;
-                if [ ! -f "${CYTOPLASM}/configure" ]; then
+        --no-static)
-                    echo "Path for Cytoplasm does not appear to actually contain Cytoplasm source:"
+            STATIC=""
-                    echo "${CYTOPLASM}"
-                    exit 1
-                fi
-
-                CFLAGS="${CFLAGS} -I${CYTOPLASM}/include"
-                LDFLAGS="-L${CYTOPLASM}/out/lib ${LDFLAGS}"
-            fi
             ;;
         *)
-            echo "Invalid argument: $arg"
+            echo "Invalid argument: $1"
             exit 1
             ;;
     esac
 done
 
 CFLAGS="${CFLAGS} '-DTELODENDRIA_VERSION=\"${VERSION}\"' ${DEBUG}"
-LDFLAGS="${LDFLAGS} ${LIBS}"
+LDFLAGS="${LIBS} ${LD_EXTRA}"
 
 #
 # Makefile generation
@@ -134,16 +100,6 @@ 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"
 }
@@ -152,28 +108,12 @@ 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="${obj}: $(get_deps ${src})"
+	pref=$(cc -I${INCLUDE} -MM -MT "${obj}" "${src}")
-    echo "$pref $(collect ${SCHEMA}/ .json .h ${BUILD}/Schema/ print_obj)"
+    echo "$pref $(collect ${SCHEMA}/ .json .h ${INCLUDE}/Schema/ print_obj)"
 	echo "${TAB}@mkdir -p $(dirname ${obj})"
 	echo "${TAB}\$(CC) \$(CFLAGS) -fPIC -c -o \"${obj}\" \"${src}\""
 }
@@ -186,7 +126,7 @@ compile_bin() {
     
     echo "${out}: ${src}"
     echo "${TAB}@mkdir -p ${OUT}/bin"
-    echo "${TAB}\$(CC) \$(CFLAGS) -o \"${out}\" \"${src}\" $depObjs \$(LDFLAGS)"
+    echo "${TAB}\$(CC) \$(CFLAGS) -o \"${out}\" \"${src}\" $depObjs \$(LDFLAGS) ${STATIC}"
 }
 
 compile_doc() {
@@ -199,7 +139,7 @@ compile_doc() {
 
 	echo "${out}: ${src}"
 	echo "${TAB}@mkdir -p ${OUT}/man/man3"
-	echo "${TAB}$(cytoplasm_tool hdoc) -D \"Os=${BIN_NAME}\" -i \"${src}\" -o \"${out}\""
+	echo "${TAB}hdoc -D \"Os=${BIN_NAME}\" -i \"${src}\" -o \"${out}\""
 }
 
 print_doc() {
@@ -213,37 +153,27 @@ compile_schema() {
     src="$1"
     out="$2"
 
-    obj="${BUILD}/Schema/${out}.o"
+    echo "${INCLUDE}/Schema/${out}.h:"
+    echo "${TAB}@mkdir -p ${INCLUDE}/Schema ${SRC}/Schema"
+    echo "${TAB}j2s -s \"${src}\" -h \"${INCLUDE}/Schema/${out}.h\" -c \"${SRC}/Schema/${out}.c\""
 
-    echo "${BUILD}/Schema/${out}.h:"
+    echo "${SRC}/Schema/${out}.c:"
-    echo "${TAB}@mkdir -p ${BUILD}/Schema"
+    echo "${TAB}@mkdir -p ${INCLUDE}/Schema ${SRC}/Schema"
-    echo "${TAB}$(cytoplasm_tool j2s) -s \"${src}\" -h \"${BUILD}/Schema/${out}.h\" -c \"${BUILD}/Schema/${out}.c\""
+    echo "${TAB}j2s -s \"${src}\" -h \"${INCLUDE}/Schema/${out}.h\" -c \"${SRC}/Schema/${out}.c\""
-
-    echo "${BUILD}/Schema/${out}.c:"
-    echo "${TAB}@mkdir -p ${BUILD}/Schema"
-    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"
-    echo "${TAB}\$(CC) \$(CFLAGS) -fPIC -c -o \"${obj}\" \"${BUILD}/Schema/${out}.c\""
 }
 
 install_out() {
 	src="$1"
 	out="$2"
-	dir=$(dirname "$out")
 
-	echo "${TAB}mkdir -p \"$dir\""
+	echo "${TAB}install -D \"$src\" \"$out\""
-	echo "${TAB}cp \"$src\" \"$out\""
 }
 
 install_man() {
 	src="${OUT}/man/man3/${BIN_NAME}-$(basename $1 .h).3"
 	out="$2"
-	dir=$(dirname "$out")
 
-	echo "${TAB}mkdir -p \"$dir\""
+	echo "${TAB}install -D \"$src\" \"$out\""
-	echo "${TAB}cp \"$src\" \"$out\""
 }
 
 uninstall_out() {
@@ -255,16 +185,22 @@ uninstall_out() {
 
 echo "Generating Makefile..."
 
-OBJS="$(collect ${SRC}/ .c .o ${BUILD}/ print_obj) $(collect ${SCHEMA}/ .json .o ${BUILD}/Schema/ print_obj)"
+OBJS=$(collect ${SRC}/ .c .o ${BUILD}/ print_obj)
 TAB=$(printf '\t')
 
+# If objects don't include the schema (this is the first configure),
+# then include them manually.
+if ! echo "${OBJS}" | grep "Schema" > /dev/null; then
+    OBJS="${OBJS} $(collect ${SCHEMA}/ .json .o ${BUILD}/Schema/ print_obj)"
+fi
+
 cat << EOF > Makefile
 .POSIX:
 
 # Generated by '$0' on $(date).
 # This file should generally not be manually edited.
 
-CC = ${CC}
+CC = cc
 PREFIX = ${PREFIX}
 CFLAGS = ${CFLAGS}
 LDFLAGS = ${LDFLAGS}
@@ -291,8 +227,7 @@ ${TAB}done
 ${BIN_NAME}: ${OUT}/bin/${BIN_NAME}
 
 install: ${BIN_NAME}
-${TAB}mkdir -p \$(PREFIX)/bin
+${TAB}install -D ${OUT}/bin/${BIN_NAME} \$(PREFIX)/bin/${BIN_NAME}
-${TAB}cp ${OUT}/bin/${BIN_NAME} \$(PREFIX)/bin/${BIN_NAME}
 
 uninstall:
 ${TAB}rm \$(PREFIX)/bin/${BIN_NAME}
@@ -309,13 +244,6 @@ $(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}."

contrib/TlsImplTemplate.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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

docs/CHANGELOG.md

@@ -5,22 +5,12 @@ It is intended to be updated with every commit that makes a user-facing change w
 reporting in the change log. As such, it changes frequently between releases. Final
 change log entries are published as [Releases](releases).
 
-## v1.7.0-alpha4
+## v0.4.0
 
 **Not Released Yet.**
 
-This release brings filters, rooms, and events! The core of the Matrix
+This release brings filters, rooms, and events! The core of the Matrix protocol architecture
-protocol architecture is now in place.
+is not in place.
-
-Note that the versioning scheme has changed from `v0.X.0` to
-`v1.7.0-alphaX`. This is so that Telodendria releases correspond to the
-Matrix specification that they implement, in accordance with
-[this blog post](https://telodendria.io/blog/on-matrixs-release-cadence-and-state-resolution-v1).
-This versioning scheme change does not indicate a drastic leap forward
-in Telodendria's development—the `-alpha4` suffix indicates that
-this is the 4th pre-release, with the target being a stable `v1.7.0`.
-Note also that we still have a *long* way to go before we reach that
-stable release.
 
 ### Matrix Specification
 
@@ -31,39 +21,19 @@ The following endpoints were added:
 
 ### Bug Fixes & General Improvements
 
-- Use `j2s` for parsing the configuration
+- Fixed a double-free in `RouteUserProfile()` that would cause errors with certain
-- Fixed a double-free in `RouteUserProfile()` that would cause errors
+Matrix clients. (#35)
-with certain Matrix clients. (#35)
 - Improved compatibility with NetBSD on various platforms.
-- Moved [Cytoplasm](/Telodendria/Cytoplasm) to its own repository. It
+- Moved [Cytoplasm](/Telodendria/Cytoplasm) to its own repository.
-will now be maintained separately and have its own releases as well.
+- Use a `configure` script and `make` to build Telodendria instead of custom scripts.
-- Use a `configure` script and `make` to build Telodendria instead of
-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
 
-- Implemented a `"pid"` option in the configuration, allowing Telodendria 
+- Implemented `/_telodendria/admin/v1/deactivate/[localpart]` for admins to be able to 
-to write its process ID to a specified file.
+deactivate users.
-- Moved all administrator API endpoints to `/_telodendria/admin/v1`,
+- Moved all administrator API endpoints to `/_telodendria/admin/v1`, because later revisions
-because later revisions of the administrator API may break clients, so
+of the administrator API may break clients, so we want a way to give those breaking revisions
-we want a way to give those breaking revisions new endpoints.
+new endpoints.
-- Implemented `/_telodendria/admin/v1/deactivate/[localpart]` for admins
-to be able to deactivate users.
-- Added a **PUT** option to `/_telodendria/admin/v1/config` that gives
-the ability to change only a subset of the configuration.
-- Implemented the following APIs for managing registration tokens:
-    - **GET** `/_telodendria/admin/tokens`
-    - **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
 

docs/CONTRIBUTING.md

@@ -213,44 +213,3 @@ comments to the appropriate header.
 If your pull request does not also include proper documentation, it
 will likely be rejected.
 
-### Be Recognized!
-
-If your pull request gets approved, you should be recognized for your
-contributions to the project!
-
-To have your work recognized, add your information to the `CONTRIBUTORS.txt`
-file in the root of the Telodendria repository if it isn't there already.
-You should do this as a part of your pull request so that when it is merged,
-your information will be automatically added to the repository.
-
-The `CONTRIBUTORS.txt` file loosely follows the Linux kernel's
-[CREDITS](https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/CREDITS)
-file format. It is designed to be human-readable, but also parsable by
-scripts.
-
-The following fields are available:
-
-```
-  (N) Name
-  (E) Email
-  (M) Matrix ID
-  (W) Website
-  (D) Description of contribution
-  (L) Physical location
-```
-
-Here are the rules:
-
-* All fields are optional. If you don't want to include a field, that's
-  okay, simply omit it.
-* All fields identify you however you wish. The goal is to recognize you for
-  your contribution, but if you wish to remain anonymous, you don't have to
-  use your real information.
-* All fields can be specified multiple times. For example, if you have
-  multiple email addresses, websites, or Matrix IDs and you want to include
-  all of them, you absolutely may. Likewise, if you have made multiple
-  contributions, you can add multiple description entries.
-* You can make up your own fields if you want. Just add their description
-  above.
-* Leave exactly one blank like between entries in this file.
-

docs/dev/hosting.md

@@ -1,94 +0,0 @@
-# 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.

docs/user/admin/README.md

@@ -19,7 +19,6 @@ request.
 - [Configuration](config.md)
 - [Server Statistics](stats.md)
 - [Process Control](proc.md)
-- [Registration Tokens](tokens.md)
 
 ## API Conventions
 

docs/user/admin/config.md

@@ -4,11 +4,11 @@ As mentioned in [Setup](../setup.md), Telodendria's configuration is
 intended to be managed via the configuration API. Consult the
 [Configuration](../config.md) document for a complete list of supported
 configuration options. This document simply describes the API used to
-update the configuration described in that document.
+update the configuration.
 
 ## API Endpoints
 
-### **GET** `/_telodendria/admin/v1/config`
+### **GET** `/_telodendria/admin/config`
 
 Retrieve the current configuration.
 
@@ -20,7 +20,7 @@ Retrieve the current configuration.
 |---------------|-------------|
 | 200           | The current configuration was successfully retrieved.|
 
-### **POST** `/_telodendria/admin/v1/config`
+### **POST** `/_telodendria/admin/config`
 
 Installs a new configuration. This endpoint validates the request body,
 ensuring it is a proper configuration, then it replaces the existing
@@ -40,23 +40,3 @@ configuration with the new one.
 |-------|------|-------------|
 | `restart_required` | `Boolean` | Whether or not the process needs to be restarted to finish applying the configuration. If this is `true`, then the restart endpoint should be used at a convenient time to apply the configuration.
 
-### **PUT** `/_telodendria/admin/v1/config`
-
-Update the currently installed configuration instead of completely replacing it. This endpoint
-validates the request body, merges it on top of the current configuration, validates the resulting
-configuration, then updates it in the database. This is useful when only one or two properties
-in the configuration needs to be changed.
-
-| Requires Token | Rate Limited |
-|----------------|--------------|
-| Yes            | Yes          |
-
-| Response Code | Description |
-|---------------|-------------|
-| 200           | The new configuration was successfully installed.|
-
-#### 200 Response Format
-
-| Field | Type | Description |
-|-------|------|-------------|
-| `restart_required` | `Boolean` | Whether or not the process needs to be restarted to finish applying the configuration. If this is `true`, then the restart endpoint should be used at a convenient time to apply the configuration.

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 and see room aliases created by 
+- **ALIAS:** Allows a user to modify room aliases created by other
-other users. By default, users can only manage their own room aliases, 
+users. By default, users can only manage their own room aliases, but
-but an administrator may wish to take over an alias or remove an 
+an administrator may wish to take over an alias or remove an offensive
-offensive alias.
+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
@@ -41,7 +41,7 @@ this privilege level.
 
 The following API endpoints are implemented for managing privileges.
 
-### **GET** `/_telodendria/admin/v1/privileges/[localpart]`
+### **GET** `/_telodendria/admin/privileges/[localpart]`
 
 Retrieve the permissions for a user. If the localpart is omitted, then
 retrieve the privileges for the user that owns the access token being 
@@ -62,7 +62,7 @@ used. Note that the owner of the access token must have the
 |-------|------|-------------|
 | `privileges` | `Array` | An array of privileges, as described above. The privileges are encoded as JSON strings.|
 
-### **POST** `/_telodendria/admin/v1/privileges/[localpart]`
+### **POST** `/_telodendria/admin/privileges/[localpart]`
 
 Update the privileges of a local user by replacing the privileges array
 with the one specified in the request. Like the **GET** version of this
@@ -89,7 +89,7 @@ owns the access token.
 |-------|------|-------------|
 | `privileges` | `Array` | An array of privileges, as described above. The privileges are encoded as JSON strings.|
 
-### **PUT** `/_telodendria/admin/v1/privileges/[localpart]`
+### **PUT** `/_telodendria/admin/privileges/[localpart]`
 
 Update the privileges of a local user by adding the privileges
 specified in the request to the users existing privileges.
@@ -114,7 +114,7 @@ specified in the request to the users existing privileges.
 |-------|------|-------------|
 | `privileges` | `Array` | An array of privileges, as described above. The privileges are encoded as JSON strings.|
 
-### **DELETE** `/_telodendria/admin/v1/privileges/[localpart]`
+### **DELETE** `/_telodendria/admin/privileges/[localpart]`
 
 Update the privileges of a local user by removing the privileges
 specified in the request from the user's existing privileges.

docs/user/admin/proc.md

@@ -5,7 +5,7 @@ administrator to manage the Telodendria process itself.
 
 ## API Endpoints
 
-### **POST** `/_telodendria/admin/v1/restart`
+### **POST** `/_telodendria/admin/restart`
 
 Restart the Telodendria daemon cleanly. This endpoint will respond
 immediately after signaling to the daemon that it should be restarted
@@ -26,7 +26,7 @@ starts over.
 
 On success, this endpoint simply returns an empty JSON object.
 
-### **POST** `/_telodendria/admin/v1/shutdown`
+### **POST** `/_telodendria/admin/shutdown`
 
 Shut down the Telodendria process cleanly. This endpoint will respond
 immediately after signalling to the daemon that it should be shut

docs/user/admin/stats.md

@@ -5,7 +5,7 @@ information about how the server process is performing.
 
 ## API Endpoints
 
-### **GET** `/_telodendria/admin/v1/stats`
+### **GET** `/_telodendria/admin/stats`
 
 Retrieve basic statistics about the currently running Telodendria
 process.

docs/user/admin/tokens.md

@@ -1,106 +0,0 @@
-# Administrator API: Registration Tokens
-
-Telodendria implements registration tokens as specified by the Matrix
-specification. These tokens can be used for registration using the
-`m.login.registration_token` login type. This API provides a Telodendria
-administrator with a mechanism for generating and managing these tokens,
-which allows controlled registration on the homeserver.
-
-It is generally safer than completely open registration to use
-registration tokens that either expire after a short period of time, or
-have a limited number of uses.
-
-## Registration Token
-
-A registration token is represented by the following `RegToken` JSON
-object:
-
-| Field | Type | Description |
-|-------|------|-------------|
-| `name` | `String` | The token identifier; what is used when registering. |
-| `created_by` | `String` | The localpart of the user that created this token. |
-| `created_on` | `Integer` | A timestamp of when the token was created. |
-| `expires_on` | `Integer` | An expiration stamp, or 0 if the token never expires. |
-| `used` | `Integer` | The number of times the token has been used. |
-| `uses` | `Integer` | The total number of allowed uses, or -1 for unlimited. |
-| `grants` | `[String]` | An array of privileges to grant users that register with this token as described in [Privileges](privileges.md). |
-
-All endpoints in this API will operate on some variation of this
-structure. The remaining number of uses can be computed by performing
-the subtraction: `uses - used`. `used` should never be greater than
-`uses` or less than `0`.
-
-Example:
-
-```json
-{
-    "name": "q34jgapo8uq34hg",
-    "created_by": "admin",
-    "created_on": 1699467640000,
-    "expires_on": 0,
-    "used": 3,
-    "uses": 5
-}
-```
-
-## API Endpoints
-
-### **GET** `/_telodendria/admin/v1/tokens`
-
-Get a list of all registration tokens and information about them.
-
-#### 200 Response Format
-
-| Field | Type | Description |
-|-------|------|-------------|
-| `tokens` | `[RegToken]` | An array of registration tokens. |
-
-### **GET** `/_telodendria/admin/v1/tokens/[name]`
-
-Get information about the specified registration token.
-
-#### Request Parameters
-
-| Field | Type | Description |
-|-------|------|-------------|
-| `name` | `String` | The name of the token, as it would be used to register a user. |
-
-#### 200 Response Format
-
-This endpoint returns a `RegToken` object that represents the server's
-record of the registration token.
-
-### **POST** `/_telodendria/admin/v1/tokens`
-
-Create a new registration token.
-
-#### Request Format
-
-This endpoint accepts a `RegToken` object, as described above. If no
-`name` is provided, one will be randomly generated. Note that the fields
-`created_by`, `created_on`, and `used` are ignored and set by the server
-when this request is made. All other fields may be set by the request
-body.
-
-#### 200 Response Format
-
-If the creation of the registration token was successful, a `RegToken`
-that represents the server's record of it is returned.
-
-### **DELETE** `/_telodendria/admin/v1/tokens/[name]`
-
-Delete the specified registration token. It will no longer be usable for
-the registration of users. Any users that have completed the
-`m.login.registration_token` step but have not yet created their account
-should still be able to do so until their user-interactive auth session
-expires.
-
-#### Request Parameters
-
-| Field | Type | Description |
-|-------|------|-------------|
-| `name` | `String` | The name of the token, as it would be used to register a user. |
-
-#### 200 Response Format
-
-On success, this endpoint returns an empty JSON object.

docs/user/config.md

@@ -19,7 +19,8 @@ key-value form:
     "serverName": "telodendria.io",
     "listen": [
         {
-            "port": 8008
+            "port": 8008,
+            "tls": false
         }
     ]
 
@@ -50,7 +51,7 @@ Here are the top-level directives:
     this is a concern, a reverse-proxy such as `relayd` can be placed
     in front of Telodendria to block access to undesired APIs.
 
-  - **tls:** `Object`
+  - **tls:** `Object|null|false`
 
     Telodendria can be compiled with TLS support. If it is, then a
     particular listener can be set to use TLS for connections. If
@@ -105,9 +106,6 @@ Here are the top-level directives:
   or you want to start over. **serverName** should be a DNS name that
   can be publicly resolved. This directive is required.
 
-- **pid:** `String`
-  Configure the file Telodendria writes its PID to.
-
 - **baseUrl:** `String`
 
   Set the server's base URL. **baseUrl** should be a valid URL,

site/index.html

@@ -0,0 +1,138 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+
+<meta name="author" content="Jordan Bancino">
+<meta name="description"
+    content="Telodendria, a Matrix homeserver written in ANSI C.">
+
+<meta property="og:title"
+    content="Telodendria | A Matrix Homeserver written in ANSI C.">
+<meta property="og:type" content="website">
+<meta property="og:url"
+    content="https://telodendria.io">
+<meta property="og:description"
+    content="Telodendria, a Matrix homeserver written in ANSI C.">
+
+<meta http-equiv="onion-location" content="http://cszrjvqbeim4dbbynucd4xucpfsips4alpxyxm5s3uh2itjxsnythhyd.onion">
+
+<link rel="stylesheet" href="style.css">
+<link rel="icon" href="assets/Telodendria-196x196.png">
+
+<title>Telodendria | A Matrix Homeserver written in ANSI C.</title>
+</head>
+<body>
+<img id="logo" src="/assets/Telodendria-500x500.png" alt="Telodendria Logo"/>
+<h1 style="font-size: x-large;" id="telodendria">Telodendria</h1>
+<p>
+<b>Tel-&#601;-'den-dr&#275;-&#601;:</b> The terminal aborizations of an axon.
+</p>
+<p>
+<b>Telodendria</b> is an open source Matrix homeserver implementation written from
+scratch in ANSI C and designed to be lightweight and simple, yet
+functional.
+</p>
+<div class="msg-error">
+<b><i>Note:</i></b> <b>Telodendria</b> is under <i>heavy</i> development and is not
+yet ready for use.
+Please see the <a href="/man/man7/telodendria-changelog.7.html#PROJECT_STATUS">Project Status</a>
+for information about the project state, and use the links below to help fund development.
+</div>
+<h2 id="donate">Donate</h2>
+<p>
+If you would like to donate to this project, you can do so with the
+following links:
+</p>
+<ul>
+<li><a href="https://liberapay.com/Telodendria/donate">LiberaPay</a> (recurring, account required)</li>
+<li><a href="https://donate.stripe.com/8wM29AfF5bRJc48eUU">Stripe</a> (one-time, no account required)</li>
+</ul>
+<p>
+If you would like to do a recurring donation larger than what's allowed
+by LiberaPay, please contact me directly on Matrix at <code>@jordan:bancino.net</code>.
+</p>
+<h2 id="download">Download</h2>
+<p>
+<b>Telodendria</b> is distributed as source tarballs, in true Unix
+fashion. If you want, you can verify the checksum of your download,
+and check the signature. To check the signature, you'll need 
+<code>signify</code>, and the signify public key:
+<a href="/telodendria-signify.pub">
+telodendria-signify.pub</a>.
+</p>
+<table>
+<tr>
+<th>Version</th>
+<th>Download</th>
+<th>Checksum</th>
+<th>Signature</th>
+</tr>
+<tr>
+<td>${TELODENDRIA_VERSION}</td>
+<td>
+<a href="/pub/v${TELODENDRIA_VERSION}/Telodendria-v${TELODENDRIA_VERSION}.tar.gz">
+<code>Telodendria-v${TELODENDRIA_VERSION}.tar.gz</code>
+</a>
+</td>
+<td>
+<a href="/pub/v${TELODENDRIA_VERSION}/Telodendria-v${TELODENDRIA_VERSION}.tar.gz.sha256">
+sha256
+</a>
+</td>
+<td>
+<a href="/pub/v${TELODENDRIA_VERSION}/Telodendria-v${TELODENDRIA_VERSION}.tar.gz.sig">
+signify
+</a>
+</td>
+</tr>
+</table>
+<p>
+See the <a href="man/man7/telodendria-changelog.7.html">change log</a> for
+release notes. If you are looking for older <b>Telodendria</b> versions, you
+can find them <a href="/pub">here</a>.
+</p>
+<p>
+If your operating system has an official package or port of
+<b>Telodendria</b>, you should prefer to use that instead of manually
+downloading the source and building it. Consult your operating system's
+manual for how to install packages, as well as the official repository,
+to see if a package is available. If your operating system's
+package or port is too out of date for your tastes, please contact
+the package's maintainers to notify them, or offer to update the
+package yourself.
+</p>
+<p>
+If your operating system does <i>not</i> have a package or port of
+<b>Telodendria</b>, please consult the
+<a href="/man/man7/porting.7.html">porting(7)</a> page for guidelines
+related to packaging <b>Telodendria</b> for your system.
+</p>
+<h2 id="documentation">Documentation</h2>
+<p>
+<b>Telodendria</b>'s documentation is distributed with the source
+code as <code>man</code> pages, which contain all of the information
+on what <b>Telodendria</b> is, what its goals are, how to build the source,
+configure it, as well as contribute to the project. The <code>man</code>
+pages are also available online for convenience:
+</p>
+<p>User Documentation:</p>
+${USER_DOCS}
+<br>
+<details>
+<summary>Developer Documentation:</summary>
+<p>
+This documentation is intended primarily for developers. It details all
+of the internal workings of Telodendria.
+</p>
+${DEV_DOCS}
+</details>
+<hr>
+<p>
+&copy; 2023 Jordan Bancino &lt;@jordan:bancino.net&gt;
+<br>
+Updated on ${DATE}.
+</p>
+</body>
+</html>

site/mandoc.css

@@ -0,0 +1,368 @@
+/* $OpenBSD: mandoc.css,v 1.39 2022/07/06 14:27:55 schwarze Exp $ */
+/*
+ * Standard style sheet for mandoc(1) -Thtml and man.cgi(8).
+ *
+ * Written by Ingo Schwarze <schwarze@openbsd.org>.
+ * I place this file into the public domain.
+ * Permission to use, copy, modify, and distribute it for any purpose
+ * with or without fee is hereby granted, without any conditions.
+ */
+
+/* Global defaults. */
+
+html {		max-width: 65em;
+		--bg: #FFFFFF;
+		--fg: #000000; }
+body {		background: var(--bg);
+		color: var(--fg);
+		font-family: Helvetica,Arial,sans-serif; }
+h1, h2 {	font-size: 110%; }
+table {		margin-top: 0em;
+		margin-bottom: 0em;
+		border-collapse: collapse; }
+/* Some browsers set border-color in a browser style for tbody,
+ * but not for table, resulting in inconsistent border styling. */
+tbody {		border-color: inherit; }
+tr {		border-color: inherit; }
+td {		vertical-align: top;
+		padding-left: 0.2em;
+		padding-right: 0.2em;
+		border-color: inherit; }
+ul, ol, dl {	margin-top: 0em;
+		margin-bottom: 0em; }
+li, dt {	margin-top: 1em; }
+pre {		font-family: inherit; }
+
+.permalink {	border-bottom: thin dotted;
+		color: inherit;
+		font: inherit;
+		text-decoration: inherit; }
+* {		clear: both }
+
+/* Search form and search results. */
+
+fieldset {	border: thin solid silver;
+		border-radius: 1em;
+		text-align: center; }
+input[name=expr] {
+		width: 25%; }
+
+table.results {	margin-top: 1em;
+		margin-left: 2em;
+		font-size: smaller; }
+
+/* Header and footer lines. */
+
+div[role=doc-pageheader] {
+		display: flex;
+		border-bottom: 1px dotted #808080;
+		margin-bottom: 1em;
+		font-size: smaller; }
+.head-ltitle {	flex: 1; }
+.head-vol {	flex: 0 1 auto;
+		text-align: center; }
+.head-rtitle {	flex: 1;
+		text-align: right; }
+
+div[role=doc-pagefooter] {
+		display: flex;
+		justify-content: space-between;
+		border-top: 1px dotted #808080;
+		margin-top: 1em;
+		font-size: smaller; }
+.foot-left {	flex: 1; }
+.foot-date {	flex: 0 1 auto;
+		text-align: center; }
+.foot-os {	flex: 1;
+		text-align: right; }
+
+/* Sections and paragraphs. */
+
+main {		margin-left: 3.8em; }
+.Nd { }
+section.Sh { }
+h2.Sh {		margin-top: 1.2em;
+		margin-bottom: 0.6em;
+		margin-left: -3.2em; }
+section.Ss { }
+h3.Ss {		margin-top: 1.2em;
+		margin-bottom: 0.6em;
+		margin-left: -1.2em;
+		font-size: 105%; }
+.Pp {		margin: 0.6em 0em; }
+.Sx { }
+.Xr { }
+
+/* Displays and lists. */
+
+.Bd { }
+.Bd-indent {	margin-left: 3.8em; }
+
+.Bl-bullet {	list-style-type: disc;
+		padding-left: 1em; }
+.Bl-bullet > li { }
+.Bl-dash {	list-style-type: none;
+		padding-left: 0em; }
+.Bl-dash > li:before {
+		content: "\2014  "; }
+.Bl-item {	list-style-type: none;
+		padding-left: 0em; }
+.Bl-item > li { }
+.Bl-compact > li {
+		margin-top: 0em; }
+
+.Bl-enum {	padding-left: 2em; }
+.Bl-enum > li { }
+.Bl-compact > li {
+		margin-top: 0em; }
+
+.Bl-diag { }
+.Bl-diag > dt {
+		font-style: normal;
+		font-weight: bold; }
+.Bl-diag > dd {
+		margin-left: 0em; }
+.Bl-hang { }
+.Bl-hang > dt { }
+.Bl-hang > dd {
+		margin-left: 5.5em; }
+.Bl-inset { }
+.Bl-inset > dt { }
+.Bl-inset > dd {
+		margin-left: 0em; }
+.Bl-ohang { }
+.Bl-ohang > dt { }
+.Bl-ohang > dd {
+		margin-left: 0em; }
+.Bl-tag {	margin-top: 0.6em;
+		margin-left: 5.5em; }
+.Bl-tag > dt {
+		float: left;
+		margin-top: 0em;
+		margin-left: -5.5em;
+		padding-right: 0.5em;
+		vertical-align: top; }
+.Bl-tag > dd {
+		clear: right;
+		column-count: 1;  /* Force block formatting context. */
+		width: 100%;
+		margin-top: 0em;
+		margin-left: 0em;
+		margin-bottom: 0.6em;
+		vertical-align: top; }
+.Bl-compact {	margin-top: 0em; }
+.Bl-compact > dd {
+		margin-bottom: 0em; }
+.Bl-compact > dt {
+		margin-top: 0em; }
+
+.Bl-column { }
+.Bl-column > tbody > tr { }
+.Bl-column > tbody > tr > td {
+		margin-top: 1em; }
+.Bl-compact > tbody > tr > td {
+		margin-top: 0em; }
+
+.Rs {		font-style: normal;
+		font-weight: normal; }
+.RsA { }
+.RsB {		font-style: italic;
+		font-weight: normal; }
+.RsC { }
+.RsD { }
+.RsI {		font-style: italic;
+		font-weight: normal; }
+.RsJ {		font-style: italic;
+		font-weight: normal; }
+.RsN { }
+.RsO { }
+.RsP { }
+.RsQ { }
+.RsR { }
+.RsT {		text-decoration: underline; }
+.RsU { }
+.RsV { }
+
+.eqn { }
+.tbl td {	vertical-align: middle; }
+
+.HP {		margin-left: 3.8em;
+		text-indent: -3.8em; }
+
+/* Semantic markup for command line utilities. */
+
+table.Nm { }
+code.Nm {	font-style: normal;
+		font-weight: bold;
+		font-family: inherit; }
+.Fl {		font-style: normal;
+		font-weight: bold;
+		font-family: inherit; }
+.Cm {		font-style: normal;
+		font-weight: bold;
+		font-family: inherit; }
+.Ar {		font-style: italic;
+		font-weight: normal; }
+.Op {		display: inline flow; }
+.Ic {		font-style: normal;
+		font-weight: bold;
+		font-family: inherit; }
+.Ev {		font-style: normal;
+		font-weight: normal;
+		font-family: monospace; }
+.Pa {		font-style: italic;
+		font-weight: normal; }
+
+/* Semantic markup for function libraries. */
+
+.Lb { }
+code.In {	font-style: normal;
+		font-weight: bold;
+		font-family: inherit; }
+a.In { }
+.Fd {		font-style: normal;
+		font-weight: bold;
+		font-family: inherit; }
+.Ft {		font-style: italic;
+		font-weight: normal; }
+.Fn {		font-style: normal;
+		font-weight: bold;
+		font-family: inherit; }
+.Fa {		font-style: italic;
+		font-weight: normal; }
+.Vt {		font-style: italic;
+		font-weight: normal; }
+.Va {		font-style: italic;
+		font-weight: normal; }
+.Dv {		font-style: normal;
+		font-weight: normal;
+		font-family: monospace; }
+.Er {		font-style: normal;
+		font-weight: normal;
+		font-family: monospace; }
+
+/* Various semantic markup. */
+
+.An { }
+.Lk { }
+.Mt { }
+.Cd {		font-style: normal;
+		font-weight: bold;
+		font-family: inherit; }
+.Ad {		font-style: italic;
+		font-weight: normal; }
+.Ms {		font-style: normal;
+		font-weight: bold; }
+.St { }
+.Ux { }
+
+/* Physical markup. */
+
+.Bf {		display: inline flow; }
+.No {		font-style: normal;
+		font-weight: normal; }
+.Em {		font-style: italic;
+		font-weight: normal; }
+.Sy {		font-style: normal;
+		font-weight: bold; }
+.Li {		font-style: normal;
+		font-weight: normal;
+		font-family: monospace; }
+
+/* Tooltip support. */
+
+h2.Sh, h3.Ss {	position: relative; }
+.An, .Ar, .Cd, .Cm, .Dv, .Em, .Er, .Ev, .Fa, .Fd, .Fl, .Fn, .Ft,
+.Ic, code.In, .Lb, .Lk, .Ms, .Mt, .Nd, code.Nm, .Pa, .Rs,
+.St, .Sx, .Sy, .Va, .Vt, .Xr {
+		display: inline flow;
+		position: relative; }
+
+.An::before {	content: "An"; }
+.Ar::before {	content: "Ar"; }
+.Cd::before {	content: "Cd"; }
+.Cm::before {	content: "Cm"; }
+.Dv::before {	content: "Dv"; }
+.Em::before {	content: "Em"; }
+.Er::before {	content: "Er"; }
+.Ev::before {	content: "Ev"; }
+.Fa::before {	content: "Fa"; }
+.Fd::before {	content: "Fd"; }
+.Fl::before {	content: "Fl"; }
+.Fn::before {	content: "Fn"; }
+.Ft::before {	content: "Ft"; }
+.Ic::before {	content: "Ic"; }
+code.In::before { content: "In"; }
+.Lb::before {	content: "Lb"; }
+.Lk::before {	content: "Lk"; }
+.Ms::before {	content: "Ms"; }
+.Mt::before {	content: "Mt"; }
+.Nd::before {	content: "Nd"; }
+code.Nm::before { content: "Nm"; }
+.Pa::before {	content: "Pa"; }
+.Rs::before {	content: "Rs"; }
+h2.Sh::before {	content: "Sh"; }
+h3.Ss::before {	content: "Ss"; }
+.St::before {	content: "St"; }
+.Sx::before {	content: "Sx"; }
+.Sy::before {	content: "Sy"; }
+.Va::before {	content: "Va"; }
+.Vt::before {	content: "Vt"; }
+.Xr::before {	content: "Xr"; }
+
+.An::before, .Ar::before, .Cd::before, .Cm::before,
+.Dv::before, .Em::before, .Er::before, .Ev::before,
+.Fa::before, .Fd::before, .Fl::before, .Fn::before, .Ft::before,
+.Ic::before, code.In::before, .Lb::before, .Lk::before,
+.Ms::before, .Mt::before, .Nd::before, code.Nm::before,
+.Pa::before, .Rs::before,
+h2.Sh::before, h3.Ss::before, .St::before, .Sx::before, .Sy::before,
+.Va::before, .Vt::before, .Xr::before {
+		opacity: 0;
+		transition: .15s ease opacity;
+		pointer-events: none;
+		position: absolute;
+		bottom: 100%;
+		box-shadow: 0 0 .35em var(--fg);
+		padding: .15em .25em;
+		white-space: nowrap;
+		font-family: Helvetica,Arial,sans-serif;
+		font-style: normal;
+		font-weight: bold;
+		background: var(--bg);
+		color: var(--fg); }
+.An:hover::before, .Ar:hover::before, .Cd:hover::before, .Cm:hover::before,
+.Dv:hover::before, .Em:hover::before, .Er:hover::before, .Ev:hover::before,
+.Fa:hover::before, .Fd:hover::before, .Fl:hover::before, .Fn:hover::before,
+.Ft:hover::before, .Ic:hover::before, code.In:hover::before,
+.Lb:hover::before, .Lk:hover::before, .Ms:hover::before, .Mt:hover::before,
+.Nd:hover::before, code.Nm:hover::before, .Pa:hover::before,
+.Rs:hover::before, h2.Sh:hover::before, h3.Ss:hover::before, .St:hover::before,
+.Sx:hover::before, .Sy:hover::before, .Va:hover::before, .Vt:hover::before,
+.Xr:hover::before {
+		opacity: 1;
+		pointer-events: inherit; }
+
+/* Overrides to avoid excessive margins on small devices. */
+
+@media (max-width: 37.5em) {
+main {		margin-left: 0.5em; }
+h2.Sh, h3.Ss {	margin-left: 0em; }
+.Bd-indent {	margin-left: 2em; }
+.Bl-hang > dd {
+		margin-left: 2em; }
+.Bl-tag {	margin-left: 2em; }
+.Bl-tag > dt {
+		margin-left: -2em; }
+.HP {		margin-left: 2em;
+		text-indent: -2em; }
+}
+
+/* Overrides for a dark color scheme for accessibility. */
+
+@media (prefers-color-scheme: dark) {
+html {		--bg: #1E1F21;
+		--fg: #EEEFF1; }
+:link {		color: #BAD7FF; }
+:visited {	color: #F6BAFF; }
+}

site/style.css

@@ -0,0 +1,114 @@
+@import "mandoc.css";
+
+:root {
+	--border-radius: 10px;
+
+	--color-snippet: #161b22;	
+	--color-link: #7b8333;
+	--color-bg: #0d1117;
+	--color-text: #c9d1d9;
+
+	--color-table-border: #30363d;
+	--color-table-accent: #161b22;
+
+	--color-error-bg: #5c6434;
+	--color-error: white;
+}
+
+html {
+	max-width: 100%;
+}
+
+body {
+    margin: auto;
+    max-width: 8.5in;
+    padding: 0.25in;
+
+	color: var(--color-text);
+	background-color: var(--color-bg);
+
+	font-family: Arial;
+}
+
+.msg-error {
+	background-color: var(--color-error-bg);
+	color: var(--color-error);
+	border-radius: var(--border-radius);
+	padding: 20px;
+}
+
+.msg-error a {
+	color: var(--color-error);
+	font-weight: bold;
+	text-decoration: underline
+}
+
+h1 {
+	text-align: center;
+}
+
+h1, h4, h5, h6 {
+    border-bottom: 1px dashed var(--color-table-border);
+}
+
+hr {
+	border: 0;
+	border-bottom: 1px dashed var(--color-table-border);
+}
+
+h4, h5, h6 {
+    width: fit-content;
+}
+
+a {
+    color: var(--color-link) !important;
+    text-decoration: none;
+}
+
+a:hover {
+    text-decoration: underline;
+}
+
+table {
+    width: 100%;
+    border-collapse: separate;
+	border-spacing: 0px;
+}
+
+td, th {
+    border: 1px solid var(--color-table-border);
+    text-align: left;
+    padding: 8px;
+}
+
+tr:nth-child(even) {
+    background-color: var(--color-table-accent);
+}
+
+/* Thanks Jonah! */
+#logo {
+	display: block;
+	margin: auto;
+	width: 50vw;
+	max-width: 400px;
+}
+
+/* Mandoc overrides */
+
+.Bd {
+    background-color: var(--color-snippet);
+    border-radius: var(--border-radius);
+	padding-left: 10px;
+
+	overflow: auto;
+}
+
+.Nm {
+	width: fit-content;
+}
+
+.Nm td, .Nm th {
+	border: none;
+}
+
+

site/telodendria-signify.pub

@@ -0,0 +1,2 @@
+untrusted comment: signify public key
+RWTPPnWvnpee8NlygSggQqk5V5oghl6Ikq99bZl5IRQwiRMLaJnq82mw

src/CanonicalJson.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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

src/Config.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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
@@ -22,88 +21,405 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#include <Schema/Config.h>
+#include <Config.h>
 #include <Cytoplasm/Memory.h>
 #include <Cytoplasm/Json.h>
 #include <Cytoplasm/HashMap.h>
 #include <Cytoplasm/Array.h>
 #include <Cytoplasm/Str.h>
 #include <Cytoplasm/Db.h>
+#include <Cytoplasm/HttpServer.h>
 #include <Cytoplasm/Log.h>
-#include <Cytoplasm/Util.h>
+#include <Cytoplasm/Int64.h>
 
-#include <sys/types.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
 #include <limits.h>
-#include <grp.h>
-#include <pwd.h>
 
 #ifndef HOST_NAME_MAX
 #define HOST_NAME_MAX _POSIX_HOST_NAME_MAX
 #endif
 
-void
+#define CONFIG_REQUIRE(key, type) \
-ConfigParse(HashMap * config, Config *tConfig)
+    value = HashMapGet(config, key); \
+    if (!value) \
+    { \
+        tConfig->err = "Missing required " key " directive."; \
+        goto error; \
+    } \
+    if (JsonValueType(value) == JSON_NULL) \
+    { \
+        tConfig->err = "Missing value for " key " directive."; \
+        goto error; \
+    } \
+    if (JsonValueType(value) != type) \
+    { \
+        tConfig->err = "Expected " key " to be of type " #type; \
+        goto error; \
+    }
+
+#define CONFIG_COPY_STRING(into) \
+    into = StrDuplicate(JsonValueAsString(value));
+
+#define CONFIG_OPTIONAL_STRING(into, key, default) \
+    value = HashMapGet(config, key); \
+    if (value && JsonValueType(value) != JSON_NULL) \
+    { \
+        if (JsonValueType(value) != JSON_STRING) \
+        { \
+            tConfig->err = "Expected " key " to be of type JSON_STRING"; \
+            goto error; \
+        } \
+        into = StrDuplicate(JsonValueAsString(value)); \
+    } \
+    else \
+    { \
+        into = default ? StrDuplicate(default) : NULL; \
+    }
+
+#define CONFIG_OPTIONAL_INTEGER(into, key, default) \
+    value = HashMapGet(config, key); \
+    if (value && JsonValueType(value) != JSON_NULL) \
+    { \
+        if (JsonValueType(value) != JSON_INTEGER) \
+        { \
+            tConfig->err = "Expected " key " to be of type JSON_INTEGER"; \
+            goto error; \
+        } \
+        into = Int64Low(JsonValueAsInteger(value)); \
+    } \
+    else \
+    { \
+        into = default; \
+    }
+
+static int
+ConfigParseRunAs(Config * tConfig, HashMap * config)
+{
+    JsonValue *value;
+
+    CONFIG_REQUIRE("uid", JSON_STRING);
+    CONFIG_COPY_STRING(tConfig->uid);
+
+    CONFIG_OPTIONAL_STRING(tConfig->gid, "gid", tConfig->uid);
+
+    return 1;
+
+error:
+    return 0;
+}
+
+static int
+ConfigParseListen(Config * tConfig, Array * listen)
 {
     size_t i;
 
+    if (!ArraySize(listen))
+    {
+        tConfig->err = "Listen array cannot be empty; you must specify at least one listener.";
+        goto error;
+    }
+
+    if (!tConfig->servers)
+    {
+        tConfig->servers = ArrayCreate();
+        if (!tConfig->servers)
+        {
+            tConfig->err = "Unable to allocate memory for listener configurations.";
+            goto error;
+        }
+    }
+
+    for (i = 0; i < ArraySize(listen); i++)
+    {
+        JsonValue *val = ArrayGet(listen, i);
+        HashMap *obj;
+        HttpServerConfig *serverCfg = Malloc(sizeof(HttpServerConfig));
+
+        if (!serverCfg)
+        {
+            tConfig->err = "Unable to allocate memory for listener configuration.";
+            goto error;
+        }
+
+        if (JsonValueType(val) != JSON_OBJECT)
+        {
+            tConfig->err = "Invalid value in listener array. All listeners must be objects.";
+            goto error;
+        }
+
+        obj = JsonValueAsObject(val);
+
+        serverCfg->port = Int64Low(JsonValueAsInteger(HashMapGet(obj, "port")));
+        serverCfg->threads = Int64Low(JsonValueAsInteger(HashMapGet(obj, "threads")));
+        serverCfg->maxConnections = Int64Low(JsonValueAsInteger(HashMapGet(obj, "maxConnections")));
+
+        if (!serverCfg->port)
+        {
+            Free(serverCfg);
+            continue;
+        }
+
+        if (!serverCfg->threads)
+        {
+            serverCfg->threads = 4;
+        }
+
+        if (!serverCfg->maxConnections)
+        {
+            serverCfg->maxConnections = 32;
+        }
+
+        val = HashMapGet(obj, "tls");
+        if ((JsonValueType(val) == JSON_BOOLEAN && !JsonValueAsBoolean(val)) || JsonValueType(val) == JSON_NULL)
+        {
+            serverCfg->flags = HTTP_FLAG_NONE;
+            serverCfg->tlsCert = NULL;
+            serverCfg->tlsKey = NULL;
+        }
+        else if (JsonValueType(val) != JSON_OBJECT)
+        {
+            tConfig->err = "Invalid value for listener.tls. It must be an object.";
+            goto error;
+        }
+        else
+        {
+            serverCfg->flags = HTTP_FLAG_TLS;
+
+            obj = JsonValueAsObject(val);
+            serverCfg->tlsCert = StrDuplicate(JsonValueAsString(HashMapGet(obj, "cert")));
+            serverCfg->tlsKey = StrDuplicate(JsonValueAsString(HashMapGet(obj, "key")));
+
+            if (!serverCfg->tlsCert || !serverCfg->tlsKey)
+            {
+                tConfig->err = "TLS cert and key must both be valid file names.";
+                goto error;
+            }
+        }
+        ArrayAdd(tConfig->servers, serverCfg);
+    }
+
+    return 1;
+error:
+    return 0;
+}
+
+static int
+ConfigParseLog(Config * tConfig, HashMap * config)
+{
+    JsonValue *value;
+    char *str;
+
+    CONFIG_REQUIRE("output", JSON_STRING);
+    str = JsonValueAsString(value);
+
+    if (StrEquals(str, "stdout"))
+    {
+        tConfig->flags |= CONFIG_LOG_STDOUT;
+    }
+    else if (StrEquals(str, "file"))
+    {
+        tConfig->flags |= CONFIG_LOG_FILE;
+    }
+    else if (StrEquals(str, "syslog"))
+    {
+        tConfig->flags |= CONFIG_LOG_SYSLOG;
+    }
+    else
+    {
+        tConfig->err = "Invalid value for log.output";
+        goto error;
+    }
+
+    CONFIG_OPTIONAL_STRING(str, "level", "message");
+
+    if (StrEquals(str, "message"))
+    {
+        tConfig->logLevel = LOG_INFO;
+    }
+    else if (StrEquals(str, "debug"))
+    {
+        tConfig->logLevel = LOG_DEBUG;
+    }
+    else if (StrEquals(str, "notice"))
+    {
+        tConfig->logLevel = LOG_NOTICE;
+    }
+    else if (StrEquals(str, "warning"))
+    {
+        tConfig->logLevel = LOG_WARNING;
+    }
+    else if (StrEquals(str, "error"))
+    {
+        tConfig->logLevel = LOG_ERR;
+    }
+    else
+    {
+        tConfig->err = "Invalid value for log.level.";
+        goto error;
+    }
+
+    Free(str);
+
+    CONFIG_OPTIONAL_STRING(tConfig->logTimestamp, "timestampFormat", "default");
+
+    if (StrEquals(tConfig->logTimestamp, "none"))
+    {
+        Free(tConfig->logTimestamp);
+        tConfig->logTimestamp = NULL;
+    }
+
+    value = HashMapGet(config, "color");
+    if (value && JsonValueType(value) != JSON_NULL)
+    {
+        if (JsonValueType(value) != JSON_BOOLEAN)
+        {
+            tConfig->err = "Expected type JSON_BOOLEAN for log.color.";
+            goto error;
+        }
+
+        if (JsonValueAsBoolean(value))
+        {
+            tConfig->flags |= CONFIG_LOG_COLOR;
+        }
+    }
+
+    return 1;
+
+error:
+    return 0;
+}
+
+void
+ConfigFree(Config * tConfig)
+{
+    if (!tConfig)
+    {
+        return;
+    }
+
+    Free(tConfig->serverName);
+    Free(tConfig->baseUrl);
+    Free(tConfig->identityServer);
+
+    Free(tConfig->uid);
+    Free(tConfig->gid);
+
+    Free(tConfig->logTimestamp);
+
+    if (tConfig->servers)
+    {
+        size_t i;
+
+        for (i = 0; i < ArraySize(tConfig->servers); i++)
+        {
+            HttpServerConfig *serverCfg = ArrayGet(tConfig->servers, i);
+
+            Free(serverCfg->tlsCert);
+            Free(serverCfg->tlsKey);
+            Free(serverCfg);
+        }
+
+        ArrayFree(tConfig->servers);
+    }
+
+    Free(tConfig);
+}
+
+Config *
+ConfigParse(HashMap * config)
+{
+    Config *tConfig;
+    JsonValue *value;
+
     if (!config)
     {
-        tConfig->ok = 0;
+        return NULL;
-        tConfig->err = "Invalid object given as config.";
+    }
-        return;
+
+    tConfig = Malloc(sizeof(Config));
+    if (!tConfig)
+    {
+        return NULL;
     }
 
     memset(tConfig, 0, sizeof(Config));
 
-    tConfig->maxCache = 0;
+    CONFIG_REQUIRE("listen", JSON_ARRAY);
-
+    if (!ConfigParseListen(tConfig, JsonValueAsArray(value)))
-    if (!ConfigFromJson(config, tConfig, &tConfig->err))
     {
-        ConfigFree(tConfig);
         goto error;
     }
-    if (!tConfig->baseUrl)
+
+    CONFIG_REQUIRE("serverName", JSON_STRING);
+    CONFIG_COPY_STRING(tConfig->serverName);
+
+    value = HashMapGet(config, "baseUrl");
+    if (value)
+    {
+        CONFIG_COPY_STRING(tConfig->baseUrl);
+    }
+    else
     {
         size_t len = strlen(tConfig->serverName) + 10;
 
         tConfig->baseUrl = Malloc(len);
         if (!tConfig->baseUrl)
         {
-            tConfig->err = "Couldn't allocate enough memory for 'baseUrl'.";
+            tConfig->err = "Error allocating memory for default config value 'baseUrl'.";
             goto error;
         }
-        snprintf(tConfig->baseUrl, len, "https://%s/", tConfig->serverName);
+
+        snprintf(tConfig->baseUrl, len, "https://%s", tConfig->serverName);
     }
-    if (!tConfig->log.timestampFormat)
+
+    CONFIG_OPTIONAL_STRING(tConfig->identityServer, "identityServer", NULL);
+
+    value = HashMapGet(config, "runAs");
+    if (value && JsonValueType(value) != JSON_NULL)
     {
-        tConfig->log.timestampFormat = StrDuplicate("default");
+        if (JsonValueType(value) == JSON_OBJECT)
-    }
-    for (i = 0; i < ArraySize(tConfig->listen); i++)
         {
-        ConfigListener *listener = ArrayGet(tConfig->listen, i);
+            if (!ConfigParseRunAs(tConfig, JsonValueAsObject(value)))
-        if (!listener->maxConnections)
             {
-            listener->maxConnections = 32;
+                goto error;
             }
-        if (!listener->threads)
+        }
+        else
         {
-            listener->threads = 4;
+            tConfig->err = "Config directive 'runAs' should be a JSON object that contains a 'uid' and 'gid'.";
+            goto error;
         }
-        if (!listener->port)
+    }
+
+    CONFIG_OPTIONAL_INTEGER(tConfig->maxCache, "maxCache", 0);
+
+    CONFIG_REQUIRE("federation", JSON_BOOLEAN);
+    if (JsonValueAsBoolean(value))
     {
-            listener->port = 8008;
+        tConfig->flags |= CONFIG_FEDERATION;
     }
+
+    CONFIG_REQUIRE("registration", JSON_BOOLEAN);
+    if (JsonValueAsBoolean(value))
+    {
+        tConfig->flags |= CONFIG_REGISTRATION;
     }
+
+    CONFIG_REQUIRE("log", JSON_OBJECT);
+    if (!ConfigParseLog(tConfig, JsonValueAsObject(value)))
+    {
+        goto error;
+    }
+
     tConfig->ok = 1;
     tConfig->err = NULL;
-    return;
+    return tConfig;
 
 error:
     tConfig->ok = 0;
-    return;
+    return tConfig;
 }
 
 int
@@ -115,82 +431,66 @@ ConfigExists(Db * db)
 int
 ConfigCreateDefault(Db * db)
 {
-    Config config;
-    ConfigListener *listener;
-
-    HashMap *json;
-    JsonValue *val;
-
     DbRef *ref;
+    HashMap *json;
+    Array *listeners;
+    HashMap *listen;
 
-    size_t len;
+    char hostname[HOST_NAME_MAX + 1];
 
-    memset(&config, 0, sizeof(Config));
+    if (!db)
-
+    {
-
+        return 0;
-    config.log.output = CONFIG_LOG_OUTPUT_FILE;
+    }
-
-    config.runAs.gid = StrDuplicate(getgrgid(getgid())->gr_name);
-    config.runAs.uid = StrDuplicate(getpwuid(getuid())->pw_name);
-
-    config.registration = 0;
-    config.federation = 1;
-
-    /* Create serverName and baseUrl. */
-    config.serverName = Malloc(HOST_NAME_MAX + 1);
-    memset(config.serverName, 0, HOST_NAME_MAX + 1);
-    gethostname(config.serverName, HOST_NAME_MAX);
-    len = strlen(config.serverName) + 10;
-    config.baseUrl = Malloc(len);
-    snprintf(config.baseUrl, len, "https://%s/", config.serverName);
-
-    /* Add simple listener without TLS. */
-    config.listen = ArrayCreate();
-    listener = Malloc(sizeof(ConfigListener));
-    listener->maxConnections = 32;
-    listener->port = 8008;
-    listener->threads = 4;
-
-    ArrayAdd(config.listen, listener);
-
-    /* Write it all out to the configuration file. */
-    json = ConfigToJson(&config);
-    val = JsonGet(json, 1, "listen");
-    val = ArrayGet(JsonValueAsArray(val), 0);
-    JsonValueFree(HashMapDelete(JsonValueAsObject(val), "tls"));
 
     ref = DbCreate(db, 1, "config");
     if (!ref)
     {
-        ConfigFree(&config);
         return 0;
     }
-    DbJsonSet(ref, json);
-    DbUnlock(db, ref);
 
-    ConfigFree(&config);
+    json = DbJson(ref);
-    JsonFree(json);
 
-    return 1;
+    JsonSet(json, JsonValueString("file"), 2, "log", "output");
+
+    listeners = ArrayCreate();
+    listen = HashMapCreate();
+    HashMapSet(listen, "port", JsonValueInteger(Int64Create(0, 8008)));
+    HashMapSet(listen, "tls", JsonValueBoolean(0));
+    ArrayAdd(listeners, JsonValueObject(listen));
+    HashMapSet(json, "listen", JsonValueArray(listeners));
+
+    if (gethostname(hostname, HOST_NAME_MAX + 1) < 0)
+    {
+        strncpy(hostname, "localhost", HOST_NAME_MAX);
+    }
+    HashMapSet(json, "serverName", JsonValueString(hostname));
+
+    HashMapSet(json, "federation", JsonValueBoolean(1));
+    HashMapSet(json, "registration", JsonValueBoolean(0));
+
+    return DbUnlock(db, ref);
 }
 
-void
+Config *
-ConfigLock(Db * db, Config *config)
+ConfigLock(Db * db)
 {
+    Config *config;
     DbRef *ref = DbLock(db, 1, "config");
 
     if (!ref)
     {
-        config->ok = 0;
+        return NULL;
-        config->err = "Couldn't lock configuration.";
     }
 
-    ConfigParse(DbJson(ref), config);
+    config = ConfigParse(DbJson(ref));
-    if (config->ok)
+    if (config)
     {
         config->db = db;
         config->ref = ref;
     }
+
+    return config;
 }
 
 int
@@ -199,7 +499,7 @@ ConfigUnlock(Config *config)
     Db *db;
     DbRef *dbRef;
 
-    if (!config->ok)
+    if (!config)
     {
         return 0;
     }
@@ -208,25 +508,5 @@ ConfigUnlock(Config *config)
     dbRef = config->ref;
 
     ConfigFree(config);
-    config->ok = 0;
-
     return DbUnlock(db, dbRef);
 }
-int 
-ConfigLogLevelToSyslog(ConfigLogLevel level)
-{
-    switch (level)
-    {
-        case CONFIG_LOG_LEVEL_NOTICE:
-            return LOG_NOTICE;
-        case CONFIG_LOG_LEVEL_ERROR:
-            return LOG_ERR;
-        case CONFIG_LOG_LEVEL_MESSAGE:
-            return LOG_INFO;
-        case CONFIG_LOG_LEVEL_DEBUG:
-            return LOG_DEBUG;
-        case CONFIG_LOG_LEVEL_WARNING:
-            return LOG_WARNING;
-    }
-    return LOG_INFO;
-}

src/Filter.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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
@@ -29,7 +28,5 @@
 HashMap *
 FilterApply(Filter * filter, HashMap * event)
 {
-    (void) filter;
-    (void) event;
     return NULL;
 }

src/Html.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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

src/Main.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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
@@ -36,12 +35,14 @@
 
 #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>
 
@@ -50,9 +51,6 @@
 #include <User.h>
 #include <RegToken.h>
 #include <Routes.h>
-#include <Uia.h>
-#include <Config.h>
-
 
 static Array *httpServers;
 static volatile int restart;
@@ -104,11 +102,8 @@ Main(Array * args)
     char *dbPath;
 
     /* Program configuration */
-    Config tConfig;
+    Config *tConfig;
     Stream *logFile;
-    Stream *pidFile;
-
-    char *pidPath;
 
     /* User validation */
     struct passwd *userInfo;
@@ -133,13 +128,16 @@ start:
     httpServers = NULL;
     restart = 0;
 
+    /* For getopt() */
+    opterr = 1;
+    optind = 1;
+
     /* Local variables */
     exit = EXIT_SUCCESS;
     flags = 0;
     dbPath = NULL;
+    tConfig = NULL;
     logFile = NULL;
-    pidFile = NULL;
-    pidPath = NULL;
     userInfo = NULL;
     groupInfo = NULL;
     cron = NULL;
@@ -249,7 +247,7 @@ start:
         }
 
         token = StrRandom(32);
-        info = RegTokenCreate(matrixArgs.db, token, NULL, /* expires */ 0, /* uses */ 1, USER_ALL);
+        info = RegTokenCreate(matrixArgs.db, token, NULL, UInt64Create(0, 0), Int64Create(0, 1), USER_ALL);
         if (!info)
         {
             Free(token);
@@ -267,20 +265,33 @@ start:
 
     Log(LOG_NOTICE, "Loading configuration...");
 
-    ConfigLock(matrixArgs.db, &tConfig);
+    tConfig = ConfigLock(matrixArgs.db);
-    if (!tConfig.ok)
+    if (!tConfig)
     {
-        Log(LOG_ERR, tConfig.err);
+        Log(LOG_ERR, "Error locking the configuration.");
+        Log(LOG_ERR, "The configuration object is corrupted or otherwise invalid.");
+        Log(LOG_ERR, "Please restore from a backup.");
+        exit = EXIT_FAILURE;
+        goto finish;
+    }
+    else if (!tConfig->ok)
+    {
+        Log(LOG_ERR, tConfig->err);
         exit = EXIT_FAILURE;
         goto finish;
     }
 
-    if (!tConfig.log.timestampFormat || !StrEquals(tConfig.log.timestampFormat, "default"))
+    if (!tConfig->logTimestamp || !StrEquals(tConfig->logTimestamp, "default"))
     {
-        LogConfigTimeStampFormatSet(LogConfigGlobal(), tConfig.log.timestampFormat);
+        LogConfigTimeStampFormatSet(LogConfigGlobal(), tConfig->logTimestamp);
+    }
+    else
+    {
+        Free(tConfig->logTimestamp);
+        tConfig->logTimestamp = NULL;
     }
 
-    if (tConfig.log.color)
+    if (tConfig->flags & CONFIG_LOG_COLOR)
     {
         LogConfigFlagSet(LogConfigGlobal(), LOG_FLAG_COLOR);
     }
@@ -289,13 +300,9 @@ start:
         LogConfigFlagClear(LogConfigGlobal(), LOG_FLAG_COLOR);
     }
 
-    LogConfigLevelSet(
+    LogConfigLevelSet(LogConfigGlobal(), flags & ARG_VERBOSE ? LOG_DEBUG : tConfig->logLevel);
-            LogConfigGlobal(), 
-            flags & ARG_VERBOSE ?
-                LOG_DEBUG : 
-                ConfigLogLevelToSyslog(tConfig.log.level));
 
-    if (tConfig.log.output == CONFIG_LOG_OUTPUT_FILE)
+    if (tConfig->flags & CONFIG_LOG_FILE)
     {
         logFile = StreamOpen("telodendria.log", "a");
 
@@ -303,18 +310,18 @@ start:
         {
             Log(LOG_ERR, "Unable to open log file for appending.");
             exit = EXIT_FAILURE;
-            tConfig.log.output = CONFIG_LOG_OUTPUT_STDOUT;
+            tConfig->flags &= CONFIG_LOG_STDOUT;
             goto finish;
         }
 
         Log(LOG_INFO, "Logging to the log file. Check there for all future messages.");
         LogConfigOutputSet(LogConfigGlobal(), logFile);
     }
-    else if (tConfig.log.output == CONFIG_LOG_OUTPUT_STDOUT)
+    else if (tConfig->flags & CONFIG_LOG_STDOUT)
     {
         Log(LOG_DEBUG, "Already logging to standard output.");
     }
-    else if (tConfig.log.output == CONFIG_LOG_OUTPUT_SYSLOG)
+    else if (tConfig->flags & CONFIG_LOG_SYSLOG)
     {
         Log(LOG_INFO, "Logging to the syslog. Check there for all future messages.");
         LogConfigFlagSet(LogConfigGlobal(), LOG_FLAG_SYSLOG);
@@ -324,6 +331,13 @@ start:
          * messages get passed to the syslog */
         setlogmask(LOG_UPTO(LOG_DEBUG));
     }
+    else
+    {
+        Log(LOG_ERR, "Unknown logging method in flags: '%d'", tConfig->flags);
+        Log(LOG_ERR, "This is a programmer error; please report it.");
+        exit = EXIT_FAILURE;
+        goto finish;
+    }
 
     /* If a token was created with a default config, print it to the
      * log */
@@ -333,30 +347,14 @@ start:
         Free(token);
     }
 
-    if (tConfig.pid)
-    {
-        pidFile = StreamOpen(tConfig.pid, "w+");
-        if (!pidFile)
-        {
-            char *msg = "Couldn't lock PID file at '%s'";
-            Log(LOG_ERR, msg, tConfig.pid);
-            exit = EXIT_FAILURE;
-            goto finish;
-        }
-        pidPath = StrDuplicate(tConfig.pid);
-        StreamPrintf(pidFile, "%ld", (long) getpid());
-        StreamClose(pidFile);
-    }
-
     Log(LOG_DEBUG, "Configuration:");
     LogConfigIndent(LogConfigGlobal());
-    Log(LOG_DEBUG, "Server Name: %s", tConfig.serverName);
+    Log(LOG_DEBUG, "Server Name: %s", tConfig->serverName);
-    Log(LOG_DEBUG, "Base URL: %s", tConfig.baseUrl);
+    Log(LOG_DEBUG, "Base URL: %s", tConfig->baseUrl);
-    Log(LOG_DEBUG, "Identity Server: %s", tConfig.identityServer);
+    Log(LOG_DEBUG, "Identity Server: %s", tConfig->identityServer);
-    Log(LOG_DEBUG, "Run As: %s:%s", tConfig.runAs.uid, tConfig.runAs.gid);
+    Log(LOG_DEBUG, "Run As: %s:%s", tConfig->uid, tConfig->gid);
-    Log(LOG_DEBUG, "Max Cache: %ld", tConfig.maxCache);
+    Log(LOG_DEBUG, "Max Cache: %ld", tConfig->maxCache);
-    Log(LOG_DEBUG, "Registration: %s", tConfig.registration ? "true" : "false");
+    Log(LOG_DEBUG, "Flags: %x", tConfig->flags);
-    Log(LOG_DEBUG, "Federation: %s", tConfig.federation ? "true" : "false");
     LogConfigUnindent(LogConfigGlobal());
 
     httpServers = ArrayCreate();
@@ -368,51 +366,41 @@ start:
     }
 
     /* Bind servers before possibly dropping permissions. */
-    for (i = 0; i < ArraySize(tConfig.listen); i++)
+    for (i = 0; i < ArraySize(tConfig->servers); i++)
     {
-        ConfigListener *serverCfg = ArrayGet(tConfig.listen, i);
+        HttpServerConfig *serverCfg = ArrayGet(tConfig->servers, i);
-
-        HttpServerConfig args;
-
-        args.port = serverCfg->port;
-        args.threads = serverCfg->maxConnections;
-        args.maxConnections = serverCfg->maxConnections;
-        args.tlsCert = serverCfg->tls.cert;
-        args.tlsKey = serverCfg->tls.key;
-        args.flags = args.tlsCert && args.tlsKey ? HTTP_FLAG_TLS : HTTP_FLAG_NONE;
 
         Log(LOG_DEBUG, "HTTP listener: %lu", i);
         LogConfigIndent(LogConfigGlobal());
         Log(LOG_DEBUG, "Port: %hu", serverCfg->port);
         Log(LOG_DEBUG, "Threads: %u", serverCfg->threads);
         Log(LOG_DEBUG, "Max Connections: %u", serverCfg->maxConnections);
-        Log(LOG_DEBUG, "Flags: %d", args.flags);
+        Log(LOG_DEBUG, "Flags: %d", serverCfg->flags);
-        Log(LOG_DEBUG, "TLS Cert: %s", serverCfg->tls.cert);
+        Log(LOG_DEBUG, "TLS Cert: %s", serverCfg->tlsCert);
-        Log(LOG_DEBUG, "TLS Key: %s", serverCfg->tls.key);
+        Log(LOG_DEBUG, "TLS Key: %s", serverCfg->tlsKey);
         LogConfigUnindent(LogConfigGlobal());
 
+        serverCfg->handler = MatrixHttpHandler;
+        serverCfg->handlerArgs = &matrixArgs;
 
-        args.handler = MatrixHttpHandler;
+        if (serverCfg->flags & HTTP_FLAG_TLS)
-        args.handlerArgs = &matrixArgs;
-
-        if (args.flags & HTTP_FLAG_TLS)
         {
-            if (!UtilLastModified(serverCfg->tls.cert))
+            if (UInt64Eq(UtilLastModified(serverCfg->tlsCert), UInt64Create(0, 0)))
             {
-                Log(LOG_ERR, "%s: %s", strerror(errno), serverCfg->tls.cert);
+                Log(LOG_ERR, "%s: %s", strerror(errno), serverCfg->tlsCert);
                 exit = EXIT_FAILURE;
                 goto finish;
             }
 
-            if (UtilLastModified(serverCfg->tls.key))
+            if (UInt64Eq(UtilLastModified(serverCfg->tlsKey), UInt64Create(0, 0)))
             {
-                Log(LOG_ERR, "%s: %s", strerror(errno), serverCfg->tls.key);
+                Log(LOG_ERR, "%s: %s", strerror(errno), serverCfg->tlsKey);
                 exit = EXIT_FAILURE;
                 goto finish;
             }
         }
 
-        server = HttpServerCreate(&args);
+        server = HttpServerCreate(serverCfg);
         if (!server)
         {
             Log(LOG_ERR, "Unable to create HTTP server on port %d: %s",
@@ -433,10 +421,10 @@ start:
 
     Log(LOG_DEBUG, "Running as uid:gid: %d:%d.", getuid(), getgid());
 
-    if (tConfig.runAs.uid && tConfig.runAs.gid)
+    if (tConfig->uid && tConfig->gid)
     {
-        userInfo = getpwnam(tConfig.runAs.uid);
+        userInfo = getpwnam(tConfig->uid);
-        groupInfo = getgrnam(tConfig.runAs.gid);
+        groupInfo = getgrnam(tConfig->gid);
 
         if (!userInfo || !groupInfo)
         {
@@ -466,7 +454,7 @@ start:
             }
             else
             {
-                Log(LOG_DEBUG, "Set uid/gid to %s:%s.", tConfig.runAs.uid, tConfig.runAs.gid);
+                Log(LOG_DEBUG, "Set uid/gid to %s:%s.", tConfig->uid, tConfig->gid);
             }
         }
         else
@@ -478,7 +466,7 @@ start:
     }
     else
     {
-        if (tConfig.runAs.uid && tConfig.runAs.gid)
+        if (tConfig->uid && tConfig->gid)
         {
             if (getuid() != userInfo->pw_uid || getgid() != groupInfo->gr_gid)
             {
@@ -491,16 +479,17 @@ start:
         }
     }
 
-    if (!tConfig.maxCache)
+    if (!tConfig->maxCache)
     {
         Log(LOG_WARNING, "Database caching is disabled.");
         Log(LOG_WARNING, "If this is not what you intended, check the config file");
         Log(LOG_WARNING, "and ensure that maxCache is a valid number of bytes.");
     }
 
-    DbMaxCacheSet(matrixArgs.db, tConfig.maxCache);
+    DbMaxCacheSet(matrixArgs.db, tConfig->maxCache);
 
-    ConfigUnlock(&tConfig);
+    ConfigUnlock(tConfig);
+    tConfig = NULL;
 
     cron = CronCreate(60 * 1000);  /* 1-minute tick */
     if (!cron)
@@ -607,7 +596,7 @@ finish:
         Log(LOG_DEBUG, "Stopped and freed job scheduler.");
     }
 
-    ConfigUnlock(&tConfig);
+    ConfigUnlock(tConfig);
     Log(LOG_DEBUG, "Unlocked configuration.");
 
     DbClose(matrixArgs.db);
@@ -616,12 +605,6 @@ finish:
     HttpRouterFree(matrixArgs.router);
     Log(LOG_DEBUG, "Freed routing tree.");
 
-    if (pidPath)
-    {
-        remove(pidPath);
-        Free(pidPath);
-    }
-
     /*
      * Uninstall the memory hook because it uses the Log
      * API, whose configuration is being freed now, so it

src/Matrix.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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

src/Parser.c

@@ -1,516 +0,0 @@
-/*
- * 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;
-}

src/RegToken.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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
@@ -31,17 +30,16 @@
 #include <Cytoplasm/Json.h>
 #include <Cytoplasm/Util.h>
 #include <Cytoplasm/Str.h>
-#include <Cytoplasm/Log.h>
-
 #include <User.h>
+#include <Cytoplasm/Int64.h>
 
 int
 RegTokenValid(RegTokenInfo * token)
 {
     HashMap *tokenJson;
-    int64_t uses, used;
+    Int64 uses, used;
 
-    uint64_t expiration;
+    UInt64 expiration;
 
     if (!token || !RegTokenExists(token->db, token->name))
     {
@@ -53,7 +51,9 @@ RegTokenValid(RegTokenInfo * token)
     used = JsonValueAsInteger(HashMapGet(tokenJson, "used"));
     expiration = JsonValueAsInteger(HashMapGet(tokenJson, "expires_on"));
 
-    return (!expiration || (UtilTsMillis() < expiration)) && (uses == -1 || used < uses);
+    return (UInt64Eq(expiration, UInt64Create(0, 0)) ||
+            UInt64Geq(UtilServerTs(), expiration)) &&
+            (Int64Eq(uses, Int64Neg(Int64Create(0, 1))) || Int64Lt(used, uses));
 }
 void
 RegTokenUse(RegTokenInfo * token)
@@ -65,12 +65,13 @@ RegTokenUse(RegTokenInfo * token)
         return;
     }
 
-    if (token->uses >= 0 && token->used >= token->uses)
+    if (Int64Geq(token->uses, Int64Create(0, 0)) &&
+        Int64Geq(token->used, token->uses))
     {
         return;
     }
 
-    token->used++;
+    token->used = Int64Add(token->used, Int64Create(0, 1));
 
     /* Write the information to the hashmap */
     tokenJson = DbJson(token->ref);
@@ -98,7 +99,8 @@ RegTokenDelete(RegTokenInfo * token)
     {
         return 0;
     }
-    RegTokenInfoFree(token);
+    Free(token->name);
+    Free(token->owner);
     Free(token);
     return 1;
 }
@@ -111,8 +113,6 @@ RegTokenGetInfo(Db * db, char *token)
     DbRef *tokenRef;
     HashMap *tokenJson;
 
-    char *errp = NULL;
-
     if (!RegTokenExists(db, token))
     {
         return NULL;
@@ -126,16 +126,26 @@ RegTokenGetInfo(Db * db, char *token)
     tokenJson = DbJson(tokenRef);
     ret = Malloc(sizeof(RegTokenInfo));
 
-    if (!RegTokenInfoFromJson(tokenJson, ret, &errp))
-    {
-        Log(LOG_ERR, "RegTokenGetInfo(): Database decoding error: %s", errp);
-        RegTokenFree(ret);
-        return NULL;
-    }
-
     ret->db = db;
     ret->ref = tokenRef;
 
+    ret->owner =
+            StrDuplicate(JsonValueAsString(HashMapGet(tokenJson, "created_by")));
+    ret->name = StrDuplicate(token);
+
+    ret->expires =
+            JsonValueAsInteger(HashMapGet(tokenJson, "expires_on"));
+    ret->created =
+            JsonValueAsInteger(HashMapGet(tokenJson, "created_on"));
+
+    ret->uses =
+            JsonValueAsInteger(HashMapGet(tokenJson, "uses"));
+    ret->used =
+            JsonValueAsInteger(HashMapGet(tokenJson, "used"));
+
+    ret->grants =
+            UserDecodePrivileges(HashMapGet(tokenJson, "grants"));
+
     return ret;
 }
 
@@ -144,25 +154,19 @@ RegTokenFree(RegTokenInfo *tokeninfo)
 {
     if (tokeninfo)
     {
-        RegTokenInfoFree(tokeninfo);
+        Free(tokeninfo->name);
+        Free(tokeninfo->owner);
         Free(tokeninfo);
     }
 }
 int
 RegTokenClose(RegTokenInfo * tokeninfo)
 {
-    HashMap *json;
-
     if (!tokeninfo)
     {
         return 0;
     }
 
-    /* Write object to database. */
-    json = RegTokenInfoToJson(tokeninfo);
-    DbJsonSet(tokeninfo->ref, json); /* Copies json into internal structure. */
-    JsonFree(json);
-
     return DbUnlock(tokeninfo->db, tokeninfo->ref);
 }
 static int
@@ -195,11 +199,12 @@ RegTokenVerify(char *token)
 }
 
 RegTokenInfo *
-RegTokenCreate(Db * db, char *name, char *owner, uint64_t expires, int64_t uses, int privileges)
+RegTokenCreate(Db * db, char *name, char *owner, UInt64 expires, Int64 uses, int privileges)
 {
     RegTokenInfo *ret;
+    HashMap *tokenJson;
 
-    uint64_t timestamp = UtilTsMillis();
+    UInt64 timestamp = UtilServerTs();
 
     if (!db || !name)
     {
@@ -209,13 +214,13 @@ RegTokenCreate(Db * db, char *name, char *owner, uint64_t expires, int64_t uses,
     /* -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 (uses < -1)
+    if (Int64Lt(uses, Int64Neg(Int64Create(0, 1))))
     {
         return NULL;
     }
 
     /* Verify the token */
-    if (!RegTokenVerify(name) || ((expires > 0) && (expires < timestamp)))
+    if (!RegTokenVerify(name) || (UInt64Gt(expires, UInt64Create(0, 0)) && UInt64Lt(expires, timestamp)))
     {
         return NULL;
     }
@@ -230,12 +235,26 @@ RegTokenCreate(Db * db, char *name, char *owner, uint64_t expires, int64_t uses,
         return NULL;
     }
     ret->name = StrDuplicate(name);
-    ret->created_by = StrDuplicate(owner);
+    ret->owner = StrDuplicate(owner);
-    ret->used = 0;
+    ret->used = Int64Create(0, 0);
     ret->uses = uses;
-    ret->created_on = timestamp;
+    ret->created = timestamp;
-    ret->expires_on = expires;
+    ret->expires = expires;
-    ret->grants = UserEncodePrivileges(privileges);
+    ret->grants = privileges;
+
+    /* Write user info to database. */
+    tokenJson = DbJson(ret->ref);
+    HashMapSet(tokenJson, "created_by",
+               JsonValueString(ret->owner));
+    HashMapSet(tokenJson, "created_on",
+               JsonValueInteger(ret->created));
+    HashMapSet(tokenJson, "expires_on",
+               JsonValueInteger(ret->expires));
+    HashMapSet(tokenJson, "used",
+               JsonValueInteger(ret->used));
+    HashMapSet(tokenJson, "uses",
+               JsonValueInteger(ret->uses));
+    HashMapSet(tokenJson, "grants", UserEncodePrivileges(privileges));
 
     return ret;
 }

src/Room.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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
@@ -43,8 +42,6 @@ struct Room
 Room *
 RoomCreate(Db * db, RoomCreateRequest * req)
 {
-    (void) db;
-    (void) req;
     return NULL;
 }
 

src/Routes.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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
@@ -89,8 +88,6 @@ RouterBuild(void)
     R("/_telodendria/admin/v1/privileges", RoutePrivileges);
     R("/_telodendria/admin/v1/privileges/(.*)", RoutePrivileges);
     R("/_telodendria/admin/v1/deactivate/(.*)", RouteAdminDeactivate);
-    R("/_telodendria/admin/v1/tokens/(.*)", RouteAdminTokens);
-    R("/_telodendria/admin/v1/tokens", RouteAdminTokens);
 
 #undef R
 

src/Routes/RouteAdminDeactivate.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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
@@ -29,6 +28,7 @@
 #include <Cytoplasm/Str.h>
 
 #include <User.h>
+#include <Cytoplasm/Log.h>
 
 ROUTE_IMPL(RouteAdminDeactivate, path, argp)
 {

src/Routes/RouteAdminTokens.c

@@ -1,208 +0,0 @@
-/*
- * 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 <Routes.h>
-
-#include <Cytoplasm/Json.h>
-#include <Cytoplasm/HashMap.h>
-#include <Cytoplasm/Str.h>
-#include <Cytoplasm/Memory.h>
-
-#include <RegToken.h>
-#include <User.h>
-
-ROUTE_IMPL(RouteAdminTokens, path, argp)
-{
-    RouteArgs *args = argp;
-    HashMap *request = NULL;
-    HashMap *response = NULL;
-
-    char *token;
-    char *msg;
-
-    Db *db = args->matrixArgs->db;
-
-    User *user = NULL;
-
-    HttpRequestMethod method = HttpRequestMethodGet(args->context);
-
-    Array *tokensarray;
-    Array *tokens;
-
-    RegTokenInfo *info;
-
-    RegTokenInfo *req;
-
-    size_t i;
-
-    if (method != HTTP_GET && method != HTTP_POST && method != HTTP_DELETE)
-    {
-        msg = "Route only supports GET, POST, and DELETE";
-        HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-        return MatrixErrorCreate(M_UNRECOGNIZED, msg);
-    }
-    
-
-    response = MatrixGetAccessToken(args->context, &token);
-    if (response)
-    {
-        goto finish;
-    }
-
-    user = UserAuthenticate(db, token);
-    if (!user)
-    {
-        HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-        response = MatrixErrorCreate(M_UNKNOWN_TOKEN, NULL);
-        goto finish;
-    }
-
-    if (!(UserGetPrivileges(user) & USER_ISSUE_TOKENS))
-    {
-        msg = "User doesn't have the ISSUE_TOKENS privilege.";
-        HttpResponseStatus(args->context, HTTP_FORBIDDEN);
-        response = MatrixErrorCreate(M_FORBIDDEN, msg);
-        goto finish;
-    }
-
-    switch (method)
-    {
-        case HTTP_GET:
-            if (ArraySize(path) == 0)
-            {
-                tokensarray = ArrayCreate();
-                
-                /* Get all registration tokens */
-                tokens = DbList(db, 2, "tokens", "registration");
-
-                response = HashMapCreate();
-
-                for (i = 0; i < ArraySize(tokens); i++)
-                {
-                    char *tokenname = ArrayGet(tokens, i);
-                    HashMap *jsoninfo;
-
-                    info = RegTokenGetInfo(db, tokenname);
-                    jsoninfo = RegTokenInfoToJson(info);
-                    
-                    RegTokenClose(info);
-                    RegTokenFree(info);
-
-                    ArrayAdd(tokensarray, JsonValueObject(jsoninfo));
-                }
-
-                JsonSet(response, JsonValueArray(tokensarray), 1, "tokens");
-
-                DbListFree(tokens);
-                break;
-            }
-            
-            info = RegTokenGetInfo(db, ArrayGet(path, 0));
-            if (!info)
-            {
-                msg = "Token doesn't exist.";
-                HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-                response = MatrixErrorCreate(M_INVALID_PARAM, msg);
-                goto finish;
-            }
-
-            response = RegTokenInfoToJson(info);
-
-            RegTokenClose(info);
-            RegTokenFree(info);
-            break;
-        case HTTP_POST:
-            request = JsonDecode(HttpServerStream(args->context));
-            if (!request)
-            {
-                HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-                response = MatrixErrorCreate(M_NOT_JSON, NULL);
-                goto finish;
-            }
-
-            req = Malloc(sizeof(RegTokenInfo));
-            memset(req, 0, sizeof(RegTokenInfo));
-
-            if (!RegTokenInfoFromJson(request, req, &msg))
-            {
-                RegTokenInfoFree(req);
-                Free(req);
-
-                HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-                response = MatrixErrorCreate(M_BAD_JSON, msg);
-                goto finish;
-                
-            }
-
-            if (!req->name)
-            {
-                req->name = StrRandom(16);
-            }
-            
-            /* Create the actual token that will be stored. */
-            info = RegTokenCreate(db, req->name, UserGetName(user),
-                                  req->expires_on, req->uses,
-                                  UserDecodePrivileges(req->grants));
-            if (!info)
-            {
-                RegTokenClose(info);
-                RegTokenFree(info);
-                RegTokenInfoFree(req);
-                Free(req);
-                
-                HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-                msg = "Cannot create token.";
-                response = MatrixErrorCreate(M_INVALID_PARAM, msg);
-                goto finish;
-            }
-
-            response = RegTokenInfoToJson(info);
-
-            RegTokenClose(info);
-            RegTokenFree(info);
-            RegTokenInfoFree(req);
-            Free(req);
-            break;
-        case HTTP_DELETE:
-            if (ArraySize(path) == 0)
-            {
-                msg = "No registration token given to DELETE /tokens/[token].";
-                HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-                response = MatrixErrorCreate(M_INVALID_PARAM, msg);
-                goto finish;
-            }
-            info = RegTokenGetInfo(db, ArrayGet(path, 0));
-            RegTokenDelete(info);
-
-            response = HashMapCreate();
-            break;
-        default:
-            /* Should not be possible. */
-            break;
-    }
-finish: 
-    UserUnlock(user);
-    JsonFree(request);
-    return response;
-}

src/Routes/RouteAliasDirectory.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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
@@ -25,12 +24,8 @@
 
 #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)
@@ -42,40 +37,20 @@ ROUTE_IMPL(RouteAliasDirectory, path, argp)
     HashMap *response;
 
     Db *db = args->matrixArgs->db;
-    DbRef *ref = NULL;
+    DbRef *ref;
     HashMap *aliases;
-    HashMap *idObject;
     JsonValue *val;
-    Array *arr;
 
     char *token;
-    char *msg;
     User *user = NULL;
 
-    CommonID aliasID;
+    /* TODO: Return HTTP 400 M_INVALID_PARAM if alias is invalid */
-    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, msg);
+        response = MatrixErrorCreate(M_UNKNOWN, "Unable to access alias database.");
         goto finish;
     }
 
@@ -93,9 +68,8 @@ 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, msg);
+                response = MatrixErrorCreate(M_NOT_FOUND, "There is no mapped room ID for this room alias.");
             }
             break;
         case HTTP_PUT:
@@ -117,21 +91,9 @@ ROUTE_IMPL(RouteAliasDirectory, path, argp)
             if (HttpRequestMethodGet(args->context) == HTTP_PUT)
             {
                 HashMap *newAlias;
-                char *id;
-                char *serverPart;
 
-                serverPart = ParserRecomposeServerPart(aliasID.server);
+                /* TODO: Validate alias domain and make sure it matches
-                if (!StrEquals(serverPart, config.serverName))
+                 * server name and is well formed. */
-                {
-                    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))
                 {
@@ -148,81 +110,40 @@ ROUTE_IMPL(RouteAliasDirectory, path, argp)
                     goto finish;
                 }
 
-                id = JsonValueAsString(HashMapGet(request, "room_id"));
+                if (!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;
                 }
 
-                if (!ValidCommonID(id, '!'))
+                /* TODO: Validate room ID to make sure it is well
-                {
+                 * formed. */
-                    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", JsonValueString(id));
+                HashMapSet(newAlias, "id", JsonValueDuplicate(HashMapGet(request, "room_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
             {
-                HashMap *roomAlias;
+                if (!JsonGet(aliases, 2, "alias", alias))
-                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(roomAlias, 1, "createdBy"))))
+                if (!(UserGetPrivileges(user) & USER_ALIAS) && !StrEquals(UserGetName(user), JsonValueAsString(JsonGet(aliases, 3, "alias", alias, "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();
 
@@ -234,8 +155,6 @@ ROUTE_IMPL(RouteAliasDirectory, path, argp)
     }
 
 finish:
-    CommonIDFree(aliasID);
-    ConfigUnlock(&config);
     UserUnlock(user);
     DbUnlock(db, ref);
     JsonFree(request);

src/Routes/RouteCapabilities.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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

src/Routes/RouteChangePwd.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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
@@ -66,25 +65,21 @@ ROUTE_IMPL(RouteChangePwd, path, argp)
     char *token;
     char *newPassword;
 
-    char *msg;
+    Config *config = ConfigLock(db);
 
-    Config config;
+    if (!config)
-
-    ConfigLock(db, &config);
-    if (!config.ok)
     {
-        Log(LOG_ERR, "%s", config.err);
+        Log(LOG_ERR, "Password endpoint failed to lock configuration.");
         HttpResponseStatus(args->context, HTTP_INTERNAL_SERVER_ERROR);
-        return MatrixErrorCreate(M_UNKNOWN, config.err);
+        return MatrixErrorCreate(M_UNKNOWN, NULL);
     }
 
     (void) path;
 
     if (HttpRequestMethodGet(args->context) != HTTP_POST)
     {
-        msg = "Route only supports POST.";
         HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-        response = MatrixErrorCreate(M_UNRECOGNIZED, msg);
+        response = MatrixErrorCreate(M_UNRECOGNIZED, NULL);
         goto finish;
     }
 
@@ -123,10 +118,9 @@ ROUTE_IMPL(RouteChangePwd, path, argp)
     newPassword = JsonValueAsString(HashMapGet(request, "new_password"));
     if (!newPassword)
     {
-        msg = "'new_password' is unset or not a string.";
         JsonFree(request);
         HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-        response = MatrixErrorCreate(M_BAD_JSON, msg);
+        response = MatrixErrorCreate(M_BAD_JSON, NULL);
         goto finish;
     }
 
@@ -158,7 +152,7 @@ ROUTE_IMPL(RouteChangePwd, path, argp)
     response = HashMapCreate();
 
 finish:
-    ConfigUnlock(&config);
+    ConfigUnlock(config);
     UserUnlock(user);
     JsonFree(request);
     return response;

src/Routes/RouteConfig.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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
@@ -34,14 +33,12 @@ ROUTE_IMPL(RouteConfig, path, argp)
     RouteArgs *args = argp;
     HashMap *response;
     char *token;
-    char *msg;
 
     User *user = NULL;
-    Config config;
+    Config *config = NULL;
 
     HashMap *request = NULL;
-    Config newConf;
+    Config *newConf;
-    HashMap *newJson = NULL;
 
     (void) path;
 
@@ -61,25 +58,24 @@ ROUTE_IMPL(RouteConfig, path, argp)
 
     if (!(UserGetPrivileges(user) & USER_CONFIG))
     {
-        msg = "User does not have the 'CONFIG' privilege.";
         HttpResponseStatus(args->context, HTTP_FORBIDDEN);
-        response = MatrixErrorCreate(M_FORBIDDEN, msg);
+        response = MatrixErrorCreate(M_FORBIDDEN, NULL);
         goto finish;
     }
 
-    ConfigLock(args->matrixArgs->db, &config);
+    config = ConfigLock(args->matrixArgs->db);
-    if (!config.ok)
+    if (!config)
     {
-        Log(LOG_ERR, "%s", config.err);
+        Log(LOG_ERR, "Config endpoint failed to lock configuration.");
         HttpResponseStatus(args->context, HTTP_INTERNAL_SERVER_ERROR);
-        response = MatrixErrorCreate(M_UNKNOWN, config.err);
+        response = MatrixErrorCreate(M_UNKNOWN, NULL);
         goto finish;
     }
 
     switch (HttpRequestMethodGet(args->context))
     {
         case HTTP_GET:
-            response = JsonDuplicate(DbJson(config.ref));
+            response = JsonDuplicate(DbJson(config->ref));
             break;
         case HTTP_POST:
             request = JsonDecode(HttpServerStream(args->context));
@@ -90,10 +86,17 @@ ROUTE_IMPL(RouteConfig, path, argp)
                 break;
             }
 
-            ConfigParse(request, &newConf);
+            newConf = ConfigParse(request);
-            if (newConf.ok)
+            if (!newConf)
             {
-                if (DbJsonSet(config.ref, request))
+                HttpResponseStatus(args->context, HTTP_INTERNAL_SERVER_ERROR);
+                response = MatrixErrorCreate(M_UNKNOWN, NULL);
+                break;
+            }
+
+            if (newConf->ok)
+            {
+                if (DbJsonSet(config->ref, request))
                 {
                     response = HashMapCreate();
                     /*
@@ -104,71 +107,29 @@ ROUTE_IMPL(RouteConfig, path, argp)
                 }
                 else
                 {
-                    msg = "Internal server error while writing the config.";
                     HttpResponseStatus(args->context, HTTP_INTERNAL_SERVER_ERROR);
-                    response = MatrixErrorCreate(M_UNKNOWN, msg);
+                    response = MatrixErrorCreate(M_UNKNOWN, NULL);
                 }
             }
             else
             {
                 HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-                response = MatrixErrorCreate(M_BAD_JSON, newConf.err);
+                response = MatrixErrorCreate(M_BAD_JSON, newConf->err);
             }
 
-            ConfigFree(&newConf);
+            ConfigFree(newConf);
             JsonFree(request);
             break;
         case HTTP_PUT:
-            request = JsonDecode(HttpServerStream(args->context));
+            /* TODO: Support incremental changes to the config */
-            if (!request)
-            {
-                HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-                response = MatrixErrorCreate(M_NOT_JSON, NULL);
-                break;
-            }
-
-            newJson = JsonDuplicate(DbJson(config.ref));
-            JsonMerge(newJson, request);
-
-            ConfigParse(newJson, &newConf);
-
-            if (newConf.ok)
-            {
-                if (DbJsonSet(config.ref, newJson))
-                {
-                    response = HashMapCreate();
-                    /*
-                     * TODO: Apply configuration and set this only if a main
-                     * component was reconfigured, such as the listeners.
-                     */
-                    HashMapSet(response, "restart_required", JsonValueBoolean(1));
-                }
-                else
-                {
-                    msg = "Internal server error while writing the config.";
-                    HttpResponseStatus(args->context, HTTP_INTERNAL_SERVER_ERROR);
-                    response = MatrixErrorCreate(M_UNKNOWN, msg);
-                }
-            }
-            else
-            {
-                HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-                response = MatrixErrorCreate(M_BAD_JSON, newConf.err);
-            }
-
-            ConfigFree(&newConf);
-            JsonFree(request);
-            JsonFree(newJson);
-            break;
         default:
-            msg = "Unknown request method.";
             HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-            response = MatrixErrorCreate(M_UNRECOGNIZED, msg);
+            response = MatrixErrorCreate(M_UNRECOGNIZED, NULL);
             break;
     }
 
 finish:
     UserUnlock(user);
-    ConfigUnlock(&config);
+    ConfigUnlock(config);
     return response;
 }

src/Routes/RouteCreateRoom.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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
@@ -42,9 +41,8 @@ ROUTE_IMPL(RouteCreateRoom, path, argp)
 
     if (HttpRequestMethodGet(args->context) != HTTP_POST)
     {
-        err = "Unknown request method.";
         HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-        response = MatrixErrorCreate(M_UNRECOGNIZED, err);
+        response = MatrixErrorCreate(M_UNRECOGNIZED, "Unknown request method.");
         goto finish;
     }
 

src/Routes/RouteDeactivate.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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
@@ -46,27 +45,22 @@ ROUTE_IMPL(RouteDeactivate, path, argp)
 
     Db *db = args->matrixArgs->db;
     User *user = NULL;
-    Config config;
+    Config *config = ConfigLock(db);
-
-
-    char *msg;
 
     (void) path;
 
-    ConfigLock(db, &config);
+    if (!config)
-    if (!config.ok)
     {
-        Log(LOG_ERR, "%s", config.err);
+        Log(LOG_ERR, "Deactivate endpoint failed to lock configuration.");
         HttpResponseStatus(args->context, HTTP_INTERNAL_SERVER_ERROR);
-        response = MatrixErrorCreate(M_UNKNOWN, config.err);
+        response = MatrixErrorCreate(M_UNKNOWN, NULL);
         goto finish;
     }
 
     if (HttpRequestMethodGet(args->context) != HTTP_POST)
     {
-        msg = "Route only accepts POST.";
         HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-        response = MatrixErrorCreate(M_UNRECOGNIZED, msg);
+        response = MatrixErrorCreate(M_UNRECOGNIZED, NULL);
         goto finish;
     }
 
@@ -134,9 +128,8 @@ ROUTE_IMPL(RouteDeactivate, path, argp)
 
     if (!UserDeleteTokens(user, NULL) || !UserDeactivate(user, NULL, NULL))
     {
-        msg = "Internal server error: couldn't remove user properly.";
         HttpResponseStatus(args->context, HTTP_INTERNAL_SERVER_ERROR);
-        response = MatrixErrorCreate(M_UNKNOWN, msg);
+        response = MatrixErrorCreate(M_UNKNOWN, NULL);
         goto finish;
     }
 
@@ -151,6 +144,6 @@ ROUTE_IMPL(RouteDeactivate, path, argp)
 finish:
     JsonFree(request);
     UserUnlock(user);
-    ConfigUnlock(&config);
+    ConfigUnlock(config);
     return response;
 }

src/Routes/RouteFilter.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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
@@ -40,17 +39,16 @@ GetServerName(Db * db)
 {
     char *name;
 
-    Config config;
+    Config *config = ConfigLock(db);
 
-    ConfigLock(db, &config);
+    if (!config)
-    if (!config.ok)
     {
         return NULL;
     }
 
-    name = StrDuplicate(config.serverName);
+    name = StrDuplicate(config->serverName);
 
-    ConfigUnlock(&config);
+    ConfigUnlock(config);
 
     return name;
 }
@@ -64,15 +62,13 @@ ROUTE_IMPL(RouteFilter, path, argp)
     HashMap *response = NULL;
 
     User *user = NULL;
-    CommonID *id = NULL;
+    UserId *id = NULL;
     char *token = NULL;
 
     char *serverName = NULL;
 
     char *userParam = ArrayGet(path, 0);
 
-    char *msg;
-
     if (!userParam)
     {
         /* Should be impossible */
@@ -91,17 +87,15 @@ ROUTE_IMPL(RouteFilter, path, argp)
     id = UserIdParse(userParam, serverName);
     if (!id)
     {
-        msg = "Invalid user ID.";
         HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-        response = MatrixErrorCreate(M_INVALID_PARAM, msg);
+        response = MatrixErrorCreate(M_INVALID_PARAM, NULL);
         goto finish;
     }
 
-    if (!ParserServerNameEquals(id->server, serverName))
+    if (!StrEquals(id->server, serverName))
     {
-        msg = "Cannot use /filter for non-local users.";
         HttpResponseStatus(args->context, HTTP_UNAUTHORIZED);
-        response = MatrixErrorCreate(M_UNAUTHORIZED, msg);
+        response = MatrixErrorCreate(M_UNAUTHORIZED, NULL);
         goto finish;
     }
 
@@ -119,11 +113,10 @@ ROUTE_IMPL(RouteFilter, path, argp)
         goto finish;
     }
 
-    if (!StrEquals(id->local, UserGetName(user)))
+    if (!StrEquals(id->localpart, UserGetName(user)))
     {
-        msg = "Unauthorized to use /filter.";
         HttpResponseStatus(args->context, HTTP_UNAUTHORIZED);
-        response = MatrixErrorCreate(M_INVALID_PARAM, msg);
+        response = MatrixErrorCreate(M_INVALID_PARAM, NULL);
         goto finish;
     }
 
@@ -133,9 +126,8 @@ ROUTE_IMPL(RouteFilter, path, argp)
 
         if (!ref)
         {
-            msg = "The filter for this user was not found.";
             HttpResponseStatus(args->context, HTTP_NOT_FOUND);
-            response = MatrixErrorCreate(M_NOT_FOUND, msg);
+            response = MatrixErrorCreate(M_NOT_FOUND, NULL);
             goto finish;
         }
 
@@ -169,9 +161,8 @@ ROUTE_IMPL(RouteFilter, path, argp)
         filterId = StrRandom(12);
         if (!filterId)
         {
-            msg = "Couldn't generate random filter ID; this is unintended.";
             HttpResponseStatus(args->context, HTTP_INTERNAL_SERVER_ERROR);
-            response = MatrixErrorCreate(M_UNKNOWN, msg);
+            response = MatrixErrorCreate(M_UNKNOWN, NULL);
             goto finish;
         }
 
@@ -179,9 +170,8 @@ ROUTE_IMPL(RouteFilter, path, argp)
         if (!ref)
         {
             Free(filterId);
-            msg = "Couldn't write filter to the database, this is unintended.";
             HttpResponseStatus(args->context, HTTP_INTERNAL_SERVER_ERROR);
-            response = MatrixErrorCreate(M_UNKNOWN, msg);
+            response = MatrixErrorCreate(M_UNKNOWN, NULL);
             goto finish;
         }
 

src/Routes/RouteLogin.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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
@@ -26,8 +25,6 @@
 
 #include <string.h>
 
-#include <Schema/LoginRequest.h>
-
 #include <Cytoplasm/Json.h>
 #include <Cytoplasm/HashMap.h>
 #include <Cytoplasm/Str.h>
@@ -46,10 +43,13 @@ ROUTE_IMPL(RouteLogin, path, argp)
 
     HashMap *identifier;
 
-    LoginRequest loginRequest;
+    char *deviceId = NULL;
-    LoginRequestUserIdentifier userIdentifier;
+    char *initialDeviceDisplayName = NULL;
+    int refreshToken = 0;
 
-    CommonID *userId = NULL;
+    char *password;
+    char *type;
+    UserId *userId = NULL;
 
     Db *db = args->matrixArgs->db;
 
@@ -57,29 +57,17 @@ ROUTE_IMPL(RouteLogin, path, argp)
     UserLoginInfo *loginInfo;
     char *fullUsername;
 
-    char *type;
+    Config *config = ConfigLock(db);
-    char *initialDeviceDisplayName;
-    char *deviceId;
-    char *password;
-    int refreshToken;
 
-    char *msg;
+    if (!config)
-
-    Config config;
-
-    ConfigLock(db, &config);
-    if (!config.ok)
     {
-        Log(LOG_ERR, "%s", config.err);
+        Log(LOG_ERR, "Login endpoint failed to lock configuration.");
         HttpResponseStatus(args->context, HTTP_INTERNAL_SERVER_ERROR);
-        return MatrixErrorCreate(M_UNKNOWN, config.err);
+        return MatrixErrorCreate(M_UNKNOWN, NULL);
     }
 
     (void) path;
 
-    memset(&loginRequest, 0, sizeof(LoginRequest));
-    memset(&userIdentifier, 0, sizeof(LoginRequestUserIdentifier));
-
     switch (HttpRequestMethodGet(args->context))
     {
         case HTTP_GET:
@@ -100,27 +88,9 @@ ROUTE_IMPL(RouteLogin, path, argp)
                 break;
             }
 
-            if (!LoginRequestFromJson(request, &loginRequest, &msg))
+            val = HashMapGet(request, "type");
-            {
-                HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-                response = MatrixErrorCreate(M_BAD_JSON, msg);
-                break;
-            }
-
-            if (loginRequest.type != REQUEST_TYPE_PASSWORD)
-            {
-                msg = "Unsupported login type.";
-                HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-                response = MatrixErrorCreate(M_UNRECOGNIZED, msg);
-                break;
-            }
-
-            identifier = loginRequest.identifier;
-
-            val = HashMapGet(identifier, "type");
             if (!val)
             {
-                msg = "No login identifier type set.";
                 HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
                 response = MatrixErrorCreate(M_MISSING_PARAM, NULL);
                 break;
@@ -128,60 +98,152 @@ ROUTE_IMPL(RouteLogin, path, argp)
 
             if (JsonValueType(val) != JSON_STRING)
             {
-                msg = "Invalid login identifier type.";
                 HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-                response = MatrixErrorCreate(M_BAD_JSON, msg);
+                response = MatrixErrorCreate(M_BAD_JSON, NULL);
+                break;
+            }
+
+            type = JsonValueAsString(val);
+            if (!StrEquals(type, "m.login.password"))
+            {
+                HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
+                response = MatrixErrorCreate(M_UNRECOGNIZED, NULL);
+                break;
+            }
+
+            val = HashMapGet(request, "identifier");
+            if (!val)
+            {
+                HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
+                response = MatrixErrorCreate(M_MISSING_PARAM, NULL);
+                break;
+            }
+
+            if (JsonValueType(val) != JSON_OBJECT)
+            {
+                HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
+                response = MatrixErrorCreate(M_BAD_JSON, NULL);
+                break;
+            }
+
+            identifier = JsonValueAsObject(val);
+
+            val = HashMapGet(identifier, "type");
+            if (!val)
+            {
+                HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
+                response = MatrixErrorCreate(M_MISSING_PARAM, NULL);
+                break;
+            }
+
+            if (JsonValueType(val) != JSON_STRING)
+            {
+                HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
+                response = MatrixErrorCreate(M_BAD_JSON, NULL);
                 break;
             }
 
             type = JsonValueAsString(val);
             if (!StrEquals(type, "m.id.user"))
             {
-                msg = "Invalid login identifier type.";
                 HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-                response = MatrixErrorCreate(M_UNRECOGNIZED, msg);
+                response = MatrixErrorCreate(M_UNRECOGNIZED, NULL);
                 break;
             }
-            if (!LoginRequestUserIdentifierFromJson(identifier, 
+
-                                        &userIdentifier, &msg))
+            val = HashMapGet(identifier, "user");
+            if (!val)
             {
                 HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-                response = MatrixErrorCreate(M_BAD_JSON, msg);
+                response = MatrixErrorCreate(M_MISSING_PARAM, NULL);
                 break;
             }
 
+            if (JsonValueType(val) != JSON_STRING)
+            {
+                HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
+                response = MatrixErrorCreate(M_BAD_JSON, NULL);
+                break;
+            }
 
-            userId = UserIdParse(userIdentifier.user, config.serverName);
+            userId = UserIdParse(JsonValueAsString(val), config->serverName);
             if (!userId)
             {
-                msg = "Invalid user ID.";
                 HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-                response = MatrixErrorCreate(M_BAD_JSON, msg);
+                response = MatrixErrorCreate(M_BAD_JSON, NULL);
                 break;
             }
 
-            if (!ParserServerNameEquals(userId->server, config.serverName)
+            if (!StrEquals(userId->server, config->serverName)
-                || !UserExists(db, userId->local))
+                || !UserExists(db, userId->localpart))
             {
-                msg = "Unknown user ID.";
                 HttpResponseStatus(args->context, HTTP_FORBIDDEN);
-                response = MatrixErrorCreate(M_FORBIDDEN, msg);
+                response = MatrixErrorCreate(M_FORBIDDEN, NULL);
                 break;
             }
 
-            deviceId = loginRequest.device_id;
+            val = HashMapGet(request, "device_id");
+            if (val)
+            {
+                if (JsonValueType(val) != JSON_STRING)
+                {
+                    HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
+                    response = MatrixErrorCreate(M_BAD_JSON, NULL);
+                    break;
+                }
 
-            initialDeviceDisplayName =loginRequest.initial_device_display_name;
+                deviceId = JsonValueAsString(val);
-            password = loginRequest.password;
+            }
-            refreshToken = loginRequest.refresh_token;
 
-            user = UserLock(db, userId->local);
+            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);
+                    break;
+                }
+
+                initialDeviceDisplayName = JsonValueAsString(val);
+            }
+
+            val = HashMapGet(request, "password");
+            if (!val)
+            {
+                HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
+                response = MatrixErrorCreate(M_MISSING_PARAM, NULL);
+                break;
+            }
+
+            if (JsonValueType(val) != JSON_STRING)
+            {
+                HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
+                response = MatrixErrorCreate(M_BAD_JSON, NULL);
+                break;
+            }
+
+            password = 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);
+                    break;
+                }
+
+                refreshToken = JsonValueAsBoolean(val);
+            }
+
+            user = UserLock(db, userId->localpart);
 
             if (!user)
             {
-                msg = "Couldn't lock user.";
                 HttpResponseStatus(args->context, HTTP_FORBIDDEN);
-                response = MatrixErrorCreate(M_FORBIDDEN, msg);
+                response = MatrixErrorCreate(M_FORBIDDEN, NULL);
                 break;
             }
 
@@ -199,11 +261,10 @@ ROUTE_IMPL(RouteLogin, path, argp)
 
             if (!loginInfo)
             {
-                msg = "Invalid creditentials for user.";
                 UserUnlock(user);
 
                 HttpResponseStatus(args->context, HTTP_FORBIDDEN);
-                response = MatrixErrorCreate(M_FORBIDDEN, msg);
+                response = MatrixErrorCreate(M_FORBIDDEN, NULL);
                 break;
             }
 
@@ -223,13 +284,13 @@ ROUTE_IMPL(RouteLogin, path, argp)
             }
 
             fullUsername = StrConcat(4, "@", UserGetName(user), ":",
-                                     config.serverName);
+                                     config->serverName);
             HashMapSet(response, "user_id", JsonValueString(fullUsername));
             Free(fullUsername);
 
             HashMapSet(response, "well_known",
                        JsonValueObject(
-                                       MatrixClientWellKnown(config.baseUrl, config.identityServer)));
+                                       MatrixClientWellKnown(config->baseUrl, config->identityServer)));
 
             UserAccessTokenFree(loginInfo->accessToken);
             Free(loginInfo->refreshToken);
@@ -239,18 +300,14 @@ ROUTE_IMPL(RouteLogin, path, argp)
 
             break;
         default:
-            msg = "Route only accepts GET and POST.";
             HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-            response = MatrixErrorCreate(M_UNRECOGNIZED, msg);
+            response = MatrixErrorCreate(M_UNRECOGNIZED, NULL);
             break;
     }
 
     UserIdFree(userId);
     JsonFree(request);
-    ConfigUnlock(&config);
+    ConfigUnlock(config);
-
-    LoginRequestFree(&loginRequest);
-    LoginRequestUserIdentifierFree(&userIdentifier);
 
     return response;
 }

src/Routes/RouteLogout.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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
@@ -39,17 +38,14 @@ ROUTE_IMPL(RouteLogout, path, argp)
 
     char *tokenstr;
 
-    char *msg;
-
     Db *db = args->matrixArgs->db;
 
     User *user;
 
     if (HttpRequestMethodGet(args->context) != HTTP_POST)
     {
-        msg = "This route only accepts POST.";
         HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-        return MatrixErrorCreate(M_UNRECOGNIZED, msg);
+        return MatrixErrorCreate(M_UNRECOGNIZED, NULL);
     }
 
     response = MatrixGetAccessToken(args->context, &tokenstr);
@@ -88,9 +84,8 @@ ROUTE_IMPL(RouteLogout, path, argp)
     {
         if (!UserDeleteToken(user, tokenstr))
         {
-            msg = "Internal server error: couldn't delete token.";
             HttpResponseStatus(args->context, HTTP_INTERNAL_SERVER_ERROR);
-            response = MatrixErrorCreate(M_UNKNOWN, msg);
+            response = MatrixErrorCreate(M_UNKNOWN, NULL);
             goto finish;
         }
 

src/Routes/RoutePrivileges.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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
@@ -40,8 +39,6 @@ ROUTE_IMPL(RoutePrivileges, path, argp)
     JsonValue *val;
     int privileges;
 
-    char *msg;
-
     response = MatrixGetAccessToken(args->context, &token);
     if (response)
     {
@@ -58,9 +55,8 @@ ROUTE_IMPL(RoutePrivileges, path, argp)
 
     if (!(UserGetPrivileges(user) & USER_GRANT_PRIVILEGES))
     {
-        msg = "User doesn't have the GRANT_PRIVILEGES privilege";
         HttpResponseStatus(args->context, HTTP_FORBIDDEN);
-        response = MatrixErrorCreate(M_FORBIDDEN, msg);
+        response = MatrixErrorCreate(M_FORBIDDEN, NULL);
         goto finish;
     }
 
@@ -72,9 +68,8 @@ ROUTE_IMPL(RoutePrivileges, path, argp)
         user = UserLock(args->matrixArgs->db, ArrayGet(path, 0));
         if (!user)
         {
-            msg = "Unknown user.";
             HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-            response = MatrixErrorCreate(M_INVALID_PARAM, msg);
+            response = MatrixErrorCreate(M_INVALID_PARAM, NULL);
             goto finish;
         }
     }
@@ -95,24 +90,23 @@ ROUTE_IMPL(RoutePrivileges, path, argp)
             val = HashMapGet(request, "privileges");
             if (!val || JsonValueType(val) != JSON_ARRAY)
             {
-                msg = "'privileges' is unset or not an array.";
                 HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-                response = MatrixErrorCreate(M_BAD_JSON, msg);
+                response = MatrixErrorCreate(M_BAD_JSON, NULL);
                 break;
             }
 
             switch (HttpRequestMethodGet(args->context))
             {
                 case HTTP_POST:
-                    privileges = UserDecodePrivileges(JsonValueAsArray(val));
+                    privileges = UserDecodePrivileges(val);
                     break;
                 case HTTP_PUT:
                     privileges = UserGetPrivileges(user);
-                    privileges |= UserDecodePrivileges(JsonValueAsArray(val));
+                    privileges |= UserDecodePrivileges(val);
                     break;
                 case HTTP_DELETE:
                     privileges = UserGetPrivileges(user);
-                    privileges &= ~UserDecodePrivileges(JsonValueAsArray(val));
+                    privileges &= ~UserDecodePrivileges(val);
                     break;
                 default:
                     /* Impossible */
@@ -122,21 +116,19 @@ ROUTE_IMPL(RoutePrivileges, path, argp)
 
             if (!UserSetPrivileges(user, privileges))
             {
-                msg = "Internal server error: couldn't set privileges.";
                 HttpResponseStatus(args->context, HTTP_INTERNAL_SERVER_ERROR);
-                response = MatrixErrorCreate(M_UNKNOWN, msg);
+                response = MatrixErrorCreate(M_UNKNOWN, NULL);
                 break;
             }
 
             /* Fall through */
         case HTTP_GET:
             response = HashMapCreate();
-            HashMapSet(response, "privileges", JsonValueArray(UserEncodePrivileges(UserGetPrivileges(user))));
+            HashMapSet(response, "privileges", UserEncodePrivileges(UserGetPrivileges(user)));
             break;
         default:
-            msg = "Route only accepts POST, PUT, DELETE, and GET.";
             HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-            response = MatrixErrorCreate(M_UNRECOGNIZED, msg);
+            response = MatrixErrorCreate(M_UNRECOGNIZED, NULL);
             goto finish;
             break;
     }

src/Routes/RouteProcControl.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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
@@ -24,6 +23,7 @@
  */
 #include <Routes.h>
 
+#include <Cytoplasm/Int64.h>
 #include <User.h>
 #include <Cytoplasm/Memory.h>
 #include <Cytoplasm/Str.h>
@@ -37,7 +37,6 @@ ROUTE_IMPL(RouteProcControl, path, argp)
     char *op = ArrayGet(path, 0);
     HashMap *response;
     char *token;
-    char *msg;
     User *user = NULL;
 
     response = MatrixGetAccessToken(args->context, &token);
@@ -56,13 +55,11 @@ ROUTE_IMPL(RouteProcControl, path, argp)
 
     if (!(UserGetPrivileges(user) & USER_PROC_CONTROL))
     {
-        msg = "User doesn't have PROC_CONTROL privilege.";
         HttpResponseStatus(args->context, HTTP_FORBIDDEN);
-        response = MatrixErrorCreate(M_FORBIDDEN, msg);
+        response = MatrixErrorCreate(M_FORBIDDEN, NULL);
         goto finish;
     }
 
-    msg = "Unknown operation.";
     switch (HttpRequestMethodGet(args->context))
     {
         case HTTP_POST:
@@ -77,7 +74,7 @@ ROUTE_IMPL(RouteProcControl, path, argp)
             else
             {
                 HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-                response = MatrixErrorCreate(M_UNRECOGNIZED, msg);
+                response = MatrixErrorCreate(M_UNRECOGNIZED, NULL);
                 goto finish;
             }
             break;
@@ -85,23 +82,36 @@ 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(allocated));
+                HashMapSet(response, "memory_allocated", JsonValueInteger(a));
 
                 goto finish;
             }
             else
             {
                 HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-                response = MatrixErrorCreate(M_UNRECOGNIZED, msg);
+                response = MatrixErrorCreate(M_UNRECOGNIZED, NULL);
                 goto finish;
             }
         default:
             HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-            response = MatrixErrorCreate(M_UNRECOGNIZED, msg);
+            response = MatrixErrorCreate(M_UNRECOGNIZED, NULL);
             goto finish;
             break;
     }

src/Routes/RouteRefresh.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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
@@ -46,8 +45,6 @@ ROUTE_IMPL(RouteRefresh, path, argp)
     UserAccessToken *newAccessToken;
     char *deviceId;
 
-    char *msg;
-
     Db *db = args->matrixArgs->db;
 
     User *user = NULL;
@@ -58,9 +55,8 @@ ROUTE_IMPL(RouteRefresh, path, argp)
 
     if (HttpRequestMethodGet(args->context) != HTTP_POST)
     {
-        msg = "This route only accepts POST.";
         HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-        return MatrixErrorCreate(M_UNRECOGNIZED, msg);
+        return MatrixErrorCreate(M_UNRECOGNIZED, NULL);
     }
 
     request = JsonDecode(HttpServerStream(args->context));
@@ -73,9 +69,8 @@ ROUTE_IMPL(RouteRefresh, path, argp)
     val = HashMapGet(request, "refresh_token");
     if (!val || JsonValueType(val) != JSON_STRING)
     {
-        msg = "'refresh_token' is unset or not a string.";
         HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-        response = MatrixErrorCreate(M_BAD_JSON, msg);
+        response = MatrixErrorCreate(M_BAD_JSON, NULL);
         goto finish;
     }
 

src/Routes/RouteRegister.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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
@@ -31,8 +30,6 @@
 #include <Cytoplasm/Str.h>
 #include <Cytoplasm/Memory.h>
 
-#include <Schema/Registration.h>
-
 #include <User.h>
 #include <Uia.h>
 #include <RegToken.h>
@@ -58,36 +55,35 @@ ROUTE_IMPL(RouteRegister, path, argp)
     HashMap *request = NULL;
     HashMap *response = NULL;
 
-    RegistrationRequest regReq;
+    JsonValue *val;
 
     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;
 
     char *session;
     DbRef *sessionRef;
 
-    Config config;
+    Config *config = ConfigLock(db);
 
-    regReq.username = NULL;
+    if (!config)
-    regReq.password = NULL;
-    regReq.device_id = NULL;
-    regReq.initial_device_display_name = NULL;
-    regReq.refresh_token = 0;
-    regReq.inhibit_login = 0;
-
-    ConfigLock(db, &config);
-    if (!config.ok)
     {
-        Log(LOG_ERR, "%s", config.err);
+        Log(LOG_ERR, "Registration endpoint failed to lock configuration.");
         HttpResponseStatus(args->context, HTTP_INTERNAL_SERVER_ERROR);
-        return MatrixErrorCreate(M_UNKNOWN, config.err);
+        return MatrixErrorCreate(M_UNKNOWN, NULL);
     }
 
     if (ArraySize(path) == 0)
@@ -106,23 +102,26 @@ ROUTE_IMPL(RouteRegister, path, argp)
             response = MatrixErrorCreate(M_NOT_JSON, NULL);
             goto end;
         }
-        if (!RegistrationRequestFromJson(request, &regReq, &msg))
+
+        val = HashMapGet(request, "username");
+        if (val)
+        {
+            if (JsonValueType(val) != JSON_STRING)
             {
                 HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-            response = MatrixErrorCreate(M_NOT_JSON, msg);
+                response = MatrixErrorCreate(M_BAD_JSON, NULL);
-            goto end;
+                goto finish;
             }
+            username = StrDuplicate(JsonValueAsString(val));
 
-        if (regReq.username)
+            if (!UserValidate(username, config->serverName))
-        {
-            if (!UserValidate(regReq.username, config.serverName))
             {
                 HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
                 response = MatrixErrorCreate(M_INVALID_USERNAME, NULL);
                 goto finish;
             }
 
-            if (UserExists(db, regReq.username))
+            if (UserExists(db, username))
             {
                 HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
                 response = MatrixErrorCreate(M_USER_IN_USE, NULL);
@@ -133,7 +132,7 @@ ROUTE_IMPL(RouteRegister, path, argp)
         uiaFlows = ArrayCreate();
         ArrayAdd(uiaFlows, RouteRegisterRegFlow());
 
-        if (config.registration)
+        if (config->flags & CONFIG_REGISTRATION)
         {
             ArrayAdd(uiaFlows, UiaDummyFlow());
         }
@@ -159,44 +158,99 @@ 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, msg);
+            response = MatrixErrorCreate(M_INVALID_PARAM, NULL);
             goto finish;
         }
 
-        if (!regReq.password)
+        val = HashMapGet(request, "password");
+        if (!val)
         {
-            msg = "'password' field is unset";
             HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-            response = MatrixErrorCreate(M_MISSING_PARAM, msg);
+            response = MatrixErrorCreate(M_MISSING_PARAM, NULL);
             goto finish;
         }
 
-        /* All of the other fields are optional, we don't have to check 
+        if (JsonValueType(val) != JSON_STRING)
-         * them. */
+        {
+            HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
+            response = MatrixErrorCreate(M_BAD_JSON, NULL);
+            goto finish;
+        }
 
-        user = UserCreate(db, regReq.username, regReq.password);
+        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);
         response = HashMapCreate();
 
-        fullUsername = StrConcat(4, 
+        fullUsername = StrConcat(4, "@", UserGetName(user), ":", config->serverName);
-            "@", UserGetName(user), ":", config.serverName);
         HashMapSet(response, "user_id", JsonValueString(fullUsername));
         Free(fullUsername);
 
         HttpResponseStatus(args->context, HTTP_OK);
-        if (!regReq.inhibit_login)
+        if (!inhibitLogin)
         {
-            UserLoginInfo *loginInfo = UserLogin(user, regReq.password, 
+            UserLoginInfo *loginInfo = UserLogin(user, password, deviceId,
-                regReq.device_id, regReq.initial_device_display_name, 
+                              initialDeviceDisplayName, refreshToken);
-                regReq.refresh_token);
 
             HashMapSet(response, "access_token",
                      JsonValueString(loginInfo->accessToken->string));
             HashMapSet(response, "device_id",
                    JsonValueString(loginInfo->accessToken->deviceId));
 
-            if (regReq.refresh_token)
+            if (refreshToken)
             {
                 HashMapSet(response, "expires_in_ms",
                   JsonValueInteger(loginInfo->accessToken->lifetime));
@@ -222,7 +276,7 @@ ROUTE_IMPL(RouteRegister, path, argp)
 
                 if (info)
                 {
-                    UserSetPrivileges(user, UserDecodePrivileges(info->grants));
+                    UserSetPrivileges(user, info->grants);
                     RegTokenClose(info);
                     RegTokenFree(info);
                 }
@@ -240,7 +294,10 @@ ROUTE_IMPL(RouteRegister, path, argp)
         UserUnlock(user);
 finish:
         UiaFlowsFree(uiaFlows);
-        RegistrationRequestFree(&regReq);
+        Free(username);
+        Free(password);
+        Free(deviceId);
+        Free(initialDeviceDisplayName);
         JsonFree(request);
     }
     else
@@ -253,11 +310,10 @@ finish:
 
             if (!username)
             {
-                msg = "'username' path parameter is not set.";
                 HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-                response = MatrixErrorCreate(M_MISSING_PARAM, msg);
+                response = MatrixErrorCreate(M_MISSING_PARAM, NULL);
             }
-            else if (!UserValidate(username, config.serverName))
+            else if (!UserValidate(username, config->serverName))
             {
                 HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
                 response = MatrixErrorCreate(M_INVALID_USERNAME, NULL);
@@ -281,6 +337,6 @@ finish:
     }
 
 end:
-    ConfigUnlock(&config);
+    ConfigUnlock(config);
     return response;
 }

src/Routes/RouteRequestToken.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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
@@ -27,35 +26,19 @@
 #include <Cytoplasm/Str.h>
 #include <Cytoplasm/Json.h>
 
-#include <Schema/RequestToken.h>
-
 ROUTE_IMPL(RouteRequestToken, path, argp)
 {
     RouteArgs *args = argp;
     char *type = ArrayGet(path, 0);
     HashMap *request;
     HashMap *response;
-
+    JsonValue *val;
-    char *msg;
+    char *str;
-
-    RequestToken reqTok;
-
-    reqTok.client_secret = NULL;
-    reqTok.next_link = NULL;
-    reqTok.id_access_token = NULL;
-    reqTok.id_server = NULL;
-
-    reqTok.email = NULL;
-    reqTok.country = NULL;
-    reqTok.phone_number = NULL;
-
-    reqTok.send_attempt = -1;
 
     if (HttpRequestMethodGet(args->context) != HTTP_POST)
     {
-        msg = "This route only accepts POST.";
         HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-        return MatrixErrorCreate(M_UNRECOGNIZED, msg);
+        return MatrixErrorCreate(M_UNRECOGNIZED, NULL);
     }
 
     request = JsonDecode(HttpServerStream(args->context));
@@ -65,92 +48,87 @@ ROUTE_IMPL(RouteRequestToken, path, argp)
         return MatrixErrorCreate(M_NOT_JSON, NULL);
     }
 
-    if (!RequestTokenFromJson(request, &reqTok, &msg))
+    val = HashMapGet(request, "client_secret");
+    if (!val || JsonValueType(val) != JSON_STRING)
     {
         HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-        response = MatrixErrorCreate(M_BAD_JSON, msg);
+        response = MatrixErrorCreate(M_BAD_JSON, NULL);
         goto finish;
     }
 
-    if (!reqTok.client_secret)
+    str = JsonValueAsString(val);
+    if (strlen(str) > 255 || StrBlank(str))
     {
-        msg = "'client_secret' is not set";
         HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-        response = MatrixErrorCreate(M_BAD_JSON, msg);
+        response = MatrixErrorCreate(M_BAD_JSON, NULL);
         goto finish;
     }
 
-    if (strlen(reqTok.client_secret) > 255 || StrBlank(reqTok.client_secret))
+    val = HashMapGet(request, "send_attempt");
+    if (!val || JsonValueType(val) != JSON_INTEGER)
     {
-        msg = "'client_secret' is blank or too long";
         HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-        response = MatrixErrorCreate(M_BAD_JSON, msg);
+        response = MatrixErrorCreate(M_BAD_JSON, NULL);
         goto finish;
     }
 
-    if (reqTok.send_attempt == -1)
+    val = HashMapGet(request, "next_link");
+    if (val && JsonValueType(val) != JSON_STRING)
     {
-        msg = "Invalid or inexistent 'send_attempt'";
         HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-        response = MatrixErrorCreate(M_BAD_JSON, msg);
+        response = MatrixErrorCreate(M_BAD_JSON, NULL);
         goto finish;
     }
 
-    if (!reqTok.next_link)
+    val = HashMapGet(request, "id_access_token");
+    if (val && JsonValueType(val) != JSON_STRING)
     {
-        msg = "'next_link' is not set";
         HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-        response = MatrixErrorCreate(M_BAD_JSON, msg);
+        response = MatrixErrorCreate(M_BAD_JSON, NULL);
         goto finish;
     }
-    if (!reqTok.id_access_token)
+
+    val = HashMapGet(request, "id_server");
+    if (val && JsonValueType(val) != JSON_STRING)
     {
-        msg = "'id_access_token' is not set";
         HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-        response = MatrixErrorCreate(M_BAD_JSON, msg);
+        response = MatrixErrorCreate(M_BAD_JSON, NULL);
-        goto finish;
-    }
-    if (!reqTok.id_server)
-    {
-        msg = "'id_server' is not set";
-        HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-        response = MatrixErrorCreate(M_BAD_JSON, msg);
         goto finish;
     }
 
     if (StrEquals(type, "email"))
     {
-        if (!reqTok.email)
+        val = HashMapGet(request, "email");
+        if (val && JsonValueType(val) != JSON_STRING)
         {
-            msg = "Type is set to 'email' yet none was set";
             HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-            response = MatrixErrorCreate(M_BAD_JSON, msg);
+            response = MatrixErrorCreate(M_BAD_JSON, NULL);
             goto finish;
         }
     }
     else if (StrEquals(type, "msisdn"))
     {
-        if (!reqTok.country)
+        val = HashMapGet(request, "country");
+        if (val && JsonValueType(val) != JSON_STRING)
         {
-            msg = "Type is set to 'msisdn' yet no country is set";
             HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-            response = MatrixErrorCreate(M_BAD_JSON, msg);
+            response = MatrixErrorCreate(M_BAD_JSON, NULL);
             goto finish;
         }
 
-        if (strlen(reqTok.country) != 2)
+        str = JsonValueAsString(val);
+        if (strlen(str) != 2)
         {
-            msg = "Invalid country tag, length must be 2";
             HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-            response = MatrixErrorCreate(M_BAD_JSON, msg);
+            response = MatrixErrorCreate(M_BAD_JSON, NULL);
             goto finish;
         }
 
-        if (!reqTok.phone_number)
+        val = HashMapGet(request, "phone_number");
+        if (val && JsonValueType(val) != JSON_STRING)
         {
-            msg = "Type is set to 'msisdn' yet phone_number is unset";
             HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-            response = MatrixErrorCreate(M_BAD_JSON, msg);
+            response = MatrixErrorCreate(M_BAD_JSON, NULL);
             goto finish;
         }
     }
@@ -167,6 +145,5 @@ ROUTE_IMPL(RouteRequestToken, path, argp)
 
 finish:
     JsonFree(request);
-    RequestTokenFree(&reqTok);
     return response;
 }

src/Routes/RouteRoomAliases.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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
@@ -25,80 +24,21 @@
 
 #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;
 
-    User *user = NULL;
-
-    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);
-    UserUnlock(user);
+    JsonFree(request);
     return response;
 }

src/Routes/RouteStaticDefault.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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

src/Routes/RouteStaticLogin.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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

src/Routes/RouteStaticResources.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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

src/Routes/RouteTokenValid.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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
@@ -42,15 +41,13 @@ ROUTE_IMPL(RouteTokenValid, path, argp)
     RegTokenInfo *info = NULL;
 
     char *tokenstr;
-    char *msg;
 
     (void) path;
 
     if (HttpRequestMethodGet(args->context) != HTTP_GET)
     {
-        msg = "This route only accepts GET.";
         HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-        return MatrixErrorCreate(M_UNRECOGNIZED, msg);
+        return MatrixErrorCreate(M_UNRECOGNIZED, NULL);
     }
 
     request = JsonDecode(HttpServerStream(args->context));

src/Routes/RouteUiaFallback.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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
@@ -37,8 +36,6 @@ ROUTE_IMPL(RouteUiaFallback, path, argp)
     char *authType = ArrayGet(path, 0);
     char *sessionId;
 
-    char *msg;
-
     if (!authType)
     {
         /* This should never happen */
@@ -52,22 +49,22 @@ ROUTE_IMPL(RouteUiaFallback, path, argp)
         HashMap *request;
         HashMap *response;
         int uiaResult;
-        Config config;
+        Config *config;
         Array *flows;
         Array *flow;
 
-        ConfigLock(args->matrixArgs->db, &config);
+        config = ConfigLock(args->matrixArgs->db);
-        if (!config.ok)
+        if (!config)
         {
-            Log(LOG_ERR, "%s", config.err);
+            Log(LOG_ERR, "UIA fallback failed to lock configuration.");
             HttpResponseStatus(args->context, HTTP_INTERNAL_SERVER_ERROR);
-            return MatrixErrorCreate(M_UNKNOWN, config.err);
+            return MatrixErrorCreate(M_UNKNOWN, NULL);
         }
 
         request = JsonDecode(HttpServerStream(args->context));
         if (!request)
         {
-            ConfigUnlock(&config);
+            ConfigUnlock(config);
             HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
             return MatrixErrorCreate(M_NOT_JSON, NULL);
         }
@@ -91,22 +88,20 @@ ROUTE_IMPL(RouteUiaFallback, path, argp)
         }
 
         JsonFree(request);
-        ConfigUnlock(&config);
+        ConfigUnlock(config);
         return response;
     }
     else if (HttpRequestMethodGet(args->context) != HTTP_GET)
     {
-        msg = "Route only supports GET.";
         HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-        return MatrixErrorCreate(M_UNRECOGNIZED, msg);
+        return MatrixErrorCreate(M_UNRECOGNIZED, NULL);
     }
 
     sessionId = HashMapGet(requestParams, "session");
     if (!sessionId)
     {
-        msg = "'session' parameter is unset.";
         HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-        return MatrixErrorCreate(M_MISSING_PARAM, msg);
+        return MatrixErrorCreate(M_MISSING_PARAM, NULL);
     }
 
     HttpResponseHeader(args->context, "Content-Type", "text/html");

src/Routes/RouteUserDirectory.c

@@ -45,7 +45,7 @@ ROUTE_IMPL(RouteUserDirectory, path, argp)
 
     Db *db = args->matrixArgs->db;
 
-    Config config = { .ok = 0 };
+    Config *config = NULL;
 
     User *user = NULL;
 
@@ -60,7 +60,7 @@ ROUTE_IMPL(RouteUserDirectory, path, argp)
     (void) path;
 
     dirRequest.search_term = NULL;
-    dirRequest.limit = 10;
+    dirRequest.limit = Int64Create(0, 10);
 
 
     if (HttpRequestMethodGet(args->context) != HTTP_POST)
@@ -116,17 +116,19 @@ ROUTE_IMPL(RouteUserDirectory, path, argp)
      * local server. */
     users = DbList(db, 1, "users");
 
-    ConfigLock(db, &config);
+
-    if (!config.ok)
+    /* Offending line? */
+    config = ConfigLock(db);
+    if (!config)
     {
         Log(LOG_ERR, "Directory endpoint failed to lock configuration.");
         HttpResponseStatus(args->context, HTTP_INTERNAL_SERVER_ERROR);
-        response = MatrixErrorCreate(M_UNKNOWN, config.err);
+        response = MatrixErrorCreate(M_UNKNOWN, NULL);
 
         goto finish;
     }
 
-#define IncludedLtLimit ((int64_t) included < dirRequest.limit)
+#define IncludedLtLimit (Int64Lt(Int64Create(0, included), dirRequest.limit))
     for (i = 0, included = 0; i < ArraySize(users) && IncludedLtLimit; i++)
 #undef IncludedLtLimit
     {
@@ -168,7 +170,7 @@ ROUTE_IMPL(RouteUserDirectory, path, argp)
             }
             if (name)
             {
-                char *uID = StrConcat(4, "@", name, ":", config.serverName);
+                char *uID = StrConcat(4, "@", name, ":", config->serverName);
                 JsonSet(obj, JsonValueString(uID), 1, "user_id");
                 Free(uID);
             }
@@ -184,16 +186,14 @@ ROUTE_IMPL(RouteUserDirectory, path, argp)
         }
     }
     JsonSet(response, JsonValueArray(results), 1, "results");
-    JsonSet(response, 
+    JsonSet(response, JsonValueBoolean(Int64Eq(included, dirRequest.limit)),
-        JsonValueBoolean((int64_t) included == dirRequest.limit), 
+            1, "limited");
-        1, "limited"
-    );
 
 finish:
     UserUnlock(user);
     JsonFree(request);
     DbListFree(users);
-    ConfigUnlock(&config);
+    ConfigUnlock(config);
     UserDirectoryRequestFree(&dirRequest);
     return response;
 }

src/Routes/RouteUserProfile.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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
@@ -40,7 +39,7 @@ ROUTE_IMPL(RouteUserProfile, path, argp)
     HashMap *request = NULL;
     HashMap *response = NULL;
 
-    CommonID *userId = NULL;
+    UserId *userId = NULL;
     User *user = NULL;
 
     char *serverName;
@@ -49,37 +48,30 @@ ROUTE_IMPL(RouteUserProfile, path, argp)
     char *token = NULL;
     char *value = NULL;
 
-    char *msg;
+    Config *config = ConfigLock(db);
 
-    Config config;
+    if (!config)
-
-    ConfigLock(db, &config);
-
-    if (!config.ok)
     {
-        Log(LOG_ERR, "%s", config.err);
+        Log(LOG_ERR, "User profile endpoint failed to lock configuration.");
         HttpResponseStatus(args->context, HTTP_INTERNAL_SERVER_ERROR);
-        return MatrixErrorCreate(M_UNKNOWN, config.err);
+        return MatrixErrorCreate(M_UNKNOWN, NULL);
     }
 
-    serverName = config.serverName;
+    serverName = config->serverName;
 
     username = ArrayGet(path, 0);
     userId = UserIdParse(username, serverName);
     if (!userId)
     {
-        msg = "Invalid user ID.";
         HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-        response = MatrixErrorCreate(M_INVALID_PARAM, msg);
+        response = MatrixErrorCreate(M_INVALID_PARAM, NULL);
         goto finish;
     }
-    if (!ParserServerNameEquals(userId->server, serverName))
+    if (strcmp(userId->server, serverName))
     {
         /* TODO: Implement lookup over federation. */
-        msg =   "User profile endpoint currently doesn't support lookup over "
-                "federation.";
         HttpResponseStatus(args->context, HTTP_FORBIDDEN);
-        response = MatrixErrorCreate(M_FORBIDDEN, msg);
+        response = MatrixErrorCreate(M_FORBIDDEN, NULL);
         goto finish;
     }
 
@@ -87,12 +79,11 @@ ROUTE_IMPL(RouteUserProfile, path, argp)
     switch (HttpRequestMethodGet(args->context))
     {
         case HTTP_GET:
-            user = UserLock(db, userId->local);
+            user = UserLock(db, userId->localpart);
             if (!user)
             {
-                msg = "Couldn't lock user.";
                 HttpResponseStatus(args->context, HTTP_NOT_FOUND);
-                response = MatrixErrorCreate(M_NOT_FOUND, msg);
+                response = MatrixErrorCreate(M_NOT_FOUND, NULL);
                 goto finish;
             }
 
@@ -147,26 +138,24 @@ ROUTE_IMPL(RouteUserProfile, path, argp)
                     StrEquals(entry, "avatar_url"))
                 {
                     /* Check if user has privilege to do that action. */
-                    if (StrEquals(userId->local, UserGetName(user)))
+                    if (strcmp(userId->localpart, UserGetName(user)) == 0)
                     {
                         value = JsonValueAsString(HashMapGet(request, entry));
-                        /* TODO: Make UserSetProfile notify other parties of 
+                        /* TODO: Make UserSetProfile notify other
-                         * the change */
+                         * parties of the change */
                         UserSetProfile(user, entry, value);
                         response = HashMapCreate();
                         goto finish;
                     }
                     /* User is not allowed to carry-on the action */
-                    msg = "Cannot change another user's profile.";
                     HttpResponseStatus(args->context, HTTP_FORBIDDEN);
-                    response = MatrixErrorCreate(M_FORBIDDEN, msg);
+                    response = MatrixErrorCreate(M_FORBIDDEN, NULL);
                     goto finish;
                 }
                 else
                 {
-                    msg = "Invalid property being changed.";
                     HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-                    response = MatrixErrorCreate(M_UNRECOGNIZED, msg);
+                    response = MatrixErrorCreate(M_UNRECOGNIZED, NULL);
                     goto finish;
                 }
             }
@@ -177,14 +166,17 @@ ROUTE_IMPL(RouteUserProfile, path, argp)
                 goto finish;
             }
         default:
-            msg = "Route only accepts GET and PUT.";
             HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
-            response = MatrixErrorCreate(M_UNKNOWN, msg);
+            response = MatrixErrorCreate(M_UNKNOWN, NULL);
             break;
     }
 finish:
-    ConfigUnlock(&config);
+    ConfigUnlock(config);
 
+    /* Username is handled by the router, freeing it *will* cause issues
+     * (see #33). I honestly don't know how it didn't come to bite us sooner. 
+    Free(username); */
+    Free(entry);
     UserIdFree(userId);
     UserUnlock(user);
     JsonFree(request);

src/Routes/RouteVersions.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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
@@ -36,17 +35,7 @@ ROUTE_IMPL(RouteVersions, path, argp)
     (void) path;
     (void) argp;
 
-#define DECLARE_SPEC_VERSION(x) ArrayAdd(versions, JsonValueString(x))
+    ArrayAdd(versions, JsonValueString("v1.6"));
-    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");
-
-#undef DECLARE_SPEC_VERSION
 
     HashMapSet(response, "versions", JsonValueArray(versions));
     return response;

src/Routes/RouteWellKnown.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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
@@ -36,19 +35,18 @@ ROUTE_IMPL(RouteWellKnown, path, argp)
     RouteArgs *args = argp;
     HashMap *response;
 
-    Config config;
+    Config *config = ConfigLock(args->matrixArgs->db);
 
-    ConfigLock(args->matrixArgs->db, &config);
+    if (!config)
-    if (!config.ok)
     {
-        Log(LOG_ERR, "%s", config.err);
+        Log(LOG_ERR, "Well-known endpoint failed to lock configuration.");
         HttpResponseStatus(args->context, HTTP_INTERNAL_SERVER_ERROR);
-        return MatrixErrorCreate(M_UNKNOWN, config.err);
+        return MatrixErrorCreate(M_UNKNOWN, NULL);
     }
 
     if (StrEquals(ArrayGet(path, 0), "client"))
     {
-        response = MatrixClientWellKnown(config.baseUrl, config.identityServer);
+        response = MatrixClientWellKnown(config->baseUrl, config->identityServer);
     }
     else
     {
@@ -56,6 +54,6 @@ ROUTE_IMPL(RouteWellKnown, path, argp)
         response = MatrixErrorCreate(M_NOT_FOUND, NULL);
     }
 
-    ConfigUnlock(&config);
+    ConfigUnlock(config);
     return response;
 }

src/Routes/RouteWhoami.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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
@@ -44,15 +43,13 @@ ROUTE_IMPL(RouteWhoami, path, argp)
     char *userID;
     char *deviceID;
 
-    Config config;
+    Config *config = ConfigLock(db);
 
-    ConfigLock(db, &config);
+    if (!config)
-
-    if (!config.ok)
     {
-        Log(LOG_ERR, "%s", config.err);
+        Log(LOG_ERR, "Who am I endpoint failed to lock configuration.");
         HttpResponseStatus(args->context, HTTP_INTERNAL_SERVER_ERROR);
-        return MatrixErrorCreate(M_UNKNOWN, config.err);
+        return MatrixErrorCreate(M_UNKNOWN, NULL);
     }
 
     (void) path;
@@ -76,7 +73,7 @@ ROUTE_IMPL(RouteWhoami, path, argp)
 
     response = HashMapCreate();
 
-    userID = StrConcat(4, "@", UserGetName(user), ":", config.serverName);
+    userID = StrConcat(4, "@", UserGetName(user), ":", config->serverName);
     deviceID = StrDuplicate(UserGetDeviceId(user));
 
     UserUnlock(user);
@@ -88,6 +85,6 @@ ROUTE_IMPL(RouteWhoami, path, argp)
     Free(deviceID);
 
 finish:
-    ConfigUnlock(&config);
+    ConfigUnlock(config);
     return response;
 }

src/State.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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
@@ -34,14 +33,12 @@
 static HashMap *
 StateResolveV1(Array * states)
 {
-    (void) states;
     return NULL;
 }
 
 static HashMap *
 StateResolveV2(Array * states)
 {
-    (void) states;
     return NULL;
 }
 

src/Telodendria.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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
@@ -133,10 +132,10 @@ TelodendriaPrintHeader(void)
         Log(LOG_INFO, "%s", TelodendriaHeader[i]);
     }
 
-    Log(LOG_INFO, "Telodendria v" TELODENDRIA_VERSION " (Cytoplasm v%s)", CytoplasmGetVersionStr());
+    Log(LOG_INFO, "Telodendria v" TELODENDRIA_VERSION " (%s v%s)", CytoplasmGetName(), CytoplasmGetVersion());
     Log(LOG_INFO, "");
     Log(LOG_INFO,
-        "Copyright (C) 2024 Jordan Bancino <@jordan:bancino.net>");
+        "Copyright (C) 2023 Jordan Bancino <@jordan:bancino.net>");
     Log(LOG_INFO,
         "Documentation/Support: https://telodendria.io");
     Log(LOG_INFO, "");

src/Uia.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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
@@ -135,7 +134,7 @@ BuildResponse(Array * flows, Db * db, HashMap ** response, char *session, DbRef
 
         json = DbJson(ref);
         HashMapSet(json, "completed", JsonValueArray(ArrayCreate()));
-        HashMapSet(json, "last_access", JsonValueInteger(UtilTsMillis()));
+        HashMapSet(json, "last_access", JsonValueInteger(UtilServerTs()));
         DbUnlock(db, ref);
 
         HashMapSet(*response, "completed", JsonValueArray(ArrayCreate()));
@@ -206,7 +205,7 @@ UiaStageBuild(char *type, HashMap * params)
 
 int
 UiaComplete(Array * flows, HttpServerContext * context, Db * db,
-            HashMap * request, HashMap ** response, Config config)
+            HashMap * request, HashMap ** response, Config * config)
 {
     JsonValue *val;
     HashMap *auth;
@@ -223,8 +222,6 @@ UiaComplete(Array * flows, HttpServerContext * context, Db * db,
     HashMap *dbJson;
     int ret;
 
-    char *msg;
-
     if (!flows)
     {
         return -1;
@@ -245,9 +242,8 @@ UiaComplete(Array * flows, HttpServerContext * context, Db * db,
 
     if (JsonValueType(val) != JSON_OBJECT)
     {
-        msg = "'auth' is not an object.";
         HttpResponseStatus(context, HTTP_BAD_REQUEST);
-        *response = MatrixErrorCreate(M_BAD_JSON, msg);
+        *response = MatrixErrorCreate(M_BAD_JSON, NULL);
         return 0;
     }
 
@@ -256,9 +252,8 @@ UiaComplete(Array * flows, HttpServerContext * context, Db * db,
 
     if (!val || JsonValueType(val) != JSON_STRING)
     {
-        msg = "'auth->session' is unset or not a string.";
         HttpResponseStatus(context, HTTP_BAD_REQUEST);
-        *response = MatrixErrorCreate(M_BAD_JSON, msg);
+        *response = MatrixErrorCreate(M_BAD_JSON, NULL);
         return 0;
     }
 
@@ -316,9 +311,8 @@ UiaComplete(Array * flows, HttpServerContext * context, Db * db,
 
     if (!val || JsonValueType(val) != JSON_STRING)
     {
-        msg = "'auth->type' is unset or not a string.";
         HttpResponseStatus(context, HTTP_BAD_REQUEST);
-        *response = MatrixErrorCreate(M_BAD_JSON, msg);
+        *response = MatrixErrorCreate(M_BAD_JSON, NULL);
         ret = 0;
         goto finish;
     }
@@ -351,7 +345,7 @@ UiaComplete(Array * flows, HttpServerContext * context, Db * db,
         char *password = JsonValueAsString(HashMapGet(auth, "password"));
         HashMap *identifier = JsonValueAsObject(HashMapGet(auth, "identifier"));
         char *type;
-        CommonID *userId;
+        UserId *userId;
         User *user;
 
         if (!password || !identifier)
@@ -363,11 +357,10 @@ UiaComplete(Array * flows, HttpServerContext * context, Db * db,
 
         type = JsonValueAsString(HashMapGet(identifier, "type"));
         userId = UserIdParse(JsonValueAsString(HashMapGet(identifier, "user")),
-                             config.serverName);
+                             config->serverName);
 
         if (!type || !StrEquals(type, "m.id.user")
-         || !userId
+         || !userId || !StrEquals(userId->server, config->serverName))
-         || !ParserServerNameEquals(userId->server, config.serverName))
         {
             HttpResponseStatus(context, HTTP_UNAUTHORIZED);
             ret = BuildResponse(flows, db, response, session, dbRef);
@@ -375,7 +368,7 @@ UiaComplete(Array * flows, HttpServerContext * context, Db * db,
             goto finish;
         }
 
-        user = UserLock(db, userId->local);
+        user = UserLock(db, userId->localpart);
         if (!user)
         {
             HttpResponseStatus(context, HTTP_UNAUTHORIZED);
@@ -452,7 +445,7 @@ UiaComplete(Array * flows, HttpServerContext * context, Db * db,
 
 finish:
     ArrayFree(possibleNext);
-    JsonValueFree(HashMapSet(dbJson, "last_access", JsonValueInteger(UtilTsMillis())));
+    JsonValueFree(HashMapSet(dbJson, "last_access", JsonValueInteger(UtilServerTs())));
     DbUnlock(db, dbRef);
     return ret;
 }
@@ -498,7 +491,7 @@ UiaCleanup(MatrixHttpHandlerArgs * args)
         char *session = ArrayGet(sessions, i);
         DbRef *ref = DbLock(args->db, 2, "user_interactive", session);
 
-        uint64_t lastAccess;
+        UInt64 lastAccess;
 
         if (!ref)
         {
@@ -513,7 +506,7 @@ UiaCleanup(MatrixHttpHandlerArgs * args)
 
         /* If last access was greater than 15 minutes ago, remove this
          * session */
-        if ((UtilTsMillis() - lastAccess) > (1000 * 60 * 15))
+        if (UInt64Gt(UInt64Sub(UtilServerTs(), lastAccess), UInt64Create(0, 1000 * 60 * 15)))
         {
             DbDelete(args->db, 2, "user_interactive", session);
             Log(LOG_DEBUG, "Deleted session %s", session);

src/User.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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
@@ -28,8 +27,8 @@
 #include <Cytoplasm/Str.h>
 #include <Cytoplasm/Sha.h>
 #include <Cytoplasm/Json.h>
-
+#include <Cytoplasm/Int64.h>
-#include <Parser.h>
+#include <Cytoplasm/UInt64.h>
 
 #include <string.h>
 
@@ -42,7 +41,7 @@ struct User
     char *deviceId;
 };
 
-bool
+int
 UserValidate(char *localpart, char *domain)
 {
     size_t maxLen = 255 - strlen(domain) - 1;
@@ -54,23 +53,23 @@ UserValidate(char *localpart, char *domain)
 
         if (i > maxLen)
         {
-            return false;
+            return 0;
         }
 
         if (!((c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') ||
               (c == '.') || (c == '_') || (c == '=') || (c == '-') ||
               (c == '/')))
         {
-            return false;
+            return 0;
         }
 
         i++;
     }
 
-    return true;
+    return 1;
 }
 
-bool
+int
 UserHistoricalValidate(char *localpart, char *domain)
 {
     size_t maxLen = 255 - strlen(domain) - 1;
@@ -82,21 +81,21 @@ UserHistoricalValidate(char *localpart, char *domain)
 
         if (i > maxLen)
         {
-            return false;
+            return 0;
         }
 
         if (!((c >= 0x21 && c <= 0x39) || (c >= 0x3B && c <= 0x7E)))
         {
-            return false;
+            return 0;
         }
 
         i++;
     }
 
-    return true;
+    return 1;
 }
 
-bool
+int
 UserExists(Db * db, char *name)
 {
     return DbExists(db, 2, "users", name);
@@ -131,7 +130,7 @@ UserAuthenticate(Db * db, char *accessToken)
 
     char *userName;
     char *deviceId;
-    uint64_t expires;
+    UInt64 expires;
 
     if (!db || !accessToken)
     {
@@ -155,7 +154,8 @@ UserAuthenticate(Db * db, char *accessToken)
         return NULL;
     }
 
-    if (expires && UtilTsMillis() >= expires)
+    if (UInt64Neq(expires, UInt64Create(0, 0)) &&
+        UInt64Geq(UtilServerTs(), expires))
     {
         UserUnlock(user);
         DbUnlock(db, atRef);
@@ -168,14 +168,14 @@ UserAuthenticate(Db * db, char *accessToken)
     return user;
 }
 
-bool
+int
 UserUnlock(User * user)
 {
-    bool ret;
+    int ret;
 
     if (!user)
     {
-        return false;
+        return 0;
     }
 
     Free(user->name);
@@ -193,7 +193,7 @@ UserCreate(Db * db, char *name, char *password)
     User *user = NULL;
     HashMap *json = NULL;
 
-    uint64_t ts = UtilTsMillis();
+    UInt64 ts = UtilServerTs();
 
     /* TODO: Put some sort of password policy(like for example at least
      * 8 chars, or maybe check it's entropy)? */
@@ -230,7 +230,7 @@ UserCreate(Db * db, char *name, char *password)
 
     json = DbJson(user->ref);
     HashMapSet(json, "createdOn", JsonValueInteger(ts));
-    HashMapSet(json, "deactivated", JsonValueBoolean(false));
+    HashMapSet(json, "deactivated", JsonValueBoolean(0));
 
     return user;
 }
@@ -353,7 +353,7 @@ UserGetDeviceId(User * user)
     return user ? user->deviceId : NULL;
 }
 
-bool
+int
 UserCheckPassword(User * user, char *password)
 {
     HashMap *json;
@@ -365,11 +365,11 @@ UserCheckPassword(User * user, char *password)
     char *hashedPwd;
     char *tmp;
 
-    bool result;
+    int result;
 
     if (!user || !password)
     {
-        return false;
+        return 0;
     }
 
     json = DbJson(user->ref);
@@ -379,12 +379,12 @@ UserCheckPassword(User * user, char *password)
 
     if (!storedHash || !salt)
     {
-        return false;
+        return 0;
     }
 
     tmp = StrConcat(2, password, salt);
     hashBytes = Sha256(tmp);
-    hashedPwd = ShaToHex(hashBytes, HASH_SHA256);
+    hashedPwd = ShaToHex(hashBytes);
     Free(tmp);
     Free(hashBytes);
 
@@ -395,7 +395,7 @@ UserCheckPassword(User * user, char *password)
     return result;
 }
 
-bool
+int
 UserSetPassword(User * user, char *password)
 {
     HashMap *json;
@@ -407,7 +407,7 @@ UserSetPassword(User * user, char *password)
 
     if (!user || !password)
     {
-        return false;
+        return 0;
     }
 
     json = DbJson(user->ref);
@@ -415,7 +415,7 @@ UserSetPassword(User * user, char *password)
     salt = StrRandom(16);
     tmpstr = StrConcat(2, password, salt);
     hashBytes = Sha256(tmpstr);
-    hash = ShaToHex(hashBytes, HASH_SHA256);
+    hash = ShaToHex(hashBytes);
 
     JsonValueFree(HashMapSet(json, "salt", JsonValueString(salt)));
     JsonValueFree(HashMapSet(json, "password", JsonValueString(hash)));
@@ -425,10 +425,10 @@ UserSetPassword(User * user, char *password)
     Free(hashBytes);
     Free(tmpstr);
 
-    return true;
+    return 1;
 }
 
-bool
+int
 UserDeactivate(User * user, char * from, char * reason)
 {
     HashMap *json;
@@ -436,7 +436,7 @@ UserDeactivate(User * user, char * from, char * reason)
 
     if (!user)
     {
-        return false;
+        return 0;
     }
     
     /* By default, it's the target's username */
@@ -447,7 +447,7 @@ UserDeactivate(User * user, char * from, char * reason)
 
     json = DbJson(user->ref);
 
-    JsonValueFree(HashMapSet(json, "deactivated", JsonValueBoolean(true)));
+    JsonValueFree(HashMapSet(json, "deactivated", JsonValueBoolean(1)));
 
     val = JsonValueString(from);
     JsonValueFree(JsonSet(json, val, 2, "deactivate", "by"));
@@ -457,38 +457,38 @@ UserDeactivate(User * user, char * from, char * reason)
         JsonValueFree(JsonSet(json, val, 2, "deactivate", "reason"));
     }
 
-    return true;
+    return 1;
 
 }
 
-bool
+int
 UserReactivate(User * user)
 {
     HashMap *json;
 
     if (!user)
     {
-        return false;
+        return 0;
     }
 
     json = DbJson(user->ref);
 
 
-    JsonValueFree(HashMapSet(json, "deactivated", JsonValueBoolean(false)));
+    JsonValueFree(HashMapSet(json, "deactivated", JsonValueBoolean(0)));
     
     JsonValueFree(HashMapDelete(json, "deactivate"));
 
-    return true;
+    return 1;
 }
 
-bool
+int
 UserDeactivated(User * user)
 {
     HashMap *json;
 
     if (!user)
     {
-        return true;
+        return 1;
     }
 
     json = DbJson(user->ref);
@@ -534,17 +534,17 @@ UserAccessTokenGenerate(User * user, char *deviceId, int withRefresh)
 
     if (withRefresh)
     {
-        token->lifetime = 1000 * 60 * 60 * 24 * 7; /* 1 Week */
+        token->lifetime = Int64Create(0, 1000 * 60 * 60 * 24 * 7); /* 1 Week */
     }
     else
     {
-        token->lifetime = 0;
+        token->lifetime = Int64Create(0, 0);
     }
 
     return token;
 }
 
-bool
+int
 UserAccessTokenSave(Db * db, UserAccessToken * token)
 {
     DbRef *ref;
@@ -552,14 +552,14 @@ UserAccessTokenSave(Db * db, UserAccessToken * token)
 
     if (!token)
     {
-        return false;
+        return 0;
     }
 
     ref = DbCreate(db, 3, "tokens", "access", token->string);
 
     if (!ref)
     {
-        return false;
+        return 0;
     }
 
     json = DbJson(ref);
@@ -567,9 +567,9 @@ UserAccessTokenSave(Db * db, UserAccessToken * token)
     HashMapSet(json, "user", JsonValueString(token->user));
     HashMapSet(json, "device", JsonValueString(token->deviceId));
 
-    if (token->lifetime)
+    if (Int64Neq(token->lifetime, Int64Create(0, 0)))
     {
-        HashMapSet(json, "expires", JsonValueInteger(UtilTsMillis() + token->lifetime));
+        HashMapSet(json, "expires", JsonValueInteger(UInt64Add(UtilServerTs(), token->lifetime)));
     }
 
     return DbUnlock(db, ref);
@@ -589,7 +589,7 @@ UserAccessTokenFree(UserAccessToken * token)
     Free(token);
 }
 
-bool
+int
 UserDeleteToken(User * user, char *token)
 {
     char *username;
@@ -607,14 +607,14 @@ UserDeleteToken(User * user, char *token)
 
     if (!user || !token)
     {
-        return false;
+        return 0;
     }
 
     db = user->db;
     /* First check if the token even exists */
     if (!DbExists(db, 3, "tokens", "access", token))
     {
-        return false;
+        return 0;
     }
 
     /* If it does, get it's username. */
@@ -622,7 +622,7 @@ UserDeleteToken(User * user, char *token)
 
     if (!tokenRef)
     {
-        return false;
+        return 0;
     }
     tokenJson = DbJson(tokenRef);
     username = JsonValueAsString(HashMapGet(tokenJson, "user"));
@@ -632,7 +632,7 @@ UserDeleteToken(User * user, char *token)
     {
         /* Token does not match user, do not delete it */
         DbUnlock(db, tokenRef);
-        return false;
+        return 0;
     }
 
     userJson = DbJson(user->ref);
@@ -640,7 +640,7 @@ UserDeleteToken(User * user, char *token)
 
     if (!deviceObj)
     {
-        return false;
+        return 0;
     }
 
     /* Delete refresh token, if present */
@@ -654,17 +654,17 @@ UserDeleteToken(User * user, char *token)
     deletedVal = HashMapDelete(deviceObj, deviceId);
     if (!deletedVal)
     {
-        return false;
+        return 0;
     }
     JsonValueFree(deletedVal);
 
     /* Delete the access token. */
     if (!DbUnlock(db, tokenRef) || !DbDelete(db, 3, "tokens", "access", token))
     {
-        return false;
+        return 0;
     }
 
-    return true;
+    return 1;
 }
 
 char *
@@ -696,7 +696,7 @@ UserSetProfile(User * user, char *name, char *val)
     JsonValueFree(JsonSet(json, JsonValueString(val), 2, "profile", name));
 }
 
-bool
+int
 UserDeleteTokens(User * user, char *exempt)
 {
     HashMap *devices;
@@ -705,13 +705,13 @@ UserDeleteTokens(User * user, char *exempt)
 
     if (!user)
     {
-        return false;
+        return 0;
     }
 
     devices = JsonValueAsObject(HashMapGet(DbJson(user->ref), "devices"));
     if (!devices)
     {
-        return false;
+        return 0;
     }
 
     while (HashMapIterate(devices, &deviceId, (void **) &deviceObj))
@@ -738,7 +738,7 @@ UserDeleteTokens(User * user, char *exempt)
         JsonValueFree(HashMapDelete(devices, deviceId));
     }
 
-    return true;
+    return 1;
 }
 
 int
@@ -749,50 +749,54 @@ UserGetPrivileges(User * user)
         return USER_NONE;
     }
 
-    return UserDecodePrivileges(JsonValueAsArray(HashMapGet(DbJson(user->ref), "privileges")));
+    return UserDecodePrivileges(HashMapGet(DbJson(user->ref), "privileges"));
 }
 
-bool
+int
 UserSetPrivileges(User * user, int privileges)
 {
     JsonValue *val;
 
     if (!user)
     {
-        return false;
+        return 0;
     }
 
     if (!privileges)
     {
         JsonValueFree(HashMapDelete(DbJson(user->ref), "privileges"));
-        return true;
+        return 1;
     }
 
-    val = JsonValueArray(UserEncodePrivileges(privileges));
+    val = UserEncodePrivileges(privileges);
     if (!val)
     {
-        return false;
+        return 0;
     }
 
     JsonValueFree(HashMapSet(DbJson(user->ref), "privileges", val));
-    return true;
+    return 1;
 }
 
 int
-UserDecodePrivileges(Array * arr)
+UserDecodePrivileges(JsonValue * val)
 {
     int privileges = USER_NONE;
 
     size_t i;
+    Array *arr;
 
-    if (!arr)
+    if (!val)
     {
         goto finish;
     }
 
+    if (JsonValueType(val) == JSON_ARRAY)
+    {
+        arr = JsonValueAsArray(val);
         for (i = 0; i < ArraySize(arr); i++)
         {
-        JsonValue *val = ArrayGet(arr, i);
+            val = ArrayGet(arr, i);
             if (!val || JsonValueType(val) != JSON_STRING)
             {
                 continue;
@@ -800,6 +804,7 @@ UserDecodePrivileges(Array * arr)
 
             privileges |= UserDecodePrivilege(JsonValueAsString(val));
         }
+    }
 
 finish:
     return privileges;
@@ -846,7 +851,7 @@ UserDecodePrivilege(const char *p)
     }
 }
 
-Array *
+JsonValue *
 UserEncodePrivileges(int privileges)
 {
     Array *arr = ArrayCreate();
@@ -878,14 +883,13 @@ UserEncodePrivileges(int privileges)
 #undef A
 
 finish:
-    return arr;
+    return JsonValueArray(arr);
 }
 
-CommonID *
+UserId *
 UserIdParse(char *id, char *defaultServer)
 {
-    CommonID *userId;
+    UserId *userId;
-    char *server;
 
     if (!id)
     {
@@ -898,38 +902,48 @@ UserIdParse(char *id, char *defaultServer)
         return NULL;
     }
 
-    userId = Malloc(sizeof(CommonID));
+    userId = Malloc(sizeof(UserId));
     if (!userId)
     {
         goto finish;
     }
-    memset(userId, 0, sizeof(CommonID));
 
     /* Fully-qualified user ID */
     if (*id == '@')
     {
-        if (!ParseCommonID(id, userId) || !userId->server.hostname)
+        char *localStart = id + 1;
-        {
+        char *serverStart = localStart;
-            UserIdFree(userId);
 
+        while (*serverStart != ':' && *serverStart != '\0')
+        {
+            serverStart++;
+        }
+
+        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->local = StrDuplicate(id);
+        userId->localpart = StrDuplicate(id);
-        ParseServerPart(defaultServer, &userId->server);
+        userId->server = StrDuplicate(defaultServer);
     }
 
-    server = ParserRecomposeServerPart(userId->server);
+    if (!UserHistoricalValidate(userId->localpart, userId->server))
-    if (!UserHistoricalValidate(userId->local, server))
     {
         UserIdFree(userId);
         userId = NULL;
     }
-    Free(server);
 
 finish:
     Free(id);
@@ -937,11 +951,12 @@ finish:
 }
 
 void
-UserIdFree(CommonID * id)
+UserIdFree(UserId * id)
 {
     if (id)
     {
-        CommonIDFree(*id);
+        Free(id->localpart);
+        Free(id->server);
         Free(id);
     }
 }

src/include/CanonicalJson.h

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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

src/include/Config.h

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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
@@ -49,12 +48,68 @@
  * .Xr telodendria-config 7 .
  */
 
-#include <Schema/Config.h>
-
 #include <Cytoplasm/HashMap.h>
 #include <Cytoplasm/Array.h>
 #include <Cytoplasm/Db.h>
 
+/**
+ * Bit flags that can be set in the flags field of the configuration
+ * structure.
+ */
+typedef enum ConfigFlag
+{
+    CONFIG_FEDERATION = (1 << 0),
+    CONFIG_REGISTRATION = (1 << 1),
+    CONFIG_LOG_COLOR = (1 << 2),
+    CONFIG_LOG_FILE = (1 << 3),
+    CONFIG_LOG_STDOUT = (1 << 4),
+    CONFIG_LOG_SYSLOG = (1 << 5)
+} ConfigFlag;
+
+/**
+ * The configuration structure is not opaque like many of the other
+ * structures present in the other public APIs. This is intentional;
+ * defining functions for all of the fields would simply add too much
+ * unnecessary overhead.
+ */
+typedef struct Config
+{
+    /*
+     * These are used internally and should not be touched outside of
+     * the functions defined in this API.
+     */
+    Db *db;
+    DbRef *ref;
+
+    /*
+     * Whether or not the parsing was successful. If this boolean
+     * value is 0, then read the error message and assume that all
+     * other fields are invalid.
+     */
+    int ok;
+    char *err;
+
+    char *serverName;
+    char *baseUrl;
+    char *identityServer;
+
+    char *uid;
+    char *gid;
+
+    unsigned int flags;
+
+    size_t maxCache;
+
+    char *logTimestamp;
+    int logLevel;
+
+    /*
+     * An array of HttpServerConfig structures. Consult the HttpServer
+     * API.
+     */
+    Array *servers;
+} Config;
+
 /**
  * Parse a JSON object, extracting the necessary values, validating
  * them, and adding them to the configuration structure for use by the
@@ -65,7 +120,14 @@
  * set the ok flag to 0. The caller should always check the ok flag,
  * and if there is an error, it should display the error to the user.
  */
-extern void ConfigParse(HashMap *, Config *);
+extern Config * ConfigParse(HashMap *);
+
+/**
+ * Free all the values inside of the given configuration structure,
+ * as well as the structure itself, such that it is completely invalid
+ * when this function returns.
+ */
+extern void ConfigFree(Config *);
 
 /**
  * Check whether or not the configuration exists in the database,
@@ -88,7 +150,7 @@ extern int ConfigCreateDefault(Db *);
  * The return value of this function is the same as
  * .Fn ConfigParse .
  */
-extern void ConfigLock(Db *, Config *);
+extern Config * ConfigLock(Db *);
 
 /**
  * Unlock the specified configuration, returning it back to the
@@ -98,9 +160,4 @@ extern void ConfigLock(Db *, Config *);
  */
 extern int ConfigUnlock(Config *);
 
-/**
- * Converts a ConfigLogLevel into a valid syslog level.
- */
-extern int ConfigLogLevelToSyslog(ConfigLogLevel);
-
 #endif                             /* TELODENDRIA_CONFIG_H */

src/include/Event.h

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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

src/include/Filter.h

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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

src/include/Html.h

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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

src/include/Matrix.h

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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

src/include/Parser.h

@@ -1,108 +0,0 @@
-/*
- * 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 */

src/include/RegToken.h

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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
@@ -41,8 +40,56 @@
  */
 
 #include <Cytoplasm/Db.h>
+#include <Cytoplasm/Int64.h>
 
-#include <Schema/RegToken.h>
+/**
+ * This structure describes a registration token that is in the
+ * database.
+ */
+typedef struct RegTokenInfo
+{
+    Db *db;
+    DbRef *ref;
+
+    /*
+     * The token itself.
+     */
+    char *name;
+
+    /*
+     * Who created this token. Note that this can be NULL if the
+     * token was created by Telodendria itself.
+     */
+    char *owner;
+
+    /*
+     * How many times the token was used.
+     */
+    Int64 used;
+
+    /*
+     * How many uses are allowed.
+     */
+    Int64 uses;
+
+    /*
+     * Timestamp when this token was created.
+     */
+    UInt64 created;
+
+    /*
+     * Timestamp when this token expires, or 0 if it does not
+     * expire.
+     */
+    UInt64 expires;
+
+    /*
+     * A bit field describing the privileges this token grants. See
+     * the User API documentation for the privileges supported.
+     */
+    int grants;
+
+} RegTokenInfo;
 
 /**
  * ``Use'' the specified registration token by increasing the used
@@ -77,7 +124,7 @@ extern RegTokenInfo * RegTokenGetInfo(Db *, char *);
  * structure will be returned. Otherwise, NULL will be returned.
  */
 extern RegTokenInfo *
-RegTokenCreate(Db *, char *, char *, uint64_t, int64_t, int);
+RegTokenCreate(Db *, char *, char *, UInt64, Int64, int);
 
 /**
  * Free the memory associated with the registration token. This should
@@ -85,6 +132,7 @@ RegTokenCreate(Db *, char *, char *, uint64_t, int64_t, int);
  * .Fn RegTokenClose .
  */
 extern void RegTokenFree(RegTokenInfo *);
+
 /**
  * Return a boolean value indicating whether or not the specified token
  * is valid. A registration token is only valid if it has not expired

src/include/Room.h

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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

src/include/Routes.h

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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
@@ -107,8 +106,6 @@ ROUTE(RouteRoomAliases);
 
 ROUTE(RouteAdminDeactivate);
 
-ROUTE(RouteAdminTokens);
-
 #undef ROUTE
 
 #endif

src/include/State.h

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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

src/include/Telodendria.h

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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

src/include/Uia.h

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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
@@ -133,7 +132,7 @@ extern void UiaCleanup(MatrixHttpHandlerArgs *);
  * the caller proceed with its logic.
  */
 extern int
- UiaComplete(Array *, HttpServerContext *, Db *, HashMap *, HashMap **, Config);
+ UiaComplete(Array *, HttpServerContext *, Db *, HashMap *, HashMap **, Config *);
 
 /**
  * Free an array of flows, as described above. Even though the caller

src/include/User.h

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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
@@ -39,13 +38,10 @@
  * 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.
  */
@@ -78,7 +74,7 @@ typedef struct UserAccessToken
     char *user;
     char *string;
     char *deviceId;
-    uint64_t lifetime;
+    Int64 lifetime;
 } UserAccessToken;
 
 /**
@@ -91,6 +87,15 @@ 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
@@ -99,7 +104,7 @@ typedef struct UserLoginInfo
  * the local part is allowed to be. This function is used to ensure
  * that client-provided Matrix IDs are valid on this server.
  */
-extern bool UserValidate(char *, char *);
+extern int UserValidate(char *, char *);
 
 /**
  * This function behaves just like
@@ -110,13 +115,13 @@ extern bool UserValidate(char *, char *);
  * spec compliant but remain in use since before the new restrictions
  * were put in place.
  */
-extern bool UserHistoricalValidate(char *, char *);
+extern int UserHistoricalValidate(char *, char *);
 
 /**
  * Determine whether the user identified by the specified localpart
  * exists in the database.
  */
-extern bool UserExists(Db *, char *);
+extern int UserExists(Db *, char *);
 
 /**
  * Create a new user with the specified localpart and password, in
@@ -147,7 +152,7 @@ extern User * UserAuthenticate(Db *, char *);
  * .Fn DbUnlock
  * under the hood.
  */
-extern bool UserUnlock(User *);
+extern int UserUnlock(User *);
 
 /**
  * Log in a user. This function takes the user's password, desired
@@ -180,13 +185,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 bool UserCheckPassword(User *, char *);
+extern int UserCheckPassword(User *, char *);
 
 /**
  * Reset the given user's password by hashing a plain text password and
  * storing it in the database.
  */
-extern bool UserSetPassword(User *, char *);
+extern int UserSetPassword(User *, char *);
 
 /**
  * Immediately deactivate the given user account such that it can no
@@ -199,21 +204,21 @@ extern bool UserSetPassword(User *, char *);
  * responsible for deactivating the target user is NULL, then it is 
  * set to the target's own name.
  */
-extern bool UserDeactivate(User *, char *, char *);
+extern int 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 bool UserReactivate(User *);
+extern int UserReactivate(User *);
 
 /**
  * Return a boolean value indicating whether or not the user was
  * deactivated using
  * .Fn UserDeactivate .
  */
-extern bool UserDeactivated(User *);
+extern int UserDeactivated(User *);
 
 /**
  * Fetches the devices that belong to the user, in JSON format,
@@ -234,7 +239,7 @@ extern UserAccessToken * UserAccessTokenGenerate(User *, char *, int);
  * Write the specified access token to the database, returning a
  * boolean value indicating success.
  */
-extern bool UserAccessTokenSave(Db *, UserAccessToken *);
+extern int UserAccessTokenSave(Db *, UserAccessToken *);
 
 /**
  * Free the memory associated with the given access token.
@@ -244,7 +249,7 @@ extern void UserAccessTokenFree(UserAccessToken *);
 /**
  * Delete a specific access token by name.
  */
-extern bool UserDeleteToken(User *, char *);
+extern int UserDeleteToken(User *, char *);
 
 /**
  * Get a string property from the user's profile given the specified
@@ -263,7 +268,7 @@ extern void UserSetProfile(User *, char *, char *);
  * except for the one provided by name, unless NULL is provided for
  * the name.
  */
-extern bool UserDeleteTokens(User *, char *);
+extern int UserDeleteTokens(User *, char *);
 
 /**
  * Get the current privileges of the user as a packed bit field. Use
@@ -275,19 +280,19 @@ extern int UserGetPrivileges(User *);
 /**
  * Set the privileges of the user.
  */
-extern bool UserSetPrivileges(User *, int);
+extern int UserSetPrivileges(User *, int);
 
 /**
  * Decode the JSON that represents the user privileges into a packed
  * bit field for simple manipulation.
  */
-extern int UserDecodePrivileges(Array *);
+extern int UserDecodePrivileges(JsonValue *);
 
 /**
  * Encode the packed bit field that represents user privileges as a
  * JSON value.
  */
-extern Array *UserEncodePrivileges(int);
+extern JsonValue *UserEncodePrivileges(int);
 
 /**
  * Convert a string privilege into its bit in the bit field. This is
@@ -297,15 +302,15 @@ extern Array *UserEncodePrivileges(int);
 extern int UserDecodePrivilege(const char *);
 
 /**
- * Parse either a localpart or a fully qualified Matrix common ID. If the
+ * Parse either a localpart or a fully qualified Matrix ID. If the
  * first argument is a localpart, then the second argument is used as
  * the server name.
  */
-extern CommonID * UserIdParse(char *, char *);
+extern UserId * UserIdParse(char *, char *);
 
 /**
- * Frees the user's common ID and the memory allocated for it.
+ * Free the memory associated with the parsed Matrix ID.
  */
-extern void UserIdFree(CommonID *);
+extern void UserIdFree(UserId *);
 
 #endif                             /* TELODENDRIA_USER_H */

tools/bin/tt

@@ -1,61 +0,0 @@
-#!/usr/bin/env sh
-
-BASE="http://localhost:8008"
-USERNAME="tt_user"
-PASSWORD=$(json -e 'p@s$w0rd')
-
-ENDPOINT="$1"
-
-: "${METH:=GET}"
-
-register_payload() {
-    printf '{'
-    printf '  "auth": {'
-    printf '    "type": "m.login.dummy",'
-    printf '    "session": %s' "$(json -e "$1")"
-    printf '  },'
-    printf '  "username": %s,' "$(json -e "$USERNAME")"
-    printf '  "password": %s,' "$PASSWORD"
-    printf '  "inhibit_login": true '
-    printf '}'
-}
-
-login_payload() {
-    printf '{'
-    printf '  "identifier": {'
-    printf '    "type": "m.id.user",'
-    printf '    "user": %s' "$(json -e "$USERNAME")"
-    printf '  },'
-    printf '  "type": "m.login.password",'
-    printf '  "password": %s' "$PASSWORD"
-    printf '}'
-}
-
-# Check if user is available. If it is, register it.
-user_available=$(http "$BASE/_matrix/client/v3/register/available?username=$USERNAME" | json -s "available")
-if [ "$user_available" = "true" ]; then
-    session=$(http -X POST -d '{}' "$BASE/_matrix/client/v3/register" | json -s "session->@decode")
-    register_payload "$session" | http -X POST -d @- "$BASE/_matrix/client/v3/register" > /dev/null
-fi
-
-# Log in
-RESPONSE=$(login_payload | http -X POST -d @- "$BASE/_matrix/client/v3/login")
-
-ACCESS_TOKEN=$(echo "$RESPONSE" | json -s "access_token->@decode")
-
-if [ -z "$ACCESS_TOKEN" ]; then
-    echo "Failed to log in."
-    echo "$RESPONSE" | json
-    exit 1
-fi
-
-# Make request
-if [ -n "$DATA" ]; then
-    http -X "$METH" -d "$DATA" -H "Authorization: Bearer $ACCESS_TOKEN" "${BASE}${ENDPOINT}" | json
-else
-    http -X "$METH" -H "Authorization: Bearer $ACCESS_TOKEN" "${BASE}${ENDPOINT}" | json
-fi
-
-# Log out
-http -X POST -H "Authorization: Bearer $ACCESS_TOKEN" \
-    "$BASE/_matrix/client/v3/logout/all" > /dev/null

tools/src/http-debug-server.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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

tools/src/json.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Jordan Bancino <@jordan:bancino.net> with
+ * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net>
- * 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
@@ -64,23 +63,47 @@ query(char *select, HashMap * json, int canonical)
         int expectArr = 0;
         int func = 0;
 
-        expectArr = (sscanf(key, "%127[^[][%zu]", keyName, &arrInd) == 2);
+        expectArr = (sscanf(key, "%127[^[][%lu]", keyName, &arrInd) == 2);
 
         if (keyName[0] == '@')
         {
             if (StrEquals(keyName + 1, "length"))
             {
-                uint64_t len;
+                UInt64 len;
 
                 switch (JsonValueType(val))
                 {
                     case JSON_ARRAY:
-                        len = ArraySize(JsonValueAsArray(val));
+                        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)));
+                        }
+
                         val = JsonValueInteger(len);
                         ArrayAdd(cleanUp, val);
                         break;
                     case JSON_STRING:
-                        len = strlen(JsonValueAsString(val));
+                        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)));
+                        }
+
                         val = JsonValueInteger(len);
                         ArrayAdd(cleanUp, val);
                         break;
@@ -130,7 +153,7 @@ query(char *select, HashMap * json, int canonical)
             {
                 size_t i;
 
-                if (sscanf(keyName + 1, "%zu", &i) == 1)
+                if (sscanf(keyName + 1, "%lu", &i) == 1)
                 {
                     JsonValueFree(ArrayDelete(JsonValueAsArray(val), i));
                 }