X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fserv_xmpp.c;h=6eb0fb6d1ba04a9e5804c8b1d3f06249e7669ab4;hb=7f1677e8798d3cb77fa9860b3bd1b8e3cbd332ab;hp=7d8fbc67d02c3349ec864d3d56e916563962fc50;hpb=313ec8cd15d8b4b0490862ef294f3aaa6390172c;p=citadel.git diff --git a/citadel/modules/xmpp/serv_xmpp.c b/citadel/modules/xmpp/serv_xmpp.c index 7d8fbc67d..6eb0fb6d1 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-2011 by Art Cancro + * Copyright (c) 2007-2019 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 @@ -57,6 +57,9 @@ #include "ctdl_module.h" #include "serv_xmpp.h" +/* uncomment for more verbosity - it will log all received XML tags */ +// #define XMPP_XML_DEBUG + /* XML_StopParser is present in expat 2.x */ #if XML_MAJOR_VERSION > 1 #define HAVE_XML_STOPPARSER @@ -64,10 +67,6 @@ struct xmpp_event *xmpp_queue = NULL; -int XMPPSrvDebugEnable = 0; - - - #ifdef HAVE_XML_STOPPARSER /* Stop the parser if an entity declaration is hit. */ static void xmpp_entity_declaration(void *userData, const XML_Char *entityName, @@ -76,24 +75,46 @@ static void xmpp_entity_declaration(void *userData, const XML_Char *entityName, const XML_Char *systemId, const XML_Char *publicId, const XML_Char *notationName ) { - XMPPM_syslog(LOG_WARNING, "Illegal entity declaration encountered; stopping parser."); + syslog(LOG_WARNING, "xmpp: illegal entity declaration encountered; stopping parser."); XML_StopParser(XMPP->xp, XML_FALSE); } #endif +/* + * 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) { + return 1; + } + + while ((n < 8) && ((test & ((unsigned char)*CharS)) != 0)) { + test = test >> 1; + 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. - * - * BUG: this does not properly handle UTF-8 */ char *xmlesc(char *buf, char *str, int bufsiz) { - char *ptr; + int IsUtf8Sequence; + char *ptr, *pche; unsigned char ch; + int inlen; int len = 0; if (!buf) return(NULL); @@ -102,6 +123,8 @@ char *xmlesc(char *buf, char *str, int bufsiz) if (!str) { return(buf); } + inlen = strlen(str); + pche = str + inlen; for (ptr=str; *ptr; ptr++) { ch = *ptr; @@ -122,15 +145,28 @@ 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 { - char oct[10]; - sprintf(oct, "&#%o;", ch); - strcpy(&buf[len], oct); - len += strlen(oct); + IsUtf8Sequence = Ctdl_GetUtf8SequenceLength(ptr, pche); + if (IsUtf8Sequence) + { + while ((IsUtf8Sequence > 0) && + (ptr < pche)) + { + buf[len] = *ptr; + ptr ++; + --IsUtf8Sequence; + } + } + else + { + char oct[10]; + sprintf(oct, "&#%o;", ch); + strcpy(&buf[len], oct); + len += strlen(oct); + } } if ((len + 6) > bufsiz) { return(buf); @@ -155,7 +191,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); @@ -186,7 +221,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 */ @@ -198,18 +232,20 @@ 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); } - /* - XMPP_syslog(LOG_DEBUG, "XMPP ELEMENT START: <%s>\n", el); +#ifdef XMPP_XML_DEBUG + syslog(LOG_DEBUG, "xmpp: ELEMENT START: <%s>", el); for (i=0; attr[i] != NULL; i+=2) { - XMPP_syslog(LOG_DEBUG, " Attribute '%s' = '%s'\n", attr[i], attr[i+1]); + syslog(LOG_DEBUG, "xmpp: Attribute '%s' = '%s'", attr[i], attr[i+1]); } - uncomment for more verbosity */ +#endif if (!strcasecmp(el, "stream")) { xmpp_stream_start(data, supplied_el, attr); @@ -264,45 +300,43 @@ 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); } - /* - XMPP_syslog(LOG_DEBUG, "XMPP ELEMENT END : <%s>\n", el); +#ifdef XMPP_XML_DEBUG + syslog(LOG_DEBUG, "xmpp: ELEMENT END : <%s>", el); if (XMPP->chardata_len > 0) { - XMPP_syslog(LOG_DEBUG, " chardata: %s\n", XMPP->chardata); + syslog(LOG_DEBUG, "xmpp: chardata: %s", XMPP->chardata); } - uncomment for more verbosity */ +#endif if (!strcasecmp(el, "resource")) { if (XMPP->chardata_len > 0) { - safestrncpy(XMPP->iq_client_resource, XMPP->chardata, - sizeof XMPP->iq_client_resource); + safestrncpy(XMPP->iq_client_resource, XMPP->chardata, sizeof XMPP->iq_client_resource); striplt(XMPP->iq_client_resource); } } else if (!strcasecmp(el, "username")) { /* NON SASL ONLY */ if (XMPP->chardata_len > 0) { - safestrncpy(XMPP->iq_client_username, XMPP->chardata, - sizeof XMPP->iq_client_username); + safestrncpy(XMPP->iq_client_username, XMPP->chardata, sizeof XMPP->iq_client_username); striplt(XMPP->iq_client_username); } } else if (!strcasecmp(el, "password")) { /* NON SASL ONLY */ if (XMPP->chardata_len > 0) { - safestrncpy(XMPP->iq_client_password, XMPP->chardata, - sizeof XMPP->iq_client_password); + safestrncpy(XMPP->iq_client_password, XMPP->chardata, sizeof XMPP->iq_client_password); striplt(XMPP->iq_client_password); } } @@ -318,8 +352,7 @@ void xmpp_xml_end(void *data, const char *supplied_el) { * Query on a namespace */ if (!IsEmptyStr(XMPP->iq_query_xmlns)) { - xmpp_query_namespace(XMPP->iq_id, XMPP->iq_from, - XMPP->iq_to, XMPP->iq_query_xmlns); + xmpp_query_namespace(XMPP->iq_id, XMPP->iq_from, XMPP->iq_to, XMPP->iq_query_xmlns); } /* @@ -336,14 +369,25 @@ 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 */ else { - XMPP_syslog(LOG_DEBUG, - "Unknown query <%s> - returning \n", - el - ); + syslog(LOG_DEBUG, "xmpp: Unknown query <%s> - returning ", el); cprintf("", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf)); cprintf("" "" @@ -359,14 +403,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); } /* @@ -375,20 +413,17 @@ void xmpp_xml_end(void *data, const char *supplied_el) { else if ( (XMPP->bind_requested) && (!IsEmptyStr(XMPP->iq_id)) - && (!IsEmptyStr(XMPP->iq_client_resource)) && (CC->logged_in) - ) { - - /* Generate the "full JID" of the client resource */ + ) { + /* If the client has not specified a client resource, generate one */ + if (IsEmptyStr(XMPP->iq_client_resource)) { + snprintf(XMPP->iq_client_resource, sizeof XMPP->iq_client_resource, "%d", CC->cs_pid); + } - snprintf(XMPP->client_jid, sizeof XMPP->client_jid, - "%s/%s", - CC->cs_inet_email, - XMPP->iq_client_resource - ); + /* Generate the "full JID" of the client (user@host/resource) */ + snprintf(XMPP->client_jid, sizeof XMPP->client_jid, "%s/%s", CC->cs_inet_email, 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)); @@ -403,8 +438,9 @@ void xmpp_xml_end(void *data, const char *supplied_el) { else { cprintf("", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf)); - cprintf("Don't know howto do '%s'!", xmlesc(xmlbuf, XMPP->iq_type, sizeof xmlbuf)); + cprintf("Don't know how to do '%s'!", xmlesc(xmlbuf, XMPP->iq_type, sizeof xmlbuf)); cprintf(""); + syslog(LOG_DEBUG, "XMPP: don't know how to do iq_type='%s' with iq_query_xmlns='%s'", XMPP->iq_type, XMPP->iq_query_xmlns); } /* Now clear these fields out so they don't get used by a future stanza */ @@ -414,13 +450,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 : "") ); @@ -432,8 +468,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. */ @@ -475,14 +514,22 @@ void xmpp_xml_end(void *data, const char *supplied_el) { } else if (!strcasecmp(el, "stream")) { - XMPPM_syslog(LOG_DEBUG, "XMPP client shut down their stream\n"); + syslog(LOG_DEBUG, "xmpp: client shut down their stream"); xmpp_massacre_roster(); cprintf("\n"); CC->kill_me = KILLME_CLIENT_LOGGED_OUT; } + else if (!strcasecmp(el, "query")) { + /* already processed , no further action needed here */ + } + + else if (!strcasecmp(el, "bind")) { + /* already processed , no further action needed here */ + } + else { - XMPP_syslog(LOG_DEBUG, "Ignoring unknown tag <%s>\n", el); + syslog(LOG_DEBUG, "xmpp: ignoring unknown tag <%s>", el); } XMPP->chardata_len = 0; @@ -532,7 +579,6 @@ void xmpp_cleanup_function(void) { } - /* * Here's where our XMPP session begins its happy day. */ @@ -547,7 +593,7 @@ void xmpp_greeting(void) { XMPP->xp = XML_ParserCreateNS("UTF-8", ':'); if (XMPP->xp == NULL) { - XMPPM_syslog(LOG_ALERT, "Cannot create XML parser!\n"); + syslog(LOG_ERR, "xmpp: cannot create XML parser"); CC->kill_me = KILLME_XML_PARSER; return; } @@ -584,7 +630,7 @@ void xmpp_command_loop(void) { XML_Parse(XMPP->xp, ChrPtr(stream_input), rc, 0); } else { - XMPPM_syslog(LOG_ERR, "client disconnected: ending session.\n"); + syslog(LOG_ERR, "xmpp: client disconnected: ending session."); CC->kill_me = KILLME_CLIENT_DISCONNECTED; } FreeStrBuf(&stream_input); @@ -616,23 +662,18 @@ void xmpp_logout_hook(void) { } -void LogXMPPSrvDebugEnable(const int n) -{ - XMPPSrvDebugEnable = n; -} const char *CitadelServiceXMPP="XMPP"; extern void xmpp_cleanup_events(void); CTDL_MODULE_INIT(xmpp) { if (!threading) { - CtdlRegisterServiceHook(config.c_xmpp_c2s_port, + CtdlRegisterServiceHook(CtdlGetConfigInt("c_xmpp_c2s_port"), NULL, xmpp_greeting, xmpp_command_loop, xmpp_async_loop, CitadelServiceXMPP ); - CtdlRegisterDebugFlagHook(HKEY("serv_xmpp"), LogXMPPSrvDebugEnable, &XMPPSrvDebugEnable); CtdlRegisterSessionHook(xmpp_cleanup_function, EVT_STOP, PRIO_STOP + 70); CtdlRegisterSessionHook(xmpp_login_hook, EVT_LOGIN, PRIO_LOGIN + 90); CtdlRegisterSessionHook(xmpp_logout_hook, EVT_LOGOUT, PRIO_LOGOUT + 90);