test(ai): align parse_response tests with chat completions API

The chat-completions refactor removed the legacy Perplexity "text" extraction but left two tests asserting the old behavior, breaking make check on every CI flavor: - test_ai_parse_response_perplexity_text expected the legacy /v1/agent nested format to parse; it now yields NULL — renamed to test_ai_parse_response_legacy_text_format_unsupported. - test_ai_parse_response_text_preferred_over_content expected "text" to win; "content" is authoritative now — renamed to test_ai_parse_response_content_preferred_over_text. Add test_ai_set_provider_setting_reserved_key covering the new reserved-key rejection.
fix(ai): harden custom settings payload against invalid JSON and races
2026-07-04 13:59:19 +03:00 · 2026-07-04 13:59:19 +03:00
24 changed files with 72 additions and 332 deletions
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -1,44 +0,0 @@
-name: Publish Docker image
-
-on:
-  push:
-    branches: [master]
-  release:
-    types: [published]
-
-jobs:
-  push_to_registry:
-    name: Push Docker image to Docker Hub
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v7
-
-      - name: Log in to Docker Hub
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051
-        with:
-          images: cproofdev/cproof
-          tags: |
-            type=raw,value=dev,enable={{is_default_branch}}
-            type=sha,prefix=nightly-,enable={{is_default_branch}}
-            type=ref,event=tag
-            type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/') }}
-
-      - name: Build and push Docker image
-        id: push
-        uses: docker/build-push-action@2bd26e71295ee32cbf6a73510d165bf7232460f3
-        with:
-          context: .
-          file: ./ci/Dockerfile
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -1,106 +0,0 @@
-# =============================================================================
-# Stage 1: Build
-# =============================================================================
-FROM ubuntu:26.04 AS builder
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    build-essential \
-    autoconf \
-    automake \
-    autoconf-archive \
-    ca-certificates \
-    libtool \
-    pkg-config \
-    git \
-    wget \
-    libglib2.0-dev \
-    libcurl4-openssl-dev \
-    libsqlite3-dev \
-    libncurses-dev \
-    libreadline-dev \
-    libnotify-dev \
-    python3-dev \
-    python3 \
-    libgpgme-dev \
-    libotr5-dev \
-    libgtk-3-dev \
-    libgdk-pixbuf-2.0-dev \
-    libsignal-protocol-c-dev \
-    libgcrypt20-dev \
-    libqrencode-dev \
-    libxss-dev \
-    libcmocka-dev \
-    && rm -rf /var/lib/apt/lists/*
-
-# Build libstrophe from source (not available as Ubuntu package)
-RUN git clone --depth 1 https://git.jabber.space/devs/libstrophe-gh-mirror.git /tmp/libstrophe \
-    && cd /tmp/libstrophe \
-    && autoreconf -i \
-    && ./configure --prefix=/usr \
-    && make -j$(nproc) \
-    && make install \
-    && rm -rf /tmp/libstrophe
-
-WORKDIR /src
-
-COPY . .
-
-RUN ./bootstrap.sh \
-    && ./configure \
-        --enable-notifications \
-        --enable-icons-and-clipboard \
-        --enable-otr \
-        --enable-pgp \
-        --enable-omemo \
-        --enable-plugins \
-        --enable-c-plugins \
-        --enable-python-plugins \
-        --with-xscreensaver \
-        --enable-omemo-qrcode \
-        --enable-gdk-pixbuf \
-    && make -j$(nproc) \
-    && make install
-
-# =============================================================================
-# Stage 2: Runtime (minimal)
-# =============================================================================
-FROM ubuntu:26.04
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    ca-certificates \
-    libglib2.0-0t64 \
-    libcurl4t64 \
-    libsqlite3-0 \
-    libncursesw6 \
-    libreadline8t64 \
-    libnotify4 \
-    python3 \
-    libpython3.14 \
-    libgpgme45 \
-    libotr5t64 \
-    libgtk-3-0t64 \
-    libgdk-pixbuf-2.0-0 \
-    libsignal-protocol-c2.3.2 \
-    libgcrypt20 \
-    libqrencode4 \
-    libxss1 \
-    && rm -rf /var/lib/apt/lists/* \
-    && apt-get clean
-
-COPY --from=builder /usr/local/bin/profanity /usr/local/bin/profanity
-COPY --from=builder /usr/local/lib/libprofanity* /usr/local/lib/
-COPY --from=builder /usr/local/include/profapi.h /usr/local/include/
-COPY --from=builder /usr/local/share/profanity /usr/local/share/profanity
-COPY --from=builder /usr/lib/libstrophe.so* /usr/lib/
-
-RUN ldconfig
-
-RUN ldd /usr/local/bin/profanity | grep 'not found' && exit 1 || true
-
-RUN mkdir -p /root/.config/profanity
-
-ENTRYPOINT ["profanity"]
--- a/src/ai/ai_client.h
+++ b/src/ai/ai_client.h
@@ -17,15 +17,15 @@ typedef struct ai_message_t
 */
 typedef struct ai_provider_t
 {
-    gchar* name;                   /* Provider name (e.g., "openai", "perplexity") */
-    gchar* api_url;                /* API endpoint URL */
-    gchar* project_id;             /* Optional project ID (for some providers) */
-    gchar* default_model;          /* Default model for this provider */
+    gchar* name;           /* Provider name (e.g., "openai", "perplexity") */
+    gchar* api_url;        /* API endpoint URL */
+    gchar* project_id;     /* Optional project ID (for some providers) */
+    gchar* default_model;  /* Default model for this provider */
    pthread_mutex_t settings_lock; /* Protects settings (iterated by the request thread) */
-    GHashTable* settings;          /* Extensible per-provider settings (e.g., temperature=0.7) */
-    GList* models;                 /* Cached models (gchar*) */
-    gboolean models_fresh;         /* Whether models cache is current */
-    gint32 ref_count;              /* Reference count (atomic) */
+    GHashTable* settings;  /* Extensible per-provider settings (e.g., temperature=0.7) */
+    GList* models;         /* Cached models (gchar*) */
+    gboolean models_fresh; /* Whether models cache is current */
+    gint32 ref_count;      /* Reference count (atomic) */
 } AIProvider;

 /**
--- a/src/command/cmd_ac.c
+++ b/src/command/cmd_ac.c
@@ -42,7 +42,6 @@

 #include "ai/ai_client.h"

-static char* _caps_autocomplete(ProfWin* window, const char* const input, gboolean previous);
 static char* _sub_autocomplete(ProfWin* window, const char* const input, gboolean previous);
 static char* _notify_autocomplete(ProfWin* window, const char* const input, gboolean previous);
 static char* _theme_autocomplete(ProfWin* window, const char* const input, gboolean previous);
@@ -152,7 +151,6 @@ static Autocomplete account_clear_ac;
 static Autocomplete account_default_ac;
 static Autocomplete account_status_ac;
 static Autocomplete disco_ac;
-static Autocomplete caps_subcommands_ac;
 static Autocomplete wins_ac;
 static Autocomplete roster_ac;
 static Autocomplete roster_show_ac;
@@ -323,7 +321,6 @@ static Autocomplete* all_acs[] = {
    &account_default_ac,
    &account_status_ac,
    &disco_ac,
-    &caps_subcommands_ac,
    &wins_ac,
    &roster_ac,
    &roster_show_ac,
@@ -600,8 +597,6 @@ cmd_ac_init(void)
    autocomplete_add(disco_ac, "info");
    autocomplete_add(disco_ac, "items");

-    autocomplete_add(caps_subcommands_ac, "clear");
-
    autocomplete_add(account_ac, "list");
    autocomplete_add(account_ac, "show");
    autocomplete_add(account_ac, "add");
@@ -1419,7 +1414,6 @@ cmd_ac_init(void)
    g_hash_table_insert(ac_funcs, "/ban", _ban_autocomplete);
    g_hash_table_insert(ac_funcs, "/blocked", _blocked_autocomplete);
    g_hash_table_insert(ac_funcs, "/bookmark", _bookmark_autocomplete);
-    g_hash_table_insert(ac_funcs, "/caps", _caps_autocomplete);
    g_hash_table_insert(ac_funcs, "/clear", _clear_autocomplete);
    g_hash_table_insert(ac_funcs, "/close", _close_autocomplete);
    g_hash_table_insert(ac_funcs, "/cmd", _adhoc_cmd_autocomplete);
@@ -1991,35 +1985,6 @@ _cmd_ac_complete_params(ProfWin* window, const char* const input, gboolean previ
    return NULL;
 }

-static char*
-_caps_autocomplete(ProfWin* window, const char* const input, gboolean previous)
-{
-    char* result = NULL;
-    result = autocomplete_param_with_ac(input, "/caps", caps_subcommands_ac, TRUE, previous);
-    if (result) {
-        return result;
-    }
-    if (window->type == WIN_MUC) {
-        ProfMucWin* mucwin = (ProfMucWin*)window;
-        assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK);
-        Autocomplete nick_ac = muc_roster_ac(mucwin->roomjid);
-        if (nick_ac) {
-            result = autocomplete_param_with_ac(input, "/caps", nick_ac, TRUE, previous);
-        }
-    } else if (connection_get_status() == JABBER_CONNECTED) {
-        result = autocomplete_param_with_func(input, "/caps", roster_contact_autocomplete, previous, NULL);
-        if (result) {
-            return result;
-        }
-        result = autocomplete_param_with_func(input, "/caps", roster_barejid_autocomplete, previous, NULL);
-        if (result) {
-            return result;
-        }
-        result = autocomplete_param_with_func(input, "/caps", roster_fulljid_autocomplete, previous, NULL);
-    }
-    return result;
-}
-
 static char*
 _sub_autocomplete(ProfWin* window, const char* const input, gboolean previous)
 {
--- a/src/command/cmd_defs.c
+++ b/src/command/cmd_defs.c
@@ -427,21 +427,17 @@ static const struct cmd_t command_defs[] = {
              CMD_TAG_GROUPCHAT)
      CMD_SYN(
              "/caps",
-              "/caps <fulljid>|<nick>",
-              "/caps clear")
+              "/caps <fulljid>|<nick>")
      CMD_DESC(
              "Find out a contacts, or room members client software capabilities. "
-              "If in private chat initiated from a chat room, no parameter is required. "
-              "Use clear to remove all cached capabilities.")
+              "If in private chat initiated from a chat room, no parameter is required.")
      CMD_ARGS(
              { "<fulljid>", "If in the console or a chat window, the full JID for which you wish to see capabilities." },
-              { "<nick>", "If in a chat room, nickname for which you wish to see capabilities." },
-              { "clear", "Clear all cached capabilities." })
+              { "<nick>", "If in a chat room, nickname for which you wish to see capabilities." })
      CMD_EXAMPLES(
              "/caps ran@cold.sea.org/laptop",
              "/caps ran@cold.sea.org/phone",
-              "/caps aegir",
-              "/caps clear")
+              "/caps aegir")
    },

    { CMD_PREAMBLE("/software",
--- a/src/command/cmd_funcs.c
+++ b/src/command/cmd_funcs.c
@@ -70,7 +70,6 @@
 #include "xmpp/stanza.h"
 #include "xmpp/vcard_funcs.h"
 #include "xmpp/xmpp.h"
-#include "xmpp/capabilities.h"

 #ifdef HAVE_LIBOTR
 #include "otr/otr.h"
@@ -3388,12 +3387,6 @@ cmd_caps(ProfWin* window, const char* const command, gchar** args)
        return TRUE;
    }

-    if (g_strcmp0(args[0], "clear") == 0) {
-        caps_cache_clear();
-        cons_show("Capabilities cache cleared.");
-        return TRUE;
-    }
-
    switch (window->type) {
    case WIN_MUC:
        if (args[0]) {
@@ -3412,7 +3405,6 @@ cmd_caps(ProfWin* window, const char* const command, gchar** args)
        break;
    case WIN_CHAT:
    case WIN_CONSOLE:
-    case WIN_XML:
        if (args[0]) {
            auto_jid Jid* jid = jid_create(args[0]);

--- a/src/common.c
+++ b/src/common.c
@@ -921,7 +921,7 @@ prof_date_time_format_iso8601(GDateTime* dt)
    return ret;
 }

-/* build CProof version string.
+/* build profanity version string.
 * example: 0.13.1dev.master.69d8c1f9
 */
 gchar*
--- a/src/config/accounts.c
+++ b/src/config/accounts.c
@@ -522,7 +522,7 @@ accounts_set_script_start(const char* const account_name, const char* const valu
 void
 accounts_set_client(const char* const account_name, const char* const value)
 {
-    _accounts_set_string_option(account_name, "client.account_name", value);
+    _accounts_set_string_option(account_name, "client.name", value);
 }

 void
@@ -576,7 +576,7 @@ accounts_clear_script_start(const char* const account_name)
 void
 accounts_clear_client(const char* const account_name)
 {
-    _accounts_clear_string_option(account_name, "client.account_name");
+    _accounts_clear_string_option(account_name, "client.name");
 }

 void
--- a/src/config/preferences.c
+++ b/src/config/preferences.c
@@ -2689,6 +2689,7 @@ _get_default_boolean(preference_t pref)
    case PREF_STATUSBAR_SHOW_NUMBER:
    case PREF_STATUSBAR_SHOW_READ:
    case PREF_STATUSBAR_SHOW_DBBACKEND:
+    case PREF_REVEAL_OS:
    case PREF_CORRECTION_ALLOW:
    case PREF_RECEIPTS_SEND:
    case PREF_CARBONS:
@@ -2703,7 +2704,6 @@ _get_default_boolean(preference_t pref)
    case PREF_STROPHE_SM_RESEND:
    case PREF_AUTOPING_WARNING:
        return TRUE;
-    case PREF_REVEAL_OS:
    case PREF_SPELLCHECK_ENABLE:
    case PREF_PGP_PUBKEY_AUTOIMPORT:
    case PREF_FORCE_ENCRYPTION:
--- a/src/main.c
+++ b/src/main.c
@@ -77,7 +77,7 @@ main(int argc, char** argv)

    if (version == TRUE) {
        auto_gchar gchar* prof_version = prof_get_version();
-        g_print("CProof, version %s\n", prof_version);
+        g_print("Profanity, version %s\n", prof_version);

        // lets use fixed email instead of PACKAGE_BUGREPORT
        g_print("Copyright (C) 2012 - 2019 James Booth <boothj5web@gmail.com>.\n");
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -253,7 +253,7 @@ _init(char* log_level, char* config_file, char* log_file, char* theme_name)
    log_stderr_init(PROF_LEVEL_ERROR);

    auto_gchar gchar* prof_version = prof_get_version();
-    log_info("Starting CProof (%s)…", prof_version);
+    log_info("Starting Profanity (%s)…", prof_version);

    chatlog_init();
    accounts_load();
--- a/src/ui/console.c
+++ b/src/ui/console.c
@@ -2830,7 +2830,8 @@ cons_privacy_setting(void)
        if (account->client) {
            cons_show("Client name (/account set <account> clientid)              : %s", account->client);
        } else {
-            cons_show("Client name (/account set <account> clientid)              : Pidgin");
+            auto_gchar gchar* prof_version = prof_get_version();
+            cons_show("Client name (/account set <account> clientid)              : Profanity %s", prof_version);
        }
        if (account->max_sessions > 0) {
            cons_show("Max sessions alarm (/account set <account> session_alarm)  : %d", account->max_sessions);
--- a/src/xmpp/capabilities.c
+++ b/src/xmpp/capabilities.c
@@ -23,7 +23,6 @@
 #include "plugins/plugins.h"
 #include "config/files.h"
 #include "config/preferences.h"
-#include "xmpp/connection.h"
 #include "xmpp/xmpp.h"
 #include "xmpp/stanza.h"
 #include "xmpp/form.h"
@@ -272,19 +271,6 @@ caps_map_jid_to_ver(const char* const jid, const char* const ver)
    g_hash_table_insert(jid_to_ver, strdup(jid), strdup(ver));
 }

-void
-caps_cache_clear(void)
-{
-    g_hash_table_remove_all(jid_to_ver);
-    g_hash_table_remove_all(jid_to_caps);
-    if (caps_prof_keyfile.keyfile) {
-        g_key_file_free(caps_prof_keyfile.keyfile);
-    }
-    caps_prof_keyfile.keyfile = g_key_file_new();
-    cache = caps_prof_keyfile.keyfile;
-    save_keyfile(&caps_prof_keyfile);
-}
-
 gboolean
 caps_cache_contains(const char* const ver)
 {
--- a/src/xmpp/capabilities.h
+++ b/src/xmpp/capabilities.h
@@ -28,6 +28,5 @@ void caps_map_jid_to_ver(const char* const jid, const char* const ver);
 gboolean caps_cache_contains(const char* const ver);
 GList* caps_get_features(void);
 char* caps_get_my_sha1(xmpp_ctx_t* const ctx);
-void caps_cache_clear(void);

 #endif
--- a/src/xmpp/iq.c
+++ b/src/xmpp/iq.c
@@ -1681,7 +1681,7 @@ _version_get_handler(xmpp_stanza_t* const stanza)
    xmpp_stanza_t* name = xmpp_stanza_new(ctx);
    xmpp_stanza_set_name(name, "name");
    xmpp_stanza_t* name_txt = xmpp_stanza_new(ctx);
-    xmpp_stanza_set_text(name_txt, is_custom_client ? client : "Pidgin");
+    xmpp_stanza_set_text(name_txt, is_custom_client ? client : "Profanity");
    xmpp_stanza_add_child(name, name_txt);
    xmpp_stanza_add_child(query, name);
    bool include_os = prefs_get_boolean(PREF_REVEAL_OS) && !is_custom_client;
@@ -1690,7 +1690,7 @@ _version_get_handler(xmpp_stanza_t* const stanza)
    xmpp_stanza_t* version = xmpp_stanza_new(ctx);
    xmpp_stanza_set_name(version, "version");
    xmpp_stanza_t* version_txt = xmpp_stanza_new(ctx);
-    auto_gchar gchar* prof_version = g_strdup("");
+    auto_gchar gchar* prof_version = prof_get_version();

    if (!is_custom_client) {
        xmpp_stanza_set_text(version_txt, prof_version);
--- a/src/xmpp/jid.c
+++ b/src/xmpp/jid.c
@@ -280,13 +280,9 @@ jid_fulljid_or_barejid(Jid* jid)
 gchar*
 jid_random_resource(void)
 {
-    gchar* rand = g_malloc0(29);
-    const gchar* digits = "0123456789";
+    auto_gchar gchar* rand = get_random_string(4);

-    for (int i = 0; i < 28; i++) {
-        rand[i] = digits[g_random_int_range(0, 10)];
-    }
-    rand[28] = '\0';
+    gchar* result = g_strdup_printf("profanity.%s", rand);

-    return rand;
+    return result;
 }
--- a/src/xmpp/session.c
+++ b/src/xmpp/session.c
@@ -178,7 +178,7 @@ session_connect_with_details(const char* const jid, const char* const passwd, co
        saved_details.auth_policy = NULL;
    }

-    // use random string when no resourcepart in provided jid
+    // use 'profanity' when no resourcepart in provided jid
    auto_jid Jid* jidp = jid_create(jid);
    if (jidp->resourcepart == NULL) {
        auto_gchar gchar* resource = jid_random_resource();
--- a/src/xmpp/stanza.c
+++ b/src/xmpp/stanza.c
@@ -32,7 +32,6 @@

 static void _stanza_add_unique_id(xmpp_stanza_t* stanza);
 static gchar* _stanza_create_sha1_hash(char* str);
-static const char* _stanza_get_caps_node(const char* const client);

 #if 0
 xmpp_stanza_t*
@@ -931,22 +930,23 @@ stanza_create_caps_query_element(xmpp_ctx_t* ctx)

    xmpp_stanza_t* identity = xmpp_stanza_new(ctx);
    xmpp_stanza_set_name(identity, "identity");
-    xmpp_stanza_set_type(identity, "pc");
    xmpp_stanza_set_attribute(identity, "category", "client");

    ProfAccount* account = accounts_get_account(session_get_account_name());
+    gchar* client = account->client;
+    bool is_custom_client = client != NULL;

-    auto_gchar gchar* name = g_strdup(account->client ? account->client : "Pidgin");
-
-    if (account->client) {
-        gchar* space = strchr(name, ' ');
-        if (space) {
-            *space = '\0';
-        }
+    GString* name_str = g_string_new(is_custom_client ? client : "Profanity ");
+    if (!is_custom_client) {
+        xmpp_stanza_set_type(identity, "console");
+        auto_gchar gchar* prof_version = prof_get_version();
+        g_string_append(name_str, prof_version);
    }
+
    account_free(account);

-    xmpp_stanza_set_attribute(identity, "name", name);
+    xmpp_stanza_set_attribute(identity, "name", name_str->str);
+    g_string_free(name_str, TRUE);
    xmpp_stanza_add_child(query, identity);
    xmpp_stanza_release(identity);

@@ -1994,42 +1994,6 @@ stanza_attach_last_activity(xmpp_ctx_t* const ctx,
    xmpp_stanza_release(query);
 }

-static const char*
-_stanza_get_caps_node(const char* const client)
-{
-    if (!client || g_strcmp0(client, "") == 0) {
-        return "http://pidgin.im";
-    }
-
-    auto_gchar gchar* lower = g_ascii_strdown(client, -1);
-
-    if (g_str_has_prefix(lower, "pidgin")) {
-        return "http://pidgin.im";
-    }
-
-    if (g_str_has_prefix(lower, "gajim")) {
-        return "https://gajim.org";
-    }
-
-    if (g_str_has_prefix(lower, "conversations")) {
-        return "https://conversations.im";
-    }
-
-    if (g_str_has_prefix(lower, "psi+")) {
-        return "http://psi-plus.com";
-    }
-
-    if (g_str_has_prefix(lower, "psi")) {
-        return "http://psi-im.org";
-    }
-
-    if (g_str_has_prefix(lower, "profanity")) {
-        return "http://profanity-im.github.io";
-    }
-
-    return "";
-}
-
 void
 stanza_attach_caps(xmpp_ctx_t* const ctx, xmpp_stanza_t* const presence)
 {
@@ -2038,13 +2002,9 @@ stanza_attach_caps(xmpp_ctx_t* const ctx, xmpp_stanza_t* const presence)
    xmpp_stanza_set_ns(caps, STANZA_NS_CAPS);
    xmpp_stanza_t* query = stanza_create_caps_query_element(ctx);

-    ProfAccount* account = accounts_get_account(session_get_account_name());
-    const char* node = _stanza_get_caps_node(account->client);
-    account_free(account);
-
    char* sha1 = caps_get_my_sha1(ctx);
    xmpp_stanza_set_attribute(caps, STANZA_ATTR_HASH, "sha-1");
-    xmpp_stanza_set_attribute(caps, STANZA_ATTR_NODE, node);
+    xmpp_stanza_set_attribute(caps, STANZA_ATTR_NODE, "http://profanity-im.github.io");
    xmpp_stanza_set_attribute(caps, STANZA_ATTR_VER, sha1);
    xmpp_stanza_add_child(presence, caps);
    xmpp_stanza_release(caps);
--- a/tests/functionaltests/proftest.c
+++ b/tests/functionaltests/proftest.c
@@ -601,11 +601,11 @@ prof_connect_with_roster(const char* roster)
    assert_true(prof_output_regex(".+online.+ \\(priority 0\\)\\."));

    expect_timeout = EXPECT_TIMEOUT_CONNECT;
-    // Wait for presence stanza to be sent
+    // Wait for presence stanza to be sent (content-based, not ID-based)
    // Match the actual attribute order from stanza_attach_caps
    assert_true(stbbr_received(
        "<presence id=\"*\">"
-        "<c xmlns=\"http://jabber.org/protocol/caps\" hash=\"sha-1\" node=\"*\" ver=\"*\"/>"
+        "<c xmlns=\"http://jabber.org/protocol/caps\" hash=\"sha-1\" node=\"http://profanity-im.github.io\" ver=\"*\"/>"
        "</presence>"));
 }

--- a/tests/functionaltests/test_connect.c
+++ b/tests/functionaltests/test_connect.c
@@ -25,7 +25,7 @@ connect_jid_sends_presence_after_receiving_roster(void **state)

    assert_true(stbbr_received(
        "<presence id='*'>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
        "</presence>"
    ));
 }
--- a/tests/functionaltests/test_export_import.c
+++ b/tests/functionaltests/test_export_import.c
@@ -1289,7 +1289,7 @@ _join_muc(const char* room)
    snprintf(presence, sizeof(presence),
        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='%s/stabber'>"
            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' "
-               "node='*' ver='*'/>"
+               "node='http://profanity-im.github.io' ver='*'/>"
            "<x xmlns='http://jabber.org/protocol/muc#user'>"
                "<item role='participant' jid='stabber@localhost/profanity' affiliation='none'/>"
            "</x>"
--- a/tests/functionaltests/test_muc.c
+++ b/tests/functionaltests/test_muc.c
@@ -26,7 +26,7 @@ sends_room_join(void **state)
    assert_true(stbbr_received(
        "<presence id='*' to='testroom@conference.localhost/stabber'>"
            "<x xmlns='http://jabber.org/protocol/muc'/>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
        "</presence>"
    ));
 }
@@ -41,7 +41,7 @@ sends_room_join_with_nick(void **state)
    assert_true(stbbr_received(
        "<presence id='*' to='testroom@conference.localhost/testnick'>"
            "<x xmlns='http://jabber.org/protocol/muc'/>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
        "</presence>"
    ));
 }
@@ -58,7 +58,7 @@ sends_room_join_with_password(void **state)
            "<x xmlns='http://jabber.org/protocol/muc'>"
                "<password>testpassword</password>"
            "</x>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
        "</presence>"
    ));
 }
@@ -75,7 +75,7 @@ sends_room_join_with_nick_and_password(void **state)
            "<x xmlns='http://jabber.org/protocol/muc'>"
                "<password>testpassword</password>"
            "</x>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
        "</presence>"
    ));
 }
@@ -87,7 +87,7 @@ shows_role_and_affiliation_on_join(void **state)

    stbbr_for_presence_to("testroom@conference.localhost/stabber",
        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='*' ver='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='*'/>"
            "<x xmlns='http://jabber.org/protocol/muc#user'>"
                "<item role='participant' jid='stabber@localhost/profanity' affiliation='none'/>"
            "</x>"
@@ -107,7 +107,7 @@ shows_subject_on_join(void **state)

    stbbr_for_presence_to("testroom@conference.localhost/stabber",
        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='*' ver='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='*'/>"
            "<x xmlns='http://jabber.org/protocol/muc#user'>"
                "<item role='participant' jid='stabber@localhost/profanity' affiliation='none'/>"
            "</x>"
@@ -135,7 +135,7 @@ shows_history_message(void **state)

    stbbr_for_presence_to("testroom@conference.localhost/stabber",
        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='*' ver='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='*'/>"
            "<x xmlns='http://jabber.org/protocol/muc#user'>"
                "<item role='participant' jid='stabber@localhost/profanity' affiliation='none'/>"
            "</x>"
@@ -170,7 +170,7 @@ shows_occupant_join(void **state)

    stbbr_for_presence_to("testroom@conference.localhost/stabber",
        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='*' ver='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='*'/>"
            "<x xmlns='http://jabber.org/protocol/muc#user'>"
                "<item role='participant' jid='stabber@localhost/profanity' affiliation='none'/>"
            "</x>"
@@ -200,7 +200,7 @@ shows_message(void **state)

    stbbr_for_presence_to("testroom@conference.localhost/stabber",
        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='*' ver='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='*'/>"
            "<x xmlns='http://jabber.org/protocol/muc#user'>"
                "<item role='participant' jid='stabber@localhost/profanity' affiliation='none'/>"
            "</x>"
@@ -227,7 +227,7 @@ shows_me_message_from_occupant(void **state)

    stbbr_for_presence_to("testroom@conference.localhost/stabber",
        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='*' ver='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='*'/>"
            "<x xmlns='http://jabber.org/protocol/muc#user'>"
                "<item role='participant' jid='stabber@localhost/profanity' affiliation='none'/>"
            "</x>"
@@ -254,7 +254,7 @@ shows_me_message_from_self(void **state)

    stbbr_for_presence_to("testroom@conference.localhost/stabber",
        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='*' ver='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='*'/>"
            "<x xmlns='http://jabber.org/protocol/muc#user'>"
                "<item role='participant' jid='stabber@localhost/profanity' affiliation='none'/>"
            "</x>"
@@ -281,7 +281,7 @@ shows_all_messages_in_console_when_window_not_focussed(void **state)

    stbbr_for_presence_to("testroom@conference.localhost/stabber",
        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='*' ver='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='*'/>"
            "<x xmlns='http://jabber.org/protocol/muc#user'>"
                "<item role='participant' jid='stabber@localhost/profanity' affiliation='none'/>"
            "</x>"
@@ -322,7 +322,7 @@ shows_first_message_in_console_when_window_not_focussed(void **state)

    stbbr_for_presence_to("testroom@conference.localhost/stabber",
        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='*' ver='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='*'/>"
            "<x xmlns='http://jabber.org/protocol/muc#user'>"
                "<item role='participant' jid='stabber@localhost/profanity' affiliation='none'/>"
            "</x>"
@@ -369,7 +369,7 @@ shows_no_message_in_console_when_window_not_focussed(void **state)

    stbbr_for_presence_to("testroom@conference.localhost/stabber",
        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='*' ver='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='*'/>"
            "<x xmlns='http://jabber.org/protocol/muc#user'>"
                "<item role='participant' jid='stabber@localhost/profanity' affiliation='none'/>"
            "</x>"
@@ -401,7 +401,7 @@ sends_affiliation_list_request(void **state)

    stbbr_for_presence_to("testroom@conference.localhost/stabber",
        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='*' ver='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='*'/>"
            "<x xmlns='http://jabber.org/protocol/muc#user'>"
                "<item role='moderator' jid='stabber@localhost/profanity' affiliation='owner'/>"
            "</x>"
@@ -434,7 +434,7 @@ sends_kick_request(void **state)

    stbbr_for_presence_to("testroom@conference.localhost/stabber",
        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='*' ver='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='*'/>"
            "<x xmlns='http://jabber.org/protocol/muc#user'>"
                "<item role='moderator' jid='stabber@localhost/profanity' affiliation='admin'/>"
            "</x>"
--- a/tests/functionaltests/test_presence.c
+++ b/tests/functionaltests/test_presence.c
@@ -19,7 +19,7 @@ presence_online(void **state)
    assert_true(stbbr_received(
        "<presence id='*'>"
            "<status>online</status>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
        "</presence>"
    ));
 }
@@ -36,7 +36,7 @@ presence_online_with_message(void **state)
    assert_true(stbbr_received(
        "<presence id='*'>"
            "<status>Hi there</status>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
        "</presence>"
    ));
 }
@@ -54,7 +54,7 @@ presence_away(void **state)
        "<presence id='*'>"
            "<show>away</show>"
            "<status>away</status>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
        "</presence>"
    ));
 }
@@ -72,7 +72,7 @@ presence_away_with_message(void **state)
        "<presence id='*'>"
            "<show>away</show>"
            "<status>I'm not here for a bit</status>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
        "</presence>"
    ));
 }
@@ -90,7 +90,7 @@ presence_xa(void **state)
        "<presence id='*'>"
            "<show>xa</show>"
            "<status>xa</status>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
        "</presence>"
    ));
 }
@@ -108,7 +108,7 @@ presence_xa_with_message(void **state)
        "<presence id='*'>"
            "<show>xa</show>"
            "<status>Gone to the shops</status>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
        "</presence>"
    ));
 }
@@ -126,7 +126,7 @@ presence_dnd(void **state)
        "<presence id='*'>"
            "<show>dnd</show>"
            "<status>dnd</status>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
        "</presence>"
    ));
 }
@@ -144,7 +144,7 @@ presence_dnd_with_message(void **state)
        "<presence id='*'>"
            "<show>dnd</show>"
            "<status>Working</status>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
        "</presence>"
    ));
 }
@@ -162,7 +162,7 @@ presence_chat(void **state)
        "<presence id='*'>"
            "<show>chat</show>"
            "<status>chat</status>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
        "</presence>"
    ));
 }
@@ -180,7 +180,7 @@ presence_chat_with_message(void **state)
        "<presence id='*'>"
            "<show>chat</show>"
            "<status>Free to talk</status>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
        "</presence>"
    ));
 }
@@ -197,7 +197,7 @@ presence_set_priority(void **state)
    assert_true(stbbr_received(
        "<presence id='*'>"
            "<priority>25</priority>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
        "</presence>"
    ));
 }
@@ -212,7 +212,7 @@ presence_includes_priority(void **state)
    assert_true(stbbr_received(
        "<presence id='*'>"
            "<priority>25</priority>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
        "</presence>"
    ));

@@ -223,7 +223,7 @@ presence_includes_priority(void **state)
            "<priority>25</priority>"
            "<show>chat</show>"
            "<status>Free to talk</status>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
        "</presence>"
    ));
 }
@@ -239,7 +239,7 @@ presence_keeps_status(void **state)
        "<presence id='*'>"
            "<show>chat</show>"
            "<status>Free to talk</status>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
        "</presence>"
    ));

@@ -250,7 +250,7 @@ presence_keeps_status(void **state)
            "<show>chat</show>"
            "<status>Free to talk</status>"
            "<priority>25</priority>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='*'/>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
        "</presence>"
    ));
 }
--- a/tests/unittests/xmpp/stub_xmpp.c
+++ b/tests/unittests/xmpp/stub_xmpp.c
@@ -500,11 +500,6 @@ caps_jid_has_feature(const char* const jid, const char* const feature)
    return FALSE;
 }

-void
-caps_cache_clear(void)
-{
-}
-
 gboolean
 bookmark_add(const char* jid, const char* nick, const char* password, const char* autojoin_str, const char* name)
 {