X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fserv_xmpp.c;h=1b4d78424fccba42bfb83ff2aff54dbf00131e31;hb=8e944083763c9ddcb32d763cf8f19c966d01f873;hp=cc75f6dd190751d88f112fa6c91035277d28c2d2;hpb=5e630368347015f99043c6edbc8c1b474cf892ff;p=citadel.git diff --git a/citadel/modules/xmpp/serv_xmpp.c b/citadel/modules/xmpp/serv_xmpp.c index cc75f6dd1..1b4d78424 100644 --- a/citadel/modules/xmpp/serv_xmpp.c +++ b/citadel/modules/xmpp/serv_xmpp.c @@ -1,6 +1,6 @@ /* * XMPP (Jabber) service for the Citadel system - * Copyright (c) 2007-2018 by Art Cancro and citadel.org + * Copyright (c) 2007-2021 by Art Cancro and citadel.org * * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -53,12 +53,11 @@ #include "database.h" #include "msgbase.h" #include "internet_addressing.h" -#include "md5.h" #include "ctdl_module.h" #include "serv_xmpp.h" /* uncomment for more verbosity - it will log all received XML tags */ -#define XMPP_XML_DEBUG +// #define XMPP_XML_DEBUG /* XML_StopParser is present in expat 2.x */ #if XML_MAJOR_VERSION > 1 @@ -67,7 +66,6 @@ struct xmpp_event *xmpp_queue = NULL; - #ifdef HAVE_XML_STOPPARSER /* Stop the parser if an entity declaration is hit. */ static void xmpp_entity_declaration(void *userData, const XML_Char *entityName, @@ -83,30 +81,33 @@ static void xmpp_entity_declaration(void *userData, const XML_Char *entityName, /* - * Given a source string and a target buffer, returns the string - * properly escaped for insertion into an XML stream. Returns a - * pointer to the target buffer for convenience. + * support function for xmlesc() which helps with UTF-8 strings */ static inline int Ctdl_GetUtf8SequenceLength(const char *CharS, const char *CharE) { int n = 0; unsigned char test = (1<<7); - if ((*CharS & 0xC0) != 0xC0) + if ((*CharS & 0xC0) != 0xC0) { return 1; + } - while ((n < 8) && - ((test & ((unsigned char)*CharS)) != 0)) - { + while ((n < 8) && ((test & ((unsigned char)*CharS)) != 0)) { test = test >> 1; n ++; } - if ((n > 6) || ((CharE - CharS) < n)) + if ((n > 6) || ((CharE - CharS) < n)) { n = 0; + } return n; } +/* + * Given a source string and a target buffer, returns the string + * properly escaped for insertion into an XML stream. Returns a + * pointer to the target buffer for convenience. + */ char *xmlesc(char *buf, char *str, int bufsiz) { int IsUtf8Sequence; @@ -143,8 +144,7 @@ char *xmlesc(char *buf, char *str, int bufsiz) buf[len] = 0; } else if (ch < 0x20) { - /* we probably shouldn't be doing this */ - buf[len++] = '_'; + buf[len++] = '_'; // we probably shouldn't be doing this buf[len] = 0; } else { @@ -190,7 +190,6 @@ void xmpp_stream_start(void *data, const char *supplied_el, const char **attr) } cprintf(""); - cprintf("server_name, sizeof xmlbuf)); cprintf("id=\"%08x\" ", CC->cs_pid); @@ -221,7 +220,6 @@ void xmpp_stream_start(void *data, const char *supplied_el, const char **attr) /* Offer binding and sessions as part of our feature set */ cprintf(""); cprintf(""); - cprintf(""); CC->is_async = 1; /* XMPP sessions are inherently async-capable */ @@ -233,7 +231,9 @@ void xmpp_xml_start(void *data, const char *supplied_el, const char **attr) { char *sep = NULL; int i; - /* Axe the namespace, we don't care about it */ + /* Create a version of the element with the namespace removed. + * Now we can access "el" or "supplied_el" depending on whether we want to see the whole namespace. + */ safestrncpy(el, supplied_el, sizeof el); while (sep = strchr(el, ':'), sep) { strcpy(el, ++sep); @@ -299,13 +299,14 @@ void xmpp_xml_start(void *data, const char *supplied_el, const char **attr) { } - void xmpp_xml_end(void *data, const char *supplied_el) { char el[256]; char *sep = NULL; char xmlbuf[256]; - /* Axe the namespace, we don't care about it */ + /* Create a version of the element with the namespace removed. + * Now we can access "el" or "supplied_el" depending on whether we want to see the whole namespace. + */ safestrncpy(el, supplied_el, sizeof el); while (sep = strchr(el, ':'), sep) { strcpy(el, ++sep); @@ -367,6 +368,20 @@ void xmpp_xml_end(void *data, const char *supplied_el) { cprintf("id=\"%s\"/>", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf)); } + /* + * Client is requesting its own vCard + * (If we make this more elaborate, move it to a separate function) + */ + else if (XMPP->iq_vcard) { + cprintf("iq_id, sizeof xmlbuf)); + cprintf("to=\"%s\">", xmlesc(xmlbuf, XMPP->iq_from, sizeof xmlbuf)); + cprintf(""); + cprintf("%s", xmlesc(xmlbuf, CC->user.fullname, sizeof xmlbuf)); + cprintf("%s", xmlesc(xmlbuf, CC->user.fullname, sizeof xmlbuf)); + cprintf(""); + cprintf(""); + } + /* * Unknown query ... return the XML equivalent of a blank stare */ @@ -387,14 +402,8 @@ void xmpp_xml_end(void *data, const char *supplied_el) { else if ( (!strcasecmp(XMPP->iq_type, "set")) && (!strcasecmp(XMPP->iq_query_xmlns, "jabber:iq:auth:query")) - ) { - - xmpp_non_sasl_authenticate( - XMPP->iq_id, - XMPP->iq_client_username, - XMPP->iq_client_password, - XMPP->iq_client_resource - ); + ) { + xmpp_non_sasl_authenticate(XMPP->iq_id, XMPP->iq_client_username, XMPP->iq_client_password); } /* @@ -405,27 +414,15 @@ void xmpp_xml_end(void *data, const char *supplied_el) { && (!IsEmptyStr(XMPP->iq_id)) && (CC->logged_in) ) { - /* If the client has not specified a client resource, generate one */ - if (IsEmptyStr(XMPP->iq_client_resource)) { - generate_uuid(XMPP->iq_client_resource); + snprintf(XMPP->iq_client_resource, sizeof XMPP->iq_client_resource, "%d", CC->cs_pid); } - /* Generate the "full JID" of the client resource */ - - snprintf(XMPP->client_jid, sizeof XMPP->client_jid, - "%s/%s", - CC->cs_inet_email, - XMPP->iq_client_resource - ); - - /* FIXME look here ... there's nothing before the slash ... wtf? - syslog(LOG_DEBUG, "\033[31m client resource = '%s' \033[0m", XMPP->client_jid); - */ + /* Generate the "full JID" of the client (user@host/resource) */ + snprintf(XMPP->client_jid, sizeof XMPP->client_jid, "%s/%s", CC->cs_principal_id, XMPP->iq_client_resource); /* Tell the client what its JID is */ - cprintf("", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf)); cprintf(""); cprintf("%s", xmlesc(xmlbuf, XMPP->client_jid, sizeof xmlbuf)); @@ -452,13 +449,13 @@ void xmpp_xml_end(void *data, const char *supplied_el) { XMPP->iq_type[0] = 0; XMPP->iq_client_resource[0] = 0; XMPP->iq_session = 0; + XMPP->iq_vcard = 0; XMPP->iq_query_xmlns[0] = 0; XMPP->bind_requested = 0; XMPP->ping_requested = 0; } else if (!strcasecmp(el, "auth")) { - /* Try to authenticate (this function is responsible for the output stanza) */ xmpp_sasl_auth(XMPP->sasl_auth_mech, (XMPP->chardata != NULL ? XMPP->chardata : "") ); @@ -470,8 +467,11 @@ void xmpp_xml_end(void *data, const char *supplied_el) { XMPP->iq_session = 1; } - else if (!strcasecmp(el, "presence")) { + else if (!strcasecmp(supplied_el, "vcard-temp:vCard")) { + XMPP->iq_vcard = 1; + } + else if (!strcasecmp(el, "presence")) { /* Respond to a update by firing back with presence information * on the entire wholist. Check this assumption, it's probably wrong. */ @@ -649,7 +649,7 @@ void xmpp_async_loop(void) { * Login hook for XMPP sessions */ void xmpp_login_hook(void) { - xmpp_queue_event(XMPP_EVT_LOGIN, CC->cs_inet_email); + xmpp_queue_event(XMPP_EVT_LOGIN, CC->cs_principal_id); } @@ -657,12 +657,11 @@ void xmpp_login_hook(void) { * Logout hook for XMPP sessions */ void xmpp_logout_hook(void) { - xmpp_queue_event(XMPP_EVT_LOGOUT, CC->cs_inet_email); + xmpp_queue_event(XMPP_EVT_LOGOUT, CC->cs_principal_id); } const char *CitadelServiceXMPP="XMPP"; -extern void xmpp_cleanup_events(void); CTDL_MODULE_INIT(xmpp) { if (!threading) { @@ -678,7 +677,6 @@ CTDL_MODULE_INIT(xmpp) CtdlRegisterSessionHook(xmpp_logout_hook, EVT_LOGOUT, PRIO_LOGOUT + 90); CtdlRegisterSessionHook(xmpp_login_hook, EVT_UNSTEALTH, PRIO_UNSTEALTH + 1); CtdlRegisterSessionHook(xmpp_logout_hook, EVT_STEALTH, PRIO_STEALTH + 1); - CtdlRegisterCleanupHook(xmpp_cleanup_events); }