X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fserv_xmpp.c;h=1e0f704b4a7a75f9bf2a30a6ee67172c709aa689;hb=57231d9bfac327b0754787f097be79bc83cf24c6;hp=0ccf6861eb4b4e693d29cbda82c5a6dfa78ff453;hpb=3e304fcdabe4753960b394108543819e52dc8aec;p=citadel.git diff --git a/citadel/modules/xmpp/serv_xmpp.c b/citadel/modules/xmpp/serv_xmpp.c index 0ccf6861e..1e0f704b4 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. @@ -23,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -44,6 +43,7 @@ #include #include #include +#define SHOW_ME_VAPPEND_PRINTF #include #include #include "citadel.h" @@ -52,7 +52,6 @@ #include "support.h" #include "config.h" #include "user_ops.h" -#include "policy.h" #include "database.h" #include "msgbase.h" #include "internet_addressing.h" @@ -60,35 +59,96 @@ #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; +HashList *XMPP_StartHandlers = NULL; +HashList *XMPP_EndHandlers = NULL; + +int XMPPSrvDebugEnable = 0; + +void XUnbuffer(void) +{ + citxmpp *Xmpp = XMPP; + + cputbuf(Xmpp->OutBuf); + FlushStrBuf(Xmpp->OutBuf); +} + +void XPutBody(const char *Str, long Len) +{ + StrBufXMLEscAppend(XMPP->OutBuf, NULL, Str, Len, 0); +} + +void XPutProp(const char *Str, long Len) +{ + StrEscAppend(XMPP->OutBuf, NULL, Str, 0, 1); +} + +void XPut(const char *Str, long Len) +{ + StrBufAppendBufPlain(XMPP->OutBuf, Str, Len, 0); +} +#define XPUT(CONSTSTR) XPut(CONSTSTR, sizeof(CONSTSTR) -1) + +void XPrintf(const char *Format, ...) +{ + va_list arg_ptr; + va_start(arg_ptr, Format); + StrBufVAppendPrintf(XMPP->OutBuf, Format, arg_ptr); + va_end(arg_ptr); +} + -/* We have just received a tag from the client, so send them ours */ +#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 +) { + XMPPM_syslog(LOG_WARNING, "Illegal entity declaration encountered; stopping parser."); + XML_StopParser(XMPP->xp, XML_FALSE); +} +#endif +/* + * 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) { + citxmpp *Xmpp = XMPP; + while (*attr) { if (!strcasecmp(attr[0], "to")) { - safestrncpy(XMPP->server_name, attr[1], sizeof XMPP->server_name); + safestrncpy(Xmpp->server_name, attr[1], sizeof Xmpp->server_name); } attr += 2; } - cprintf(""); - - cprintf("server_name); - cprintf("id=\"%08x\" ", CC->cs_pid); - cprintf("version=\"1.0\" "); - cprintf("xmlns:stream=\"http://etherx.jabber.org/streams\" "); - cprintf("xmlns=\"jabber:client\">"); + XPUT(""); + XPUT("server_name, strlen(Xmpp->server_name)); + XPUT("\" id=\""); + XPrintf("%08x\" ", CC->cs_pid); + XPUT("version=\"1.0\" " + "xmlns:stream=\"http://etherx.jabber.org/streams\" " + "xmlns=\"jabber:client\">" /* 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) + */ +#ifdef HAVE_OPENSSL if (!CC->redirect_ssl) { - cprintf(""); + XPUT(""); } #endif @@ -97,267 +157,289 @@ void xmpp_stream_start(void *data, const char *supplied_el, const char **attr) xmpp_output_auth_mechs(); /* Also offer non-SASL authentication */ - cprintf(""); + XPUT(""); } /* Offer binding and sessions as part of our feature set */ - cprintf(""); - cprintf(""); - - cprintf(""); + XPUT("" + "" + ""); CC->is_async = 1; /* XMPP sessions are inherently async-capable */ } +void xmpp_start_query(void *data, const char *supplied_el, const char **attr) +{ + XMPP->iq_query_xmlns[0] = 0; + safestrncpy(XMPP->iq_query_xmlns, supplied_el, sizeof XMPP->iq_query_xmlns); +} -void xmpp_xml_start(void *data, const char *supplied_el, const char **attr) { - char el[256]; - char *sep = NULL; - int i; - - /* Axe the namespace, we don't care about it */ - safestrncpy(el, supplied_el, sizeof el); - while (sep = strchr(el, ':'), sep) { - strcpy(el, ++sep); - } +void xmpp_start_bind(void *data, const char *supplied_el, const char **attr) +{ + XMPP->bind_requested = 1; +} - /* - CtdlLogPrintf(CTDL_DEBUG, "XMPP ELEMENT START: <%s>\n", el); +void xmpp_start_iq(void *data, const char *supplied_el, const char **attr) +{ + int i; for (i=0; attr[i] != NULL; i+=2) { - CtdlLogPrintf(CTDL_DEBUG, " Attribute '%s' = '%s'\n", attr[i], attr[i+1]); - } - uncomment for more verbosity */ - - if (!strcasecmp(el, "stream")) { - xmpp_stream_start(data, supplied_el, attr); - } - - else if (!strcasecmp(el, "query")) { - XMPP->iq_query_xmlns[0] = 0; - safestrncpy(XMPP->iq_query_xmlns, supplied_el, sizeof XMPP->iq_query_xmlns); + 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, "bind")) { - XMPP->bind_requested = 1; - } +void xmpp_start_auth(void *data, const char *supplied_el, const char **attr) +{ + int i; - 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); - } + 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, "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); - } - } - } +void xmpp_start_message(void *data, const char *supplied_el, const char **attr) +{ + int i; - 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); - } + 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, "html")) { - ++XMPP->html_tag_level; - } } +void xmpp_start_html(void *data, const char *supplied_el, const char **attr) +{ + ++XMPP->html_tag_level; +} - -void xmpp_xml_end(void *data, const char *supplied_el) { +void xmpp_xml_start(void *data, const char *supplied_el, const char **attr) +{ char el[256]; + long newlen; + long len; char *sep = NULL; - + void *pv; + /* Axe the namespace, we don't care about it */ - safestrncpy(el, supplied_el, sizeof el); - while (sep = strchr(el, ':'), sep) { - strcpy(el, ++sep); + newlen = len = safestrncpy(el, supplied_el, sizeof el); + while (sep = strchr(el, ':'), sep) + { + newlen -= ++sep - el; + memmove(el, sep, newlen + 1); + len = newlen; } /* - CtdlLogPrintf(CTDL_DEBUG, "XMPP ELEMENT END : <%s>\n", el); - if (XMPP->chardata_len > 0) { - CtdlLogPrintf(CTDL_DEBUG, " chardata: %s\n", XMPP->chardata); + XMPP_syslog(LOG_DEBUG, "XMPP ELEMENT START: <%s>\n", el); + for (i=0; attr[i] != NULL; i+=2) { + XMPP_syslog(LOG_DEBUG, " Attribute '%s' = '%s'\n", attr[i], attr[i+1]); } uncomment for more verbosity */ - 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); - } + if (GetHash(XMPP_StartHandlers, el, len, &pv)) + { + xmpp_handler *h; + h = (xmpp_handler*) pv; + h->Handler(data, supplied_el, attr); } +} - 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); - } +void xmpp_end_resource(void *data, const char *supplied_el, const char **attr) +{ + if (XMPP->chardata_len > 0) { + safestrncpy(XMPP->iq_client_resource, XMPP->chardata, + sizeof XMPP->iq_client_resource); + striplt(XMPP->iq_client_resource); } +} - 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); - } +void xmpp_end_username(void *data, const char *supplied_el, const char **attr) +{ + /* 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, "iq")) { +void xmpp_end_password(void *data, const char *supplied_el, const char **attr) +{ /* 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); + } +} +void xmpp_end_iq(void *data, const char *supplied_el, const char **attr) +{ + citxmpp *Xmpp = XMPP; + + /* + * iq type="get" (handle queries) + */ + if (!strcasecmp(Xmpp->iq_type, "get")) + { /* - * iq type="get" (handle queries) + * Query on a namespace */ - if (!strcasecmp(XMPP->iq_type, "get")) { - - /* - * 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); - } - - /* - * ping ( http://xmpp.org/extensions/xep-0199.html ) - */ - else if (XMPP->ping_requested) { - cprintf("iq_from)) { - cprintf("to=\"%s\" ", XMPP->iq_from); - } - if (!IsEmptyStr(XMPP->iq_to)) { - cprintf("from=\"%s\" ", XMPP->iq_to); - } - cprintf("id=\"%s\"/>", XMPP->iq_id); - } - - /* - * Unknown query ... return the XML equivalent of a blank stare - */ - else { - CtdlLogPrintf(CTDL_DEBUG, - "Unknown query <%s> - returning \n", - el - ); - cprintf("", XMPP->iq_id); - cprintf("" - "" - "" - ); - cprintf(""); - } + if (!IsEmptyStr(Xmpp->iq_query_xmlns)) { + xmpp_query_namespace(Xmpp->iq_id, Xmpp->iq_from, + Xmpp->iq_to, Xmpp->iq_query_xmlns); } - + /* - * Non SASL authentication + * ping ( http://xmpp.org/extensions/xep-0199.html ) */ - 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 - ); - } + else if (Xmpp->ping_requested) { + XPUT("iq_from)) { + XPUT("to=\""); + XPutProp(Xmpp->iq_from, strlen(Xmpp->iq_from)); + XPUT("\" "); + } + if (!IsEmptyStr(Xmpp->iq_to)) { + XPUT("from=\""); + XPutProp(Xmpp->iq_to, strlen(Xmpp->iq_to)); + XPUT("\" "); + } + XPUT("id=\""); + XPutProp(Xmpp->iq_id, strlen(Xmpp->iq_id)); + XPUT("\"/>"); + } /* - * If this stanza was a "bind" attempt, process it ... + * Unknown query ... return the XML equivalent of a blank stare */ - 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 */ - - 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("", XMPP->iq_id); - cprintf(""); - cprintf("%s", XMPP->client_jid); - cprintf(""); - cprintf(""); - } - - else if (XMPP->iq_session) { - cprintf("", XMPP->iq_id); - cprintf(""); - } - else { - cprintf("", XMPP->iq_id); - cprintf(""); - cprintf(""); +/* + Xmpp_syslog(LOG_DEBUG, + "Unknown query <%s> - returning \n", + el + ); +*/ + XPUT("iq_id, strlen(Xmpp->iq_id)); + XPUT("\">" + "" + "" + "" + ""); } + } - /* Now clear these fields out so they don't get used by a future stanza */ - XMPP->iq_id[0] = 0; - XMPP->iq_from[0] = 0; - XMPP->iq_to[0] = 0; - XMPP->iq_type[0] = 0; - XMPP->iq_client_resource[0] = 0; - XMPP->iq_session = 0; - XMPP->iq_query_xmlns[0] = 0; - XMPP->bind_requested = 0; - XMPP->ping_requested = 0; + /* + * Non SASL authentication + */ + 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 + ); } - else if (!strcasecmp(el, "auth")) { + /* + * If this stanza was a "bind" attempt, process it ... + */ + 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 */ + + snprintf(Xmpp->client_jid, sizeof Xmpp->client_jid, + "%s/%s", + CC->cs_inet_email, + Xmpp->iq_client_resource + ); - /* Try to authenticate (this function is responsible for the output stanza) */ - xmpp_sasl_auth(XMPP->sasl_auth_mech, (XMPP->chardata != NULL ? XMPP->chardata : "") ); + /* Tell the client what its JID is */ - /* Now clear these fields out so they don't get used by a future stanza */ - XMPP->sasl_auth_mech[0] = 0; + XPUT("iq_id, strlen(Xmpp->iq_id)); + XPUT("\">" + ""); + XPUT(""); + XPutBody(Xmpp->client_jid, strlen(Xmpp->client_jid)); + XPUT("" + "" + ""); } - else if (!strcasecmp(el, "session")) { - XMPP->iq_session = 1; + else if (Xmpp->iq_session) { + XPUT("iq_id, strlen(Xmpp->iq_id)); + XPUT("\">" + ""); } - else if (!strcasecmp(el, "presence")) { + else { + XPUT("iq_id, strlen(Xmpp->iq_id)); + XPUT("\">"); + XPUT("Don't know howto do '"); + XPutBody(Xmpp->iq_type, strlen(Xmpp->iq_type)); + XPUT("'!" + ""); + } + + /* Now clear these fields out so they don't get used by a future stanza */ + Xmpp->iq_id[0] = 0; + Xmpp->iq_from[0] = 0; + Xmpp->iq_to[0] = 0; + Xmpp->iq_type[0] = 0; + Xmpp->iq_client_resource[0] = 0; + Xmpp->iq_session = 0; + Xmpp->iq_query_xmlns[0] = 0; + Xmpp->bind_requested = 0; + Xmpp->ping_requested = 0; +} - /* Respond to a update by firing back with presence information - * on the entire wholist. Check this assumption, it's probably wrong. - */ - xmpp_wholist_presence_dump(); - } - else if ( (!strcasecmp(el, "body")) && (XMPP->html_tag_level == 0) ) { - if (XMPP->message_body != NULL) { +void xmpp_end_auth(void *data, const char *supplied_el, const char **attr) +{ + /* Try to authenticate (this function is responsible for the output stanza) */ + xmpp_sasl_auth(XMPP->sasl_auth_mech, (XMPP->chardata != NULL ? XMPP->chardata : "") ); + + /* Now clear these fields out so they don't get used by a future stanza */ + XMPP->sasl_auth_mech[0] = 0; +} + +void xmpp_end_session(void *data, const char *supplied_el, const char **attr) +{ + XMPP->iq_session = 1; +} + +void xmpp_end_body(void *data, const char *supplied_el, const char **attr) +{ + if (XMPP->html_tag_level == 0) + { + if (XMPP->message_body != NULL) + { free(XMPP->message_body); XMPP->message_body = NULL; } @@ -365,39 +447,72 @@ void xmpp_xml_end(void *data, const char *supplied_el) { XMPP->message_body = strdup(XMPP->chardata); } } +} - else if (!strcasecmp(el, "message")) { - xmpp_send_message(XMPP->message_to, XMPP->message_body); - XMPP->html_tag_level = 0; - } - - else if (!strcasecmp(el, "html")) { - --XMPP->html_tag_level; - } +void xmpp_end_html(void *data, const char *supplied_el, const char **attr) +{ + --XMPP->html_tag_level; +} - else if (!strcasecmp(el, "starttls")) { +void xmpp_end_starttls(void *data, const char *supplied_el, const char **attr) +{ #ifdef HAVE_OPENSSL - cprintf(""); - CtdlModuleStartCryptoMsgs(NULL, NULL, NULL); - if (!CC->redirect_ssl) CC->kill_me = 1; + XPUT(""); + XUnbuffer(); + CtdlModuleStartCryptoMsgs(NULL, NULL, NULL); + if (!CC->redirect_ssl) CC->kill_me = KILLME_NO_CRYPTO; #else - cprintf(""); - CC->kill_me = 1; + XPUT(""); + CC->kill_me = KILLME_NO_CRYPTO; #endif - } +} + +void xmpp_end_ping(void *data, const char *supplied_el, const char **attr) +{ + XMPP->ping_requested = 1; +} + +void xmpp_end_stream(void *data, const char *supplied_el, const char **attr) +{ + XMPPM_syslog(LOG_DEBUG, "XMPP client shut down their stream\n"); + xmpp_massacre_roster(); + XPUT("\n"); + CC->kill_me = KILLME_CLIENT_LOGGED_OUT; +} + +void xmpp_xml_end(void *data, const char *supplied_el) +{ + char el[256]; + long len; + long newlen; + char *sep = NULL; + void *pv; - else if (!strcasecmp(el, "ping")) { - XMPP->ping_requested = 1; + /* Axe the namespace, we don't care about it */ + newlen = len = safestrncpy(el, supplied_el, sizeof el); + while (sep = strchr(el, ':'), sep) { + + newlen -= ++sep - el; + memmove(el, sep, newlen + 1); + len = newlen; } - else if (!strcasecmp(el, "stream")) { - CtdlLogPrintf(CTDL_DEBUG, "XMPP client shut down their stream\n"); - cprintf("\n"); - CC->kill_me = 1; + /* + XMPP_syslog(LOG_DEBUG, "XMPP ELEMENT END : <%s>\n", el); + if (XMPP->chardata_len > 0) { + XMPP_syslog(LOG_DEBUG, " chardata: %s\n", XMPP->chardata); } + uncomment for more verbosity */ - else { - CtdlLogPrintf(CTDL_DEBUG, "Ignoring unknown tag <%s>\n", el); + if (GetHash(XMPP_EndHandlers, el, len, &pv)) + { + xmpp_handler *h; + h = (xmpp_handler*) pv; + h->Handler(data, supplied_el, NULL); + } + else + { + XMPP_syslog(LOG_DEBUG, "Ignoring unknown tag <%s>\n", el); } XMPP->chardata_len = 0; @@ -409,7 +524,7 @@ void xmpp_xml_end(void *data, const char *supplied_el) { void xmpp_xml_chardata(void *data, const XML_Char *s, int len) { - struct citxmpp *X = XMPP; + citxmpp *X = XMPP; if (X->chardata_alloc == 0) { X->chardata_alloc = SIZ; @@ -443,6 +558,7 @@ void xmpp_cleanup_function(void) { } } XML_ParserFree(XMPP->xp); + FreeStrBuf(&XMPP->OutBuf); free(XMPP); } @@ -452,17 +568,18 @@ 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(struct citxmpp)); - memset(XMPP, 0, sizeof(struct citxmpp)); + CC->session_specific_data = malloc(sizeof(citxmpp)); + memset(XMPP, 0, sizeof(citxmpp)); XMPP->last_event_processed = queue_event_seq; - + XMPP->OutBuf = NewStrBufPlain(NULL, SIZ); /* XMPP does not use a greeting, but we still have to initialize some things. */ XMPP->xp = XML_ParserCreateNS("UTF-8", ':'); if (XMPP->xp == NULL) { - CtdlLogPrintf(CTDL_ALERT, "Cannot create XML parser!\n"); - CC->kill_me = 1; + XMPPM_syslog(LOG_ALERT, "Cannot create XML parser!\n"); + CC->kill_me = KILLME_XML_PARSER; return; } @@ -470,7 +587,19 @@ 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 */ + XUnbuffer(); } @@ -478,21 +607,20 @@ void xmpp_greeting(void) { * Main command loop for XMPP sessions. */ void xmpp_command_loop(void) { - char cmdbuf[16]; - int retval; + int rc; + StrBuf *stream_input = NewStrBuf(); time(&CC->lastcmd); - memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */ - retval = client_read(cmdbuf, 1); - if (retval != 1) { - CtdlLogPrintf(CTDL_ERR, "Client disconnected: ending session.\r\n"); - CC->kill_me = 1; - return; + rc = client_read_random_blob(stream_input, 30); + if (rc > 0) { + XML_Parse(XMPP->xp, ChrPtr(stream_input), rc, 0); } - - /* FIXME ... this is woefully inefficient. */ - - XML_Parse(XMPP->xp, cmdbuf, 1, 0); + else { + XMPPM_syslog(LOG_ERR, "client disconnected: ending session.\n"); + CC->kill_me = KILLME_CLIENT_DISCONNECTED; + } + FreeStrBuf(&stream_input); + XUnbuffer(); } @@ -521,7 +649,42 @@ void xmpp_logout_hook(void) { } +void LogXMPPSrvDebugEnable(const int n) +{ + XMPPSrvDebugEnable = n; +} const char *CitadelServiceXMPP="XMPP"; +extern void xmpp_cleanup_events(void); + + + +/****************************************************************************** + * XMPP handler registering logic * + ******************************************************************************/ + +void AddXMPPStartHandler(const char *key, + long len, + xmpp_handler_func Handler, + int Flags) +{ + xmpp_handler *h; + h = (xmpp_handler*) malloc(sizeof (xmpp_handler)); + h->Flags = Flags; + h->Handler = Handler; + Put(XMPP_StartHandlers, key, len, h, NULL); +} + +void AddXMPPEndHandler(const char *key, + long len, + xmpp_handler_func Handler, + int Flags) +{ + xmpp_handler *h; + h = (xmpp_handler*) malloc(sizeof (xmpp_handler)); + h->Flags = Flags; + h->Handler = Handler; + Put(XMPP_EndHandlers, key, len, h, NULL); +} CTDL_MODULE_INIT(xmpp) { @@ -532,13 +695,42 @@ CTDL_MODULE_INIT(xmpp) xmpp_command_loop, 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); + + + XMPP_StartHandlers = NewHash(1, NULL); + XMPP_EndHandlers = NewHash(1, NULL); + + AddXMPPEndHandler(HKEY("resource"), xmpp_end_resource, 0); + AddXMPPEndHandler(HKEY("username"), xmpp_end_username, 0); + AddXMPPEndHandler(HKEY("password"), xmpp_end_password, 0); + AddXMPPEndHandler(HKEY("iq"), xmpp_end_iq, 0); + AddXMPPEndHandler(HKEY("auth"), xmpp_end_auth, 0); + AddXMPPEndHandler(HKEY("session"), xmpp_end_session, 0); + AddXMPPEndHandler(HKEY("body"), xmpp_end_body, 0); + AddXMPPEndHandler(HKEY("html"), xmpp_end_html, 0); + AddXMPPEndHandler(HKEY("starttls"), xmpp_end_starttls, 0); + AddXMPPEndHandler(HKEY("ping"), xmpp_end_ping, 0); + AddXMPPEndHandler(HKEY("stream"), xmpp_end_stream, 0); + + AddXMPPStartHandler(HKEY("stream"), xmpp_stream_start, 0); + AddXMPPStartHandler(HKEY("query"), xmpp_start_query, 0); + AddXMPPStartHandler(HKEY("bind"), xmpp_start_bind, 0); + AddXMPPStartHandler(HKEY("iq"), xmpp_start_iq, 0); + AddXMPPStartHandler(HKEY("auth"), xmpp_start_auth, 0); + AddXMPPStartHandler(HKEY("message"), xmpp_start_message, 0); + AddXMPPStartHandler(HKEY("html"), xmpp_start_html, 0); + + + 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"; }