X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fserv_xmpp.c;h=126385129c82bdaa73faf9e20ed693a0d0c59904;hb=73bcf6081a14008eb1020126273f133a324bb910;hp=8c7297350b2cb976ac8f66e10c553ed23595a68f;hpb=885291b9d18f551e88d3b6c7349f99c92985c152;p=citadel.git diff --git a/citadel/modules/xmpp/serv_xmpp.c b/citadel/modules/xmpp/serv_xmpp.c index 8c7297350..126385129 100644 --- a/citadel/modules/xmpp/serv_xmpp.c +++ b/citadel/modules/xmpp/serv_xmpp.c @@ -1,10 +1,8 @@ /* - * $Id$ - * * XMPP (Jabber) service for the Citadel system - * Copyright (c) 2007-2010 by Art Cancro + * Copyright (c) 2007-2011 by Art Cancro * - * This program is free software; you can redistribute it and/or modify + * 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 * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. @@ -19,6 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +// uncomment for more verbosity +#define XMPP_DEBUG 1 + #include "sysdep.h" #include #include @@ -59,12 +60,140 @@ #include "ctdl_module.h" #include "serv_xmpp.h" +/* XML_StopParser is present in expat 2.x */ +#if XML_MAJOR_VERSION > 1 +#define HAVE_XML_STOPPARSER +#endif + struct xmpp_event *xmpp_queue = NULL; -/* We have just received a tag from the client, so send them ours */ +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, + int is_parameter_entity, const XML_Char *value, + int value_length, const XML_Char *base, + const XML_Char *systemId, const XML_Char *publicId, + const XML_Char *notationName +) { +<<<<<<< HEAD + syslog(LOG_WARNING, "Illegal entity declaration encountered; stopping parser."); +======= + XMPPM_syslog(LOG_WARNING, "Illegal entity declaration encountered; stopping parser."); +>>>>>>> 1c0b8162b0a90f2e97028a531005c11b09441498 + XML_StopParser(XMPP->xp, XML_FALSE); +} +#endif + +static inline int XMPP_GetUtf8SequenceLength(const char *CharS, const char *CharE) +{ + /* if this is is migrated to strbuf, remove this copy. */ + 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; + char *eiptr; + unsigned char ch; + int inlen; + int len = 0; + int IsUtf8Sequence; + + if (!buf) return(NULL); + buf[0] = 0; + len = 0; + if (!str) { + return(buf); + } + + inlen = strlen(str); + eiptr = str + inlen; + + for (ptr=str; *ptr; ptr++) { + ch = *ptr; + if (ch == '<') { + strcpy(&buf[len], "<"); + len += 4; + } + else if (ch == '>') { + strcpy(&buf[len], ">"); + len += 4; + } + else if (ch == '&') { + strcpy(&buf[len], "&"); + len += 5; + } + else if ((ch >= 0x20) && (ch <= 0x7F)) { + buf[len++] = ch; + buf[len] = 0; + } + else if (ch < 0x20) { + /* we probably shouldn't be doing this */ + buf[len++] = '_'; + buf[len] = 0; + } + else { + char oct[32]; + + IsUtf8Sequence = XMPP_GetUtf8SequenceLength(&buf[len], eiptr); + if (IsUtf8Sequence) + { + while (IsUtf8Sequence > 0){ + buf[len] = *ptr; + len ++; + if (--IsUtf8Sequence) + ptr++; + } + buf[len] = '\0'; + } + else + { + sprintf(oct, "&#%o;", ch); + strcpy(&buf[len], oct); + len += strlen(oct); + } + } + if ((len + 6) > bufsiz) { + return(buf); + } + } + return(buf); +} + + +/* + * We have just received a tag from the client, so send them ours + */ void xmpp_stream_start(void *data, const char *supplied_el, const char **attr) { + char xmlbuf[256]; + while (*attr) { if (!strcasecmp(attr[0], "to")) { safestrncpy(XMPP->server_name, attr[1], sizeof XMPP->server_name); @@ -75,7 +204,7 @@ void xmpp_stream_start(void *data, const char *supplied_el, const char **attr) cprintf(""); cprintf("server_name); + cprintf("from=\"%s\" ", xmlesc(xmlbuf, XMPP->server_name, sizeof xmlbuf)); cprintf("id=\"%08x\" ", CC->cs_pid); cprintf("version=\"1.0\" "); cprintf("xmlns:stream=\"http://etherx.jabber.org/streams\" "); @@ -84,13 +213,23 @@ void xmpp_stream_start(void *data, const char *supplied_el, const char **attr) /* The features of this stream are... */ cprintf(""); -#ifdef HAVE_OPENSSL_XXXX_COMMENTED_OUT - /* TLS encryption (but only if it isn't already active) */ + /* + * TLS encryption (but only if it isn't already active) +<<<<<<< HEAD + */ +======= + * / +>>>>>>> 1c0b8162b0a90f2e97028a531005c11b09441498 +#ifdef HAVE_OPENSSL if (!CC->redirect_ssl) { cprintf(""); } #endif +<<<<<<< HEAD +======= + */ +>>>>>>> 1c0b8162b0a90f2e97028a531005c11b09441498 if (!CC->logged_in) { /* If we're not logged in yet, offer SASL as our feature set */ xmpp_output_auth_mechs(); @@ -102,13 +241,22 @@ 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(""); +<<<<<<< HEAD cprintf(""); +======= +>>>>>>> 1c0b8162b0a90f2e97028a531005c11b09441498 + cprintf(""); + +<<<<<<< HEAD + +======= CC->is_async = 1; /* XMPP sessions are inherently async-capable */ } +>>>>>>> 1c0b8162b0a90f2e97028a531005c11b09441498 void xmpp_xml_start(void *data, const char *supplied_el, const char **attr) { char el[256]; char *sep = NULL; @@ -120,12 +268,21 @@ void xmpp_xml_start(void *data, const char *supplied_el, const char **attr) { strcpy(el, ++sep); } +<<<<<<< HEAD +#ifdef XMPP_DEBUG + syslog(LOG_DEBUG, "XMPP ELEMENT START: <%s>\n", el); + for (i=0; attr[i] != NULL; i+=2) { + syslog(LOG_DEBUG, " Attribute '%s' = '%s'\n", attr[i], attr[i+1]); + } +#endif /* XMPP_DEBUG */ +======= /* - CtdlLogPrintf(CTDL_DEBUG, "XMPP ELEMENT START: <%s>\n", el); + XMPP_syslog(LOG_DEBUG, "XMPP ELEMENT START: <%s>\n", el); for (i=0; attr[i] != NULL; i+=2) { - CtdlLogPrintf(CTDL_DEBUG, " Attribute '%s' = '%s'\n", attr[i], attr[i+1]); + XMPP_syslog(LOG_DEBUG, " Attribute '%s' = '%s'\n", attr[i], attr[i+1]); } uncomment for more verbosity */ +>>>>>>> 1c0b8162b0a90f2e97028a531005c11b09441498 if (!strcasecmp(el, "stream")) { xmpp_stream_start(data, supplied_el, attr); @@ -134,6 +291,46 @@ void xmpp_xml_start(void *data, const char *supplied_el, const char **attr) { else if (!strcasecmp(el, "query")) { XMPP->iq_query_xmlns[0] = 0; safestrncpy(XMPP->iq_query_xmlns, supplied_el, sizeof XMPP->iq_query_xmlns); +<<<<<<< HEAD + } + + else if (!strcasecmp(el, "bind")) { + XMPP->bind_requested = 1; + } + + else if (!strcasecmp(el, "iq")) { + for (i=0; attr[i] != NULL; i+=2) { + if (!strcasecmp(attr[i], "type")) { + safestrncpy(XMPP->iq_type, attr[i+1], sizeof XMPP->iq_type); + } + else if (!strcasecmp(attr[i], "id")) { + safestrncpy(XMPP->iq_id, attr[i+1], sizeof XMPP->iq_id); + } + else if (!strcasecmp(attr[i], "from")) { + safestrncpy(XMPP->iq_from, attr[i+1], sizeof XMPP->iq_from); + } + else if (!strcasecmp(attr[i], "to")) { + safestrncpy(XMPP->iq_to, attr[i+1], sizeof XMPP->iq_to); + } + } + } + + else if (!strcasecmp(el, "auth")) { + XMPP->sasl_auth_mech[0] = 0; + for (i=0; attr[i] != NULL; i+=2) { + if (!strcasecmp(attr[i], "mechanism")) { + safestrncpy(XMPP->sasl_auth_mech, attr[i+1], sizeof XMPP->sasl_auth_mech); + } + } + } + + else if (!strcasecmp(el, "message")) { + for (i=0; attr[i] != NULL; i+=2) { + if (!strcasecmp(attr[i], "to")) { + safestrncpy(XMPP->message_to, attr[i+1], sizeof XMPP->message_to); + } + } +======= } else if (!strcasecmp(el, "bind")) { @@ -184,6 +381,7 @@ 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 */ safestrncpy(el, supplied_el, sizeof el); @@ -192,12 +390,65 @@ void xmpp_xml_end(void *data, const char *supplied_el) { } /* - CtdlLogPrintf(CTDL_DEBUG, "XMPP ELEMENT END : <%s>\n", el); + XMPP_syslog(LOG_DEBUG, "XMPP ELEMENT END : <%s>\n", el); if (XMPP->chardata_len > 0) { - CtdlLogPrintf(CTDL_DEBUG, " chardata: %s\n", XMPP->chardata); + XMPP_syslog(LOG_DEBUG, " chardata: %s\n", XMPP->chardata); +>>>>>>> 1c0b8162b0a90f2e97028a531005c11b09441498 + } + +<<<<<<< HEAD + else if (!strcasecmp(el, "html")) { + ++XMPP->html_tag_level; + } +} + + + +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 */ + safestrncpy(el, supplied_el, sizeof el); + while (sep = strchr(el, ':'), sep) { + strcpy(el, ++sep); + } + +#ifdef XMPP_DEBUG + syslog(LOG_DEBUG, "XMPP ELEMENT END : <%s>\n", el); + if (XMPP->chardata_len > 0) { + syslog(LOG_DEBUG, " chardata: %s\n", XMPP->chardata); + } +#endif /* XMPP_DEBUG */ + + if (!strcasecmp(el, "resource")) { + if (XMPP->chardata_len > 0) { + safestrncpy(XMPP->iq_client_resource, XMPP->chardata, + sizeof XMPP->iq_client_resource); + striplt(XMPP->iq_client_resource); + } } - uncomment for more verbosity */ + 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); + 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); + striplt(XMPP->iq_client_password); + } + } + + else if (!strcasecmp(el, "iq")) { + +======= if (!strcasecmp(el, "resource")) { if (XMPP->chardata_len > 0) { safestrncpy(XMPP->iq_client_resource, XMPP->chardata, @@ -224,6 +475,7 @@ void xmpp_xml_end(void *data, const char *supplied_el) { else if (!strcasecmp(el, "iq")) { +>>>>>>> 1c0b8162b0a90f2e97028a531005c11b09441498 /* * iq type="get" (handle queries) */ @@ -243,23 +495,27 @@ void xmpp_xml_end(void *data, const char *supplied_el) { else if (XMPP->ping_requested) { cprintf("iq_from)) { - cprintf("to=\"%s\" ", XMPP->iq_from); + cprintf("to=\"%s\" ", xmlesc(xmlbuf, XMPP->iq_from, sizeof xmlbuf)); } if (!IsEmptyStr(XMPP->iq_to)) { - cprintf("from=\"%s\" ", XMPP->iq_to); + cprintf("from=\"%s\" ", xmlesc(xmlbuf, XMPP->iq_to, sizeof xmlbuf)); } - cprintf("id=\"%s\"/>", XMPP->iq_id); + cprintf("id=\"%s\"/>", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf)); } /* * Unknown query ... return the XML equivalent of a blank stare */ else { - CtdlLogPrintf(CTDL_DEBUG, - "Unknown query <%s> - returning \n", - el +<<<<<<< HEAD + syslog(LOG_DEBUG, +======= + XMPP_syslog(LOG_DEBUG, +>>>>>>> 1c0b8162b0a90f2e97028a531005c11b09441498 + "Unknown query <%s> - returning \n", + el ); - cprintf("", XMPP->iq_id); + cprintf("", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf)); cprintf("" "" "" @@ -304,21 +560,21 @@ void xmpp_xml_end(void *data, const char *supplied_el) { /* Tell the client what its JID is */ - cprintf("", XMPP->iq_id); + cprintf("", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf)); cprintf(""); - cprintf("%s", XMPP->client_jid); + cprintf("%s", xmlesc(xmlbuf, XMPP->client_jid, sizeof xmlbuf)); cprintf(""); cprintf(""); } else if (XMPP->iq_session) { - cprintf("", XMPP->iq_id); + cprintf("", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf)); cprintf(""); } else { - cprintf("", XMPP->iq_id); - cprintf("Don't know howto do '%s'!", XMPP->iq_type); + cprintf("", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf)); + cprintf("Don't know howto do '%s'!", xmlesc(xmlbuf, XMPP->iq_type, sizeof xmlbuf)); cprintf(""); } @@ -378,26 +634,44 @@ void xmpp_xml_end(void *data, const char *supplied_el) { #ifdef HAVE_OPENSSL cprintf(""); CtdlModuleStartCryptoMsgs(NULL, NULL, NULL); - if (!CC->redirect_ssl) CC->kill_me = 1; + if (!CC->redirect_ssl) CC->kill_me = KILLME_NO_CRYPTO; #else cprintf(""); - CC->kill_me = 1; + CC->kill_me = KILLME_NO_CRYPTO; #endif } else if (!strcasecmp(el, "ping")) { XMPP->ping_requested = 1; +<<<<<<< HEAD } else if (!strcasecmp(el, "stream")) { - CtdlLogPrintf(CTDL_DEBUG, "XMPP client shut down their stream\n"); + syslog(LOG_DEBUG, "XMPP client shut down their stream\n"); xmpp_massacre_roster(); cprintf("\n"); - CC->kill_me = 1; + CC->kill_me = KILLME_CLIENT_LOGGED_OUT; + } + + else if (!strcasecmp(el, "query")) { + // no action required here, we picked up the xmlns= parameter during xmpp_xml_start() + } + + else { + syslog(LOG_DEBUG, "Ignoring unknown tag <%s>\n", el); +======= + } + + else if (!strcasecmp(el, "stream")) { + XMPPM_syslog(LOG_DEBUG, "XMPP client shut down their stream\n"); + xmpp_massacre_roster(); + cprintf("\n"); + CC->kill_me = KILLME_CLIENT_LOGGED_OUT; } else { - CtdlLogPrintf(CTDL_DEBUG, "Ignoring unknown tag <%s>\n", el); + XMPP_syslog(LOG_DEBUG, "Ignoring unknown tag <%s>\n", el); +>>>>>>> 1c0b8162b0a90f2e97028a531005c11b09441498 } XMPP->chardata_len = 0; @@ -452,6 +726,7 @@ void xmpp_cleanup_function(void) { * Here's where our XMPP session begins its happy day. */ void xmpp_greeting(void) { + client_set_inbound_buf(4); strcpy(CC->cs_clientname, "XMPP session"); CC->session_specific_data = malloc(sizeof(citxmpp)); memset(XMPP, 0, sizeof(citxmpp)); @@ -461,8 +736,8 @@ void xmpp_greeting(void) { XMPP->xp = XML_ParserCreateNS("UTF-8", ':'); if (XMPP->xp == NULL) { - CtdlLogPrintf(CTDL_ALERT, "Cannot create XML parser!\n"); - CC->kill_me = 1; + syslog(LOG_ALERT, "Cannot create XML parser!\n"); + CC->kill_me = KILLME_XML_PARSER; return; } @@ -470,6 +745,17 @@ void xmpp_greeting(void) { XML_SetCharacterDataHandler(XMPP->xp, xmpp_xml_chardata); // XML_SetUserData(XMPP->xp, something...); + /* Prevent the "billion laughs" attack against expat by disabling + * internal entity expansion. With 2.x, forcibly stop the parser + * if an entity is declared - this is safer and a more obvious + * failure mode. With older versions, simply prevent expansion + * of such entities. */ +#ifdef HAVE_XML_STOPPARSER + XML_SetEntityDeclHandler(XMPP->xp, xmpp_entity_declaration); +#else + XML_SetDefaultHandler(XMPP->xp, NULL); +#endif + CC->can_receive_im = 1; /* This protocol is capable of receiving instant messages */ } @@ -484,11 +770,12 @@ void xmpp_command_loop(void) { time(&CC->lastcmd); rc = client_read_random_blob(stream_input, 30); if (rc > 0) { + syslog(LOG_DEBUG, "\033[32m%s\033[0m", ChrPtr(stream_input)); XML_Parse(XMPP->xp, ChrPtr(stream_input), rc, 0); } else { - CtdlLogPrintf(CTDL_ERR, "Client disconnected: ending session.\n"); - CC->kill_me = 1; + syslog(LOG_ERR, "client disconnected: ending session.\n"); + CC->kill_me = KILLME_CLIENT_DISCONNECTED; } FreeStrBuf(&stream_input); } @@ -519,8 +806,12 @@ 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) { @@ -531,13 +822,16 @@ CTDL_MODULE_INIT(xmpp) xmpp_async_loop, CitadelServiceXMPP ); - CtdlRegisterSessionHook(xmpp_cleanup_function, EVT_STOP); - CtdlRegisterSessionHook(xmpp_login_hook, EVT_LOGIN); - CtdlRegisterSessionHook(xmpp_logout_hook, EVT_LOGOUT); - CtdlRegisterSessionHook(xmpp_login_hook, EVT_UNSTEALTH); - CtdlRegisterSessionHook(xmpp_logout_hook, EVT_STEALTH); + 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); + CtdlRegisterSessionHook(xmpp_login_hook, EVT_UNSTEALTH, PRIO_UNSTEALTH + 1); + CtdlRegisterSessionHook(xmpp_logout_hook, EVT_STEALTH, PRIO_STEALTH + 1); + CtdlRegisterCleanupHook(xmpp_cleanup_events); + } - /* return our Subversion id for the Log */ - return "$Id$"; + /* return our module name for the log */ + return "xmpp"; }