/*
* XMPP (Jabber) service for the Citadel system
- * Copyright (c) 2007-2011 by Art Cancro
+ * Copyright (c) 2007-2018 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
#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
#endif
struct xmpp_event *xmpp_queue = NULL;
-HashList *XMPP_StartHandlers = NULL;
-HashList *XMPP_EndHandlers = NULL;
-
-int XMPPSrvDebugEnable = 0;
-
#ifdef HAVE_XML_STOPPARSER
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
-static inline int XMPP_GetUtf8SequenceLength(const char *CharS, const char *CharE)
+
+/*
+ * 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.
+ */
+static inline int Ctdl_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);
}
-/*
- * 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;
+ int IsUtf8Sequence;
+ char *ptr, *pche;
unsigned char ch;
int inlen;
int len = 0;
- int IsUtf8Sequence;
if (!buf) return(NULL);
buf[0] = 0;
if (!str) {
return(buf);
}
-
inlen = strlen(str);
- eiptr = str + inlen;
+ pche = str + inlen;
for (ptr=str; *ptr; ptr++) {
ch = *ptr;
buf[len] = 0;
}
else {
- char oct[32];
-
- IsUtf8Sequence = XMPP_GetUtf8SequenceLength(&buf[len], eiptr);
+ IsUtf8Sequence = Ctdl_GetUtf8SequenceLength(ptr, pche);
if (IsUtf8Sequence)
{
- while (IsUtf8Sequence > 0){
+ while ((IsUtf8Sequence > 0) &&
+ (ptr < pche))
+ {
buf[len] = *ptr;
- len ++;
- if (--IsUtf8Sequence)
- ptr++;
+ ptr ++;
+ --IsUtf8Sequence;
}
- buf[len] = '\0';
}
else
{
+ char oct[10];
sprintf(oct, "&#%o;", ch);
strcpy(&buf[len], oct);
len += strlen(oct);
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_start_bind(void *data, const char *supplied_el, const char **attr)
-{
- XMPP->bind_requested = 1;
-}
-void xmpp_start_iq(void *data, const char *supplied_el, const char **attr)
-{
+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);
+ }
+
+#ifdef XMPP_XML_DEBUG
+ syslog(LOG_DEBUG, "xmpp: ELEMENT START: <%s>", el);
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);
- }
+ syslog(LOG_DEBUG, "xmpp: Attribute '%s' = '%s'", attr[i], attr[i+1]);
}
-}
+#endif
-void xmpp_start_auth(void *data, const char *supplied_el, const char **attr)
-{
- int i;
+ if (!strcasecmp(el, "stream")) {
+ xmpp_stream_start(data, supplied_el, attr);
+ }
- 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, "query")) {
+ XMPP->iq_query_xmlns[0] = 0;
+ safestrncpy(XMPP->iq_query_xmlns, supplied_el, sizeof XMPP->iq_query_xmlns);
+ }
+
+ 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);
+ }
}
}
-}
-void xmpp_start_message(void *data, const char *supplied_el, const char **attr)
-{
- int i;
+ 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);
+ }
+ }
+ }
- 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, "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);
+ }
}
}
-}
-void xmpp_start_html(void *data, const char *supplied_el, const char **attr)
-{
- ++XMPP->html_tag_level;
+ else if (!strcasecmp(el, "html")) {
+ ++XMPP->html_tag_level;
+ }
}
-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];
- long newlen;
- long len;
char *sep = NULL;
- void *pv;
-
+ char xmlbuf[256];
+
/* 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;
+ safestrncpy(el, supplied_el, sizeof el);
+ while (sep = strchr(el, ':'), sep) {
+ strcpy(el, ++sep);
}
- /*
- 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]);
+#ifdef XMPP_XML_DEBUG
+ syslog(LOG_DEBUG, "xmpp: ELEMENT END : <%s>", el);
+ if (XMPP->chardata_len > 0) {
+ syslog(LOG_DEBUG, "xmpp: chardata: %s", XMPP->chardata);
}
- uncomment for more verbosity */
+#endif
- if (GetHash(XMPP_StartHandlers, el, len, &pv))
- {
- xmpp_handler *h;
- h = (xmpp_handler*) pv;
- h->Handler(data, supplied_el, attr);
+ 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);
+ }
}
-}
-
-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, "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_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, "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_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);
- }
-}
+ else if (!strcasecmp(el, "iq")) {
-void xmpp_end_iq(void *data, const char *supplied_el, const char **attr)
-{
- char xmlbuf[256];
- /*
- * iq type="get" (handle queries)
- */
- 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 )
+ * iq type="get" (handle queries)
*/
- else if (XMPP->ping_requested) {
- cprintf("<iq type=\"result\" ");
- if (!IsEmptyStr(XMPP->iq_from)) {
- cprintf("to=\"%s\" ", xmlesc(xmlbuf, XMPP->iq_from, sizeof xmlbuf));
+ 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 type=\"result\" ");
+ if (!IsEmptyStr(XMPP->iq_from)) {
+ cprintf("to=\"%s\" ", xmlesc(xmlbuf, XMPP->iq_from, sizeof xmlbuf));
+ }
+ if (!IsEmptyStr(XMPP->iq_to)) {
+ cprintf("from=\"%s\" ", xmlesc(xmlbuf, XMPP->iq_to, sizeof xmlbuf));
+ }
+ cprintf("id=\"%s\"/>", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf));
}
- if (!IsEmptyStr(XMPP->iq_to)) {
- cprintf("from=\"%s\" ", xmlesc(xmlbuf, XMPP->iq_to, sizeof xmlbuf));
+
+ /*
+ * Unknown query ... return the XML equivalent of a blank stare
+ */
+ else {
+ syslog(LOG_DEBUG, "xmpp: Unknown query <%s> - returning <service-unavailable/>", el);
+ cprintf("<iq type=\"error\" id=\"%s\">", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf));
+ cprintf("<error code=\"503\" type=\"cancel\">"
+ "<service-unavailable xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\"/>"
+ "</error>"
+ );
+ cprintf("</iq>");
}
- cprintf("id=\"%s\"/>", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf));
}
/*
- * Unknown query ... return the XML equivalent of a blank stare
+ * Non SASL authentication
*/
- else {
-/*
- XMPP_syslog(LOG_DEBUG,
- "Unknown query <%s> - returning <service-unavailable/>\n",
- el
- );
-*/
- cprintf("<iq type=\"error\" id=\"%s\">", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf));
- cprintf("<error code=\"503\" type=\"cancel\">"
- "<service-unavailable xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\"/>"
- "</error>"
- );
- cprintf("</iq>");
- }
- }
-
- /*
- * 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(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
);
- }
+ }
- /*
- * If this <iq> stanza was a "bind" attempt, process it ...
- */
- else if (
- (XMPP->bind_requested)
- && (!IsEmptyStr(XMPP->iq_id))
- && (!IsEmptyStr(XMPP->iq_client_resource))
- && (CC->logged_in)
+ /*
+ * If this <iq> stanza was a "bind" attempt, process it ...
+ */
+ else if (
+ (XMPP->bind_requested)
+ && (!IsEmptyStr(XMPP->iq_id))
+ && (CC->logged_in)
) {
- /* Generate the "full JID" of the client resource */
+ /* If the client has not specified a client resource, generate one */
- snprintf(XMPP->client_jid, sizeof XMPP->client_jid,
- "%s/%s",
- CC->cs_inet_email,
- XMPP->iq_client_resource
- );
+ if (IsEmptyStr(XMPP->iq_client_resource)) {
+ snprintf(XMPP->iq_client_resource, sizeof XMPP->iq_client_resource, "%d", CC->cs_pid);
+ }
- /* Tell the client what its JID is */
+ /* 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);
- cprintf("<iq type=\"result\" id=\"%s\">", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf));
- cprintf("<bind xmlns=\"urn:ietf:params:xml:ns:xmpp-bind\">");
- cprintf("<jid>%s</jid>", xmlesc(xmlbuf, XMPP->client_jid, sizeof xmlbuf));
- cprintf("</bind>");
- cprintf("</iq>");
- }
+ /* Tell the client what its JID is */
+
+ cprintf("<iq type=\"result\" id=\"%s\">", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf));
+ cprintf("<bind xmlns=\"urn:ietf:params:xml:ns:xmpp-bind\">");
+ cprintf("<jid>%s</jid>", xmlesc(xmlbuf, XMPP->client_jid, sizeof xmlbuf));
+ cprintf("</bind>");
+ cprintf("</iq>");
+ }
+
+ else if (XMPP->iq_session) {
+ cprintf("<iq type=\"result\" id=\"%s\">", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf));
+ cprintf("</iq>");
+ }
- else if (XMPP->iq_session) {
- cprintf("<iq type=\"result\" id=\"%s\">", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf));
- cprintf("</iq>");
+ else {
+ cprintf("<iq type=\"error\" id=\"%s\">", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf));
+ cprintf("<error>Don't know how to do '%s'!</error>", xmlesc(xmlbuf, XMPP->iq_type, sizeof xmlbuf));
+ cprintf("</iq>");
+ 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 */
+ 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;
}
- else {
- cprintf("<iq type=\"error\" id=\"%s\">", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf));
- cprintf("<error>Don't know howto do '%s'!</error>", xmlesc(xmlbuf, XMPP->iq_type, sizeof xmlbuf));
- cprintf("</iq>");
- }
-
- /* 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;
-}
+ 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 : "") );
-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;
-}
+ /* 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;
-}
+ else if (!strcasecmp(el, "session")) {
+ XMPP->iq_session = 1;
+ }
-void xmpp_end_presence(void *data, const char *supplied_el, const char **attr)
-{
- /* Respond to a <presence> 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, "presence")) {
-void xmpp_end_body(void *data, const char *supplied_el, const char **attr)
-{
- if (XMPP->html_tag_level == 0)
- {
- if (XMPP->message_body != NULL)
- {
+ /* Respond to a <presence> 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) {
free(XMPP->message_body);
XMPP->message_body = NULL;
}
XMPP->message_body = strdup(XMPP->chardata);
}
}
-}
-void xmpp_end_message(void *data, const char *supplied_el, const char **attr)
-{
- xmpp_send_message(XMPP->message_to, XMPP->message_body);
- XMPP->html_tag_level = 0;
-}
+ else if (!strcasecmp(el, "message")) {
+ xmpp_send_message(XMPP->message_to, XMPP->message_body);
+ XMPP->html_tag_level = 0;
+ }
-void xmpp_end_html(void *data, const char *supplied_el, const char **attr)
-{
- --XMPP->html_tag_level;
-}
+ else if (!strcasecmp(el, "html")) {
+ --XMPP->html_tag_level;
+ }
-void xmpp_end_starttls(void *data, const char *supplied_el, const char **attr)
-{
+ else if (!strcasecmp(el, "starttls")) {
#ifdef HAVE_OPENSSL
- cprintf("<proceed xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>");
- CtdlModuleStartCryptoMsgs(NULL, NULL, NULL);
- if (!CC->redirect_ssl) CC->kill_me = KILLME_NO_CRYPTO;
+ cprintf("<proceed xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>");
+ CtdlModuleStartCryptoMsgs(NULL, NULL, NULL);
+ if (!CC->redirect_ssl) CC->kill_me = KILLME_NO_CRYPTO;
#else
- cprintf("<failure xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>");
- CC->kill_me = KILLME_NO_CRYPTO;
+ cprintf("<failure xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>");
+ 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();
- cprintf("</stream>\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;
+ }
- /* Axe the namespace, we don't care about it */
- newlen = len = safestrncpy(el, supplied_el, sizeof el);
- while (sep = strchr(el, ':'), sep) {
+ else if (!strcasecmp(el, "ping")) {
+ XMPP->ping_requested = 1;
+ }
- newlen -= ++sep - el;
- memmove(el, sep, newlen + 1);
- len = newlen;
+ else if (!strcasecmp(el, "stream")) {
+ syslog(LOG_DEBUG, "xmpp: client shut down their stream");
+ xmpp_massacre_roster();
+ cprintf("</stream>\n");
+ CC->kill_me = KILLME_CLIENT_LOGGED_OUT;
}
- /*
- XMPP_syslog(LOG_DEBUG, "XMPP ELEMENT END : <%s>\n", el);
- if (XMPP->chardata_len > 0) {
- XMPP_syslog(LOG_DEBUG, " chardata: %s\n", XMPP->chardata);
+ else if (!strcasecmp(el, "query")) {
+ /* already processed , no further action needed here */
}
- uncomment for more verbosity */
- if (GetHash(XMPP_EndHandlers, el, len, &pv))
- {
- xmpp_handler *h;
- h = (xmpp_handler*) pv;
- h->Handler(data, supplied_el, NULL);
+ else if (!strcasecmp(el, "bind")) {
+ /* already processed , no further action needed here */
}
- else
- {
- XMPP_syslog(LOG_DEBUG, "Ignoring unknown tag <%s>\n", el);
+
+ else {
+ syslog(LOG_DEBUG, "xmpp: ignoring unknown tag <%s>", el);
}
XMPP->chardata_len = 0;
}
-
/*
* Here's where our XMPP session begins its happy day.
*/
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;
}
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);
}
-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)
{
if (!threading) {
- CtdlRegisterServiceHook(config.c_xmpp_c2s_port,
+ CtdlRegisterServiceHook(CtdlGetConfigInt("c_xmpp_c2s_port"),
NULL,
xmpp_greeting,
xmpp_command_loop,
xmpp_async_loop,
- CitadelServiceXMPP);
-
-
- 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("presence"), xmpp_end_presence, 0);
- AddXMPPEndHandler(HKEY("body"), xmpp_end_body, 0);
- AddXMPPEndHandler(HKEY("message"), xmpp_end_message, 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);
+ CitadelServiceXMPP
+ );
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);