From: Wilfried Goesgens Date: Wed, 31 Dec 2014 12:23:47 +0000 (+0100) Subject: Revert xmpp back to a working state X-Git-Tag: v9.01~60 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=e7c125bafc3bd24fd9cfb18c39b29abd19c7478f Revert xmpp back to a working state --- diff --git a/citadel/modules/xmpp/serv_xmpp.c b/citadel/modules/xmpp/serv_xmpp.c index 424c0fdbb..7986cb573 100644 --- a/citadel/modules/xmpp/serv_xmpp.c +++ b/citadel/modules/xmpp/serv_xmpp.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include @@ -43,7 +42,6 @@ #include #include #include -#define SHOW_ME_VAPPEND_PRINTF #include #include #include "citadel.h" @@ -64,508 +62,426 @@ #define HAVE_XML_STOPPARSER #endif -HashList *XMPP_StartHandlers = NULL; -HashList *XMPP_EndHandlers = NULL; -HashList *XMPP_SupportedNamespaces = NULL; -HashList *XMPP_NameSpaces = NULL; -HashList *FlatToken = NULL; +struct xmpp_event *xmpp_queue = 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); +#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 -void XPutProp(const char *Str, long Len) +static inline int XMPP_GetUtf8SequenceLength(const char *CharS, const char *CharE) { - StrEscAppend(XMPP->OutBuf, NULL, Str, 0, 1); -} + /* if this is is migrated to strbuf, remove this copy. */ + int n = 0; + unsigned char test = (1<<7); -void XPut(const char *Str, long Len) -{ - StrBufAppendBufPlain(XMPP->OutBuf, Str, Len, 0); -} + if ((*CharS & 0xC0) != 0xC0) + return 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); + while ((n < 8) && + ((test & ((unsigned char)*CharS)) != 0)) + { + test = test >> 1; + n ++; + } + if ((n > 6) || ((CharE - CharS) < n)) + n = 0; + return n; } -void XPrint(const char *Token, long tlen, - int Flags, - ...) +/* + * 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]; -{ - int BodySeen = 0; - int ArgType; - int Finished = 0; - char *PName; - long PLen; - char *Val; - long VLen; - va_list arg_ptr; - - XPUT("<"); - XPut(Token, tlen); - - va_start(arg_ptr, Flags); - while (!Finished) - { - ArgType = va_arg(arg_ptr, int); - switch (ArgType) - { - case TYPE_STR: - PName = va_arg(arg_ptr, char*); - PLen = va_arg(arg_ptr, long); - Val = va_arg(arg_ptr, char*); - VLen = va_arg(arg_ptr, long); - XPUT(" "); - XPut(PName, PLen); - XPUT("=\""); - XPutProp(Val, VLen); - XPUT("\""); - break; - case TYPE_OPTSTR: - PName = va_arg(arg_ptr, char*); - PLen = va_arg(arg_ptr, long); - Val = va_arg(arg_ptr, char*); - VLen = va_arg(arg_ptr, long); - if (VLen > 0) + IsUtf8Sequence = XMPP_GetUtf8SequenceLength(&buf[len], eiptr); + if (IsUtf8Sequence) { - XPUT(" "); - XPut(PName, PLen); - XPUT("=\""); - XPutProp(Val, VLen); - XPUT("\""); + 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); } - break; - case TYPE_INT: - PName = va_arg(arg_ptr, char*); - PLen = va_arg(arg_ptr, long); - VLen = va_arg(arg_ptr, long); - XPUT(" "); - XPut(PName, PLen); - XPUT("=\""); - XPrintf("%ld", VLen); - XPUT("\""); - break; - case TYPE_BODYSTR: - BodySeen = 1; - XPUT(">"); - Val = va_arg(arg_ptr, char*); - VLen = va_arg(arg_ptr, long); - XPutBody(Val, VLen); - break; - case TYPE_ARGEND: - Finished = 1; - break; - } - } - if (Flags == XCLOSED) - { - if (BodySeen) - { - XPUT(""); } - else - { - XPUT(">"); + if ((len + 6) > bufsiz) { + return(buf); } } - else - XPUT(">"); - va_end(arg_ptr); + return(buf); } -#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; + char xmlbuf[256]; 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; } - XPUT(""); + cprintf(""); + + cprintf("server_name, sizeof xmlbuf)); + cprintf("id=\"%08x\" ", CC->cs_pid); + cprintf("version=\"1.0\" "); + cprintf("xmlns:stream=\"http://etherx.jabber.org/streams\" "); + cprintf("xmlns=\"jabber:client\">"); - 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(""); /* * TLS encryption (but only if it isn't already active) - */ - + * / #ifdef HAVE_OPENSSL if (!CC->redirect_ssl) { - XPUT(""); + cprintf(""); } #endif - //*/ + */ if (!CC->logged_in) { /* If we're not logged in yet, offer SASL as our feature set */ xmpp_output_auth_mechs(); /* Also offer non-SASL authentication */ - XPUT(""); + cprintf(""); } /* Offer binding and sessions as part of our feature set */ - XPUT("" - "" - ""); + cprintf(""); + cprintf(""); - CC->is_async = 1; /* XMPP sessions are inherently async-capable */ -} + cprintf(""); -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); + CC->is_async = 1; /* XMPP sessions are inherently async-capable */ } -void xmpp_start_bind(void *data, const char *supplied_el, const char **attr) -{ - XMPP->bind_requested = 1; -} -void xmpp_start_auth(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; - 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); - } + /* 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_message(void *data, const char *supplied_el, const char **attr) -{ - int i; + /* + XMPP_syslog(LOG_DEBUG, "XMPP ELEMENT START: <%s>\n", el); for (i=0; attr[i] != NULL; i+=2) { - if (!strcasecmp(attr[i], "to")) { - safestrncpy(XMPP->message_to, attr[i+1], sizeof XMPP->message_to); - } + XMPP_syslog(LOG_DEBUG, " Attribute '%s' = '%s'\n", attr[i], attr[i+1]); } -} -*/ -void xmpp_start_html(void *data, const char *supplied_el, const char **attr) -{ - ++XMPP->html_tag_level; -} + uncomment for more verbosity */ -void xmpp_xml_start(void *data, const char *supplied_el, const char **attr) -{ - HashList *ThisNamespace = NULL; - const char *pToken; - const char *pch; - const char *NS = NULL; - long NSLen; - long len; - void *pv; - - /* Axe the namespace, we don't care about it */ - pToken = supplied_el; - pch = strchr(pToken, ':'); - while (pch != NULL) - { - pToken = pch; - pch = strchr(pToken + 1, ':'); + if (!strcasecmp(el, "stream")) { + xmpp_stream_start(data, supplied_el, attr); } - if (*pToken == ':') - { - NS = supplied_el; - NSLen = pToken - supplied_el; - if (GetHash(XMPP_NameSpaces, NS, NSLen, &pv)) - { - ThisNamespace = pv; + 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); + } } - - pToken ++; } - len = strlen(pToken); + 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); + } + } + } - if (ThisNamespace != NULL) - { - if (GetHash(ThisNamespace, pToken, len, &pv)) - { - TokenHandler *th; - void *value; - long i = 0; + else if (!strcasecmp(el, "html")) { + ++XMPP->html_tag_level; + } +} - th = (TokenHandler*) pv; - value = th->GetToken(); - while (attr[i] != NULL) - { - if (GetHash(th->Properties, attr[i], strlen(attr[i]), &pv)) - { - PropertyHandler* ph = pv; - void *val; - StrBuf **pVal; - long len; - - len = strlen(attr[i+1]); - val = value; - val += ph->offset; - pVal = (StrBuf**) val; - if (*pVal != NULL) - StrBufPlain(*pVal, attr[i+1], len); - else - *pVal = NewStrBufPlain(attr[i+1], len); - } - i+=2; - } - return; - } +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); } + /* - 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]); + 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 */ - if (GetHash(XMPP_StartHandlers, pToken, len, &pv)) - { - xmpp_handler *h; - h = (xmpp_handler*) pv; - h->Handler(data, supplied_el, attr); - } -} - -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); + 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_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, "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_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, "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_iq(void *data, const char *supplied_el, const char **attr) -{ - citxmpp *Xmpp = XMPP; + else if (!strcasecmp(el, "iq")) { - /* - * iq type="get" (handle queries) - */ - if (!strcasecmp(ChrPtr(Xmpp->IQ.type), "get")) - { - /* - * Query on a namespace - */ - if (!IsEmptyStr(Xmpp->iq_query_xmlns)) { - xmpp_query_namespace(&Xmpp->IQ, Xmpp->iq_query_xmlns); - } - /* - * ping ( http://xmpp.org/extensions/xep-0199.html ) + * iq type="get" (handle queries) */ - else if (Xmpp->ping_requested) { - XPUT("IQ.from) > 0) { - XPUT("to=\""); - XPutSProp(Xmpp->IQ.from); - XPUT("\" "); + 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); } - if (StrLength(Xmpp->IQ.to)>0) { - XPUT("from=\""); - XPutSProp(Xmpp->IQ.to); - XPUT("\" "); + + /* + * ping ( http://xmpp.org/extensions/xep-0199.html ) + */ + else if (XMPP->ping_requested) { + cprintf("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)); + } + + /* + * Unknown query ... return the XML equivalent of a blank stare + */ + else { + XMPP_syslog(LOG_DEBUG, + "Unknown query <%s> - returning \n", + el + ); + cprintf("", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf)); + cprintf("" + "" + "" + ); + cprintf(""); } - XPUT("id=\""); - XPutSProp(Xmpp->IQ.id); - XPUT("\"/>"); } /* - * Unknown query ... return the XML equivalent of a blank stare + * 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 + ); + } + + /* + * 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 + ); + + /* 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)); + cprintf(""); + cprintf(""); + } + + else if (XMPP->iq_session) { + cprintf("", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf)); + cprintf(""); + } + else { -/* - Xmpp_syslog(LOG_DEBUG, - "Unknown query <%s> - returning \n", - el - ); -*/ - XPUT("IQ.id); - XPUT("\">" - "" - "" - "" - ""); + cprintf("", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf)); + cprintf("Don't know howto do '%s'!", xmlesc(xmlbuf, XMPP->iq_type, sizeof xmlbuf)); + cprintf(""); } - } - /* - * Non SASL authentication - */ - else if ( - (!strcasecmp(ChrPtr(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 - ); + /* 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; } - /* - * If this stanza was a "bind" attempt, process it ... - */ - else if ( - (Xmpp->bind_requested) - && (StrLength(Xmpp->IQ.id)>0) - && (!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 - ); + else if (!strcasecmp(el, "auth")) { - /* Tell the client what its JID is */ + /* Try to authenticate (this function is responsible for the output stanza) */ + xmpp_sasl_auth(XMPP->sasl_auth_mech, (XMPP->chardata != NULL ? XMPP->chardata : "") ); - XPUT("IQ.id); - XPUT("\">" - ""); - XPUT(""); - XPutBody(Xmpp->client_jid, strlen(Xmpp->client_jid)); - XPUT("" - "" - ""); + /* Now clear these fields out so they don't get used by a future stanza */ + XMPP->sasl_auth_mech[0] = 0; } - else if (Xmpp->iq_session) { - XPUT("IQ.id); - XPUT("\">" - ""); + else if (!strcasecmp(el, "session")) { + XMPP->iq_session = 1; } - else { - XPUT("IQ.id); - XPUT("\">"); - XPUT("Don't know howto do '"); - XPutBody(SKEY(Xmpp->IQ.type)); - XPUT("'!" - ""); - } - - /* Now clear these fields out so they don't get used by a future stanza */ - FlushStrBuf(Xmpp->IQ.id); - FlushStrBuf(Xmpp->IQ.from); - FlushStrBuf(Xmpp->IQ.to); - FlushStrBuf(Xmpp->IQ.type); - Xmpp->iq_client_resource[0] = 0; - Xmpp->iq_session = 0; - Xmpp->iq_query_xmlns[0] = 0; - Xmpp->bind_requested = 0; - Xmpp->ping_requested = 0; -} - - -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; -} + else if (!strcasecmp(el, "presence")) { -void xmpp_end_session(void *data, const char *supplied_el, const char **attr) -{ - XMPP->iq_session = 1; -} + /* 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(); + } -void xmpp_end_body(void *data, const char *supplied_el, const char **attr) -{ - if (XMPP->html_tag_level == 0) - { - if (XMPP->message_body != NULL) - { + else if ( (!strcasecmp(el, "body")) && (XMPP->html_tag_level == 0) ) { + if (XMPP->message_body != NULL) { free(XMPP->message_body); XMPP->message_body = NULL; } @@ -573,76 +489,40 @@ void xmpp_end_body(void *data, const char *supplied_el, const char **attr) XMPP->message_body = strdup(XMPP->chardata); } } -} -void xmpp_end_html(void *data, const char *supplied_el, const char **attr) -{ - --XMPP->html_tag_level; -} + else if (!strcasecmp(el, "message")) { + xmpp_send_message(XMPP->message_to, XMPP->message_body); + XMPP->html_tag_level = 0; + } -void xmpp_end_starttls(void *data, const char *supplied_el, const char **attr) -{ + else if (!strcasecmp(el, "html")) { + --XMPP->html_tag_level; + } + + else if (!strcasecmp(el, "starttls")) { #ifdef HAVE_OPENSSL - XPUT(""); - XUnbuffer(); - CtdlModuleStartCryptoMsgs(NULL, NULL, NULL); - if (!CC->redirect_ssl) CC->kill_me = KILLME_NO_CRYPTO; + cprintf(""); + CtdlModuleStartCryptoMsgs(NULL, NULL, NULL); + if (!CC->redirect_ssl) CC->kill_me = KILLME_NO_CRYPTO; #else - XPUT(""); - CC->kill_me = KILLME_NO_CRYPTO; + cprintf(""); + 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) -{ - const char *pToken; - const char *pch; - long len; - void *pv; - - /* Axe the namespace, we don't care about it */ - pToken = supplied_el; - pch = strchr(pToken, ':'); - while (pch != NULL) - { - pToken = pch; - pch = strchr(pToken + 1, ':'); } - if (*pToken == ':') - pToken ++; - - len = strlen(pToken); - - /* - 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, "ping")) { + XMPP->ping_requested = 1; } - uncomment for more verbosity */ - if (GetHash(XMPP_EndHandlers, pToken, len, &pv)) - { - xmpp_handler *h; - h = (xmpp_handler*) pv; - h->Handler(data, supplied_el, NULL); + 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 - { - XMPP_syslog(LOG_DEBUG, "Ignoring unknown tag <%s>\n", pToken); + + else { + XMPP_syslog(LOG_DEBUG, "Ignoring unknown tag <%s>\n", el); } XMPP->chardata_len = 0; @@ -687,10 +567,7 @@ void xmpp_cleanup_function(void) { free(XMPP->message_body); } } - free_buf_iq(&XMPP->IQ); - XML_ParserFree(XMPP->xp); - FreeStrBuf(&XMPP->OutBuf); free(XMPP); } @@ -705,7 +582,7 @@ void xmpp_greeting(void) { 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", ':'); @@ -731,7 +608,6 @@ void xmpp_greeting(void) { #endif CC->can_receive_im = 1; /* This protocol is capable of receiving instant messages */ - XUnbuffer(); } @@ -752,7 +628,6 @@ void xmpp_command_loop(void) { CC->kill_me = KILLME_CLIENT_DISCONNECTED; } FreeStrBuf(&stream_input); - XUnbuffer(); } @@ -786,118 +661,7 @@ void LogXMPPSrvDebugEnable(const int n) XMPPSrvDebugEnable = n; } const char *CitadelServiceXMPP="XMPP"; - - - -/****************************************************************************** - * 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); -} - -void HFreePropertyHandler(void *FreeMe) -{ - free(FreeMe); -} - -void HDeleteTokenHandler(void *FreeMe) -{ - TokenHandler *th = (TokenHandler *) FreeMe; - DeleteHash(&th->Properties); - free(th); -} - -void XMPP_RegisterTokenProperty(const char *NS, long NSLen, - const char *Token, long TLen, - const char *Property, long PLen, - GetTokenDataFunc GetToken, - long offset) -{ - void *pv; - HashList *ThisNamespace = NULL; - PropertyHandler *h; - TokenHandler *th; - - h = (PropertyHandler*) malloc(sizeof(PropertyHandler)); - h->NameSpace = NS; - h->NameSpaceLen = NSLen; - h->Token = Token; - h->TokenLen = TLen; - h->Property = Property; - h->PropertyLen = PLen; - h->offset = offset; - - if (!GetHash(XMPP_SupportedNamespaces, NS, NSLen, &pv)) - { - Put(XMPP_SupportedNamespaces, NS, NSLen, NewStrBufPlain(NS, NSLen), HFreeStrBuf); - } - - - if (GetHash(XMPP_NameSpaces, NS, NSLen, &pv)) - { - ThisNamespace = pv; - } - else - { - ThisNamespace = NewHash(1, NULL); - Put(XMPP_NameSpaces, NS, NSLen, ThisNamespace, HDeleteHash); - } - - if (GetHash(ThisNamespace, Token, TLen, &pv)) - { - th = pv; - } - else - { - th = (TokenHandler*) malloc (sizeof(TokenHandler)); - th->GetToken = GetToken; - th->Properties = NewHash(1, NULL); - Put(ThisNamespace, Token, TLen, th, HDeleteTokenHandler); - } - - - if (PLen > 0) - Put(th->Properties, Property, PLen, h, HFreePropertyHandler); - /* - if (!GetHash(FlatToken, Token, TLen, &pv)) - { - // todo mark pv as non uniq - Put(FlatToken, Token, TLen, ThisToken, reference_free_handler); - } - */ -} - -void xmpp_cleanup(void) -{ - DeleteHash(&XMPP_StartHandlers); - DeleteHash(&XMPP_EndHandlers); - DeleteHash(&XMPP_SupportedNamespaces); - DeleteHash(&XMPP_NameSpaces); - DeleteHash(&FlatToken); -} - +extern void xmpp_cleanup_events(void); CTDL_MODULE_INIT(xmpp) { if (!threading) { @@ -906,46 +670,18 @@ CTDL_MODULE_INIT(xmpp) xmpp_greeting, xmpp_command_loop, xmpp_async_loop, - CitadelServiceXMPP); - - - XMPP_StartHandlers = NewHash(1, NULL); - XMPP_EndHandlers = NewHash(1, NULL); - XMPP_NameSpaces = NewHash(1, NULL); - XMPP_SupportedNamespaces = NewHash(1, NULL); - FlatToken = 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("auth"), xmpp_start_auth, 0); -/// AddXMPPStartHandler(HKEY("message"), xmpp_start_message, 0); - AddXMPPStartHandler(HKEY("html"), xmpp_start_html, 0); - - + 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); CtdlRegisterSessionHook(xmpp_login_hook, EVT_UNSTEALTH, PRIO_UNSTEALTH + 1); CtdlRegisterSessionHook(xmpp_logout_hook, EVT_STEALTH, PRIO_STEALTH + 1); - CtdlRegisterCleanupHook(xmpp_cleanup); + CtdlRegisterCleanupHook(xmpp_cleanup_events); + } /* return our module name for the log */ return "xmpp"; } - - diff --git a/citadel/modules/xmpp/serv_xmpp.h b/citadel/modules/xmpp/serv_xmpp.h index b8133cdbb..c3281a5c4 100644 --- a/citadel/modules/xmpp/serv_xmpp.h +++ b/citadel/modules/xmpp/serv_xmpp.h @@ -16,12 +16,7 @@ * */ -#include "xmpp_xmacros.h" -#include "xmpp_util.h" - - typedef struct _citxmpp { /* Information about the current session */ - StrBuf *OutBuf; XML_Parser xp; /* XML parser instance for incoming client stream */ char server_name[256]; /* who they think we are */ char *chardata; @@ -30,9 +25,10 @@ typedef struct _citxmpp { /* Information about the current session */ char client_jid[256]; /* "full JID" of the client */ int last_event_processed; - TheToken_iq IQ; - TheToken_message Message; - + char iq_type[256]; /* for stanzas */ + char iq_id[256]; + char iq_from[256]; + char iq_to[256]; char iq_client_username[256]; /* username requested by the client (NON SASL ONLY) */ char iq_client_password[256]; /* password requested by the client (NON SASL ONLY) */ char iq_client_resource[256]; /* resource name requested by the client */ @@ -41,6 +37,7 @@ typedef struct _citxmpp { /* Information about the current session */ char sasl_auth_mech[32]; /* SASL auth mechanism requested by the client */ + char message_to[256]; char *message_body; /* Message body in transit */ int html_tag_level; /* tag nesting level */ @@ -59,6 +56,7 @@ struct xmpp_event { int session_which_generated_this_event; }; +extern struct xmpp_event *xmpp_queue; extern int queue_event_seq; enum { @@ -66,29 +64,21 @@ enum { XMPP_EVT_LOGOUT }; - -typedef void (*xmpp_handler_func)(void *data, const char *supplied_el, const char **attr); - -typedef struct __xmpp_handler { - int Flags; - xmpp_handler_func Handler; -}xmpp_handler; - - void xmpp_cleanup_function(void); void xmpp_greeting(void); void xmpp_command_loop(void); void xmpp_async_loop(void); void xmpp_sasl_auth(char *, char *); void xmpp_output_auth_mechs(void); -void xmpp_query_namespace(TheToken_iq *iq, char *); +void xmpp_query_namespace(char *, char *, char *, char *); +void xmpp_wholist_presence_dump(void); void xmpp_output_incoming_messages(void); void xmpp_queue_event(int, char *); void xmpp_process_events(void); void xmpp_presence_notify(char *, int); void xmpp_roster_item(struct CitContext *); -void xmpp_send_message(StrBuf *, char *); -void xmpp_non_sasl_authenticate(StrBuf *IQ_id, char *, char *, char *); +void xmpp_send_message(char *, char *); +void xmpp_non_sasl_authenticate(char *, char *, char *, char *); void xmpp_massacre_roster(void); void xmpp_delete_old_buddies_who_no_longer_exist_from_the_client_roster(void); int xmpp_is_visible(struct CitContext *from, struct CitContext *to_whom); @@ -106,17 +96,3 @@ extern int XMPPSrvDebugEnable; DBGLOG(LEVEL) syslog(LEVEL, \ "XMPP: " FORMAT); - -void AddXMPPStartHandler(const char *key, - long len, - xmpp_handler_func Handler, - int Flags); - -void AddXMPPEndHandler(const char *key, - long len, - xmpp_handler_func Handler, - int Flags); - - - - diff --git a/citadel/modules/xmpp/token.def b/citadel/modules/xmpp/token.def deleted file mode 100644 index d4470e02d..000000000 --- a/citadel/modules/xmpp/token.def +++ /dev/null @@ -1,70 +0,0 @@ - -#define NAMESPACE_iq "jabber:client" -TOKEN(iq, - { - STRPROP(iq, type); - STRPROP(iq, id); - STRPROP(iq, from); - STRPROP(iq, to); - }); - - -#define NAMESPACE_piq "bub" - -TOKEN(piq, - { - STRPROP(piq, type); - STRPROP(piq, id); - STRPROP(piq, from); - STRPROP(piq, to); - }); - -#define NAMESPACE_message "jabber:client" -TOKEN(message, - { - STRPROP(message, to); - STRPROP(message, type); - STRPROP(message, id); - PAYLOAD(message, body); - }); - -#define NAMESPACE_message_chatstate "http://jabber.org/protocol/chatstates" - -SUBTOKEN(message, - chatstate, - active, - { - CALLBACK(active); - }); - -SUBTOKEN(message, - chatstate, - composing, - { - CALLBACK(composing); - }); - -SUBTOKEN(message, - chatstate, - paused, - { - CALLBACK(paused); - }); - -SUBTOKEN(message, - chatstate, - inactive, - { - CALLBACK(inactive); - }); - -SUBTOKEN(message, - chatstate, - gone, - { - CALLBACK(gone); - }); - -// gci - -// potzblitztestuser@blarg.potzblitz.outgesourced.org to="willi@potzblitz.outgesourced.org/potzblitz"rgilgci diff --git a/citadel/modules/xmpp/xmpp_messages.c b/citadel/modules/xmpp/xmpp_messages.c index 1f7123aeb..8b8b43f6b 100644 --- a/citadel/modules/xmpp/xmpp_messages.c +++ b/citadel/modules/xmpp/xmpp_messages.c @@ -62,80 +62,61 @@ * If the client session has instant messages waiting, it outputs * unsolicited XML stanzas containing them. */ -void xmpp_output_incoming_messages(void) -{ - struct CitContext *CCC = CC; - citxmpp *Xmpp = XMPP; +void xmpp_output_incoming_messages(void) { + struct ExpressMessage *ptr; + char xmlbuf1[4096]; + char xmlbuf2[4096]; - while (CCC->FirstExpressMessage != NULL) { + while (CC->FirstExpressMessage != NULL) { begin_critical_section(S_SESSION_TABLE); - ptr = CCC->FirstExpressMessage; - CCC->FirstExpressMessage = CCC->FirstExpressMessage->next; + ptr = CC->FirstExpressMessage; + CC->FirstExpressMessage = CC->FirstExpressMessage->next; end_critical_section(S_SESSION_TABLE); - XPrint(HKEY("message"), 0, - XCPROPERTY("type", "chat"), - XPROPERTY("to", Xmpp->client_jid, strlen(Xmpp->client_jid)), - XPROPERTY("from", ptr->sender_email, strlen(ptr->sender_email)), - TYPE_ARGEND); - + cprintf("", + xmlesc(xmlbuf1, XMPP->client_jid, sizeof xmlbuf1), + xmlesc(xmlbuf2, ptr->sender_email, sizeof xmlbuf2) + ); if (ptr->text != NULL) { striplt(ptr->text); - XPrint(HKEY("body"), XCLOSED, - XBODY(ptr->text, strlen(ptr->text)), - TYPE_ARGEND); + cprintf("%s", xmlesc(xmlbuf1, ptr->text, sizeof xmlbuf1)); free(ptr->text); } - XPUT(""); + cprintf(""); free(ptr); } - XUnbuffer(); } /* * Client is sending a message. */ -void xmpp_send_message(StrBuf *message_to, char *message_body) { - struct CitContext *CCC = CC; +void xmpp_send_message(char *message_to, char *message_body) { char *recp = NULL; struct CitContext *cptr; if (message_body == NULL) return; if (message_to == NULL) return; - if (StrLength(message_to) == 0) return; - if (!CCC->logged_in) return; + if (IsEmptyStr(message_to)) return; + if (!CC->logged_in) return; for (cptr = ContextList; cptr != NULL; cptr = cptr->next) { if ( (cptr->logged_in) && (cptr->can_receive_im) - && (!strcasecmp(cptr->cs_inet_email, ChrPtr(message_to))) + && (!strcasecmp(cptr->cs_inet_email, message_to)) ) { recp = cptr->user.fullname; } } if (recp) { - PerformXmsgHooks(CCC->user.fullname, CCC->cs_inet_email, recp, message_body); + PerformXmsgHooks(CC->user.fullname, CC->cs_inet_email, recp, message_body); } free(XMPP->message_body); XMPP->message_body = NULL; - time(&CCC->lastidle); + XMPP->message_to[0] = 0; + time(&CC->lastidle); } -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; -} - - -CTDL_MODULE_INIT(xmpp_message) -{ - if (!threading) { - AddXMPPEndHandler(HKEY("message"), xmpp_end_message, 0); - } - return "xmpp_message"; -} diff --git a/citadel/modules/xmpp/xmpp_presence.c b/citadel/modules/xmpp/xmpp_presence.c index b4b09b1cf..ca8a95949 100644 --- a/citadel/modules/xmpp/xmpp_presence.c +++ b/citadel/modules/xmpp/xmpp_presence.c @@ -65,10 +65,10 @@ */ void xmpp_indicate_presence(char *presence_jid) { - XPrint(HKEY("presence"), XCLOSED, - XPROPERTY("from", presence_jid, strlen(presence_jid)), - XPROPERTY("to", XMPP->client_jid, strlen(XMPP->client_jid)), - TYPE_ARGEND); + char xmlbuf[256]; + + cprintf("", xmlesc(xmlbuf, XMPP->client_jid, sizeof xmlbuf)); } @@ -95,10 +95,8 @@ int xmpp_is_visible(struct CitContext *cptr, struct CitContext *to_whom) { /* * Initial dump of the entire wholist - * Respond to a update by firing back with presence information - * on the entire wholist. Check this assumption, it's probably wrong. */ -void xmpp_wholist_presence_dump(void *data, const char *supplied_el, const char **attr) +void xmpp_wholist_presence_dump(void) { struct CitContext *cptr = NULL; int nContexts, i; @@ -123,20 +121,18 @@ void xmpp_wholist_presence_dump(void *data, const char *supplied_el, const char */ void xmpp_destroy_buddy(char *presence_jid, int aggressively) { static int unsolicited_id = 1; - struct CitContext *CCC = CC; - char Buf[64]; - long blen; + char xmlbuf1[256]; + char xmlbuf2[256]; if (!presence_jid) return; if (!XMPP) return; if (!XMPP->client_jid) return; /* Transmit non-presence information */ - XPrint(HKEY("presence"), XCLOSED, - XCPROPERTY("type", "unavailable"), - XPROPERTY("from", presence_jid, strlen(presence_jid)), - XPROPERTY("to", XMPP->client_jid, strlen(XMPP->client_jid)), - TYPE_ARGEND); + cprintf("", + xmlesc(xmlbuf1, presence_jid, sizeof xmlbuf1), + xmlesc(xmlbuf2, XMPP->client_jid, sizeof xmlbuf2) + ); /* * Setting the "aggressively" flag also sends an "unsubscribed" presence update. @@ -145,40 +141,26 @@ void xmpp_destroy_buddy(char *presence_jid, int aggressively) { * it as a rejection of a subscription request. */ if (aggressively) { - XPrint(HKEY("presence"), XCLOSED, - XCPROPERTY("type", "unsubscribed"), - XPROPERTY("from", presence_jid, strlen(presence_jid)), - XPROPERTY("to", XMPP->client_jid, strlen(XMPP->client_jid)), - TYPE_ARGEND); + cprintf("", + xmlesc(xmlbuf1, presence_jid, sizeof xmlbuf1), + xmlesc(xmlbuf2, XMPP->client_jid, sizeof xmlbuf2) + ); } // FIXME ... we should implement xmpp_indicate_nonpresence so we can use it elsewhere - blen = snprintf(Buf, sizeof(Buf), "unbuddy_%x", ++unsolicited_id); - /* Do an unsolicited roster update that deletes the contact. */ - XPrint(HKEY("iq"), 0, - XCPROPERTY("type", "result"), - XPROPERTY("from", CCC->cs_inet_email, strlen(CCC->cs_inet_email)), - XPROPERTY("to", XMPP->client_jid, strlen(XMPP->client_jid)), - XPROPERTY("id", Buf, blen), - TYPE_ARGEND); - - XPrint(HKEY("query"), 0, - XCPROPERTY("xmlns", "jabber:iq:roster"), - TYPE_ARGEND); - - XPrint(HKEY("item"), 0, - XCPROPERTY("subscription", "remove"), - XPROPERTY("jid", presence_jid, strlen(presence_jid)), - TYPE_ARGEND); - - XPrint(HKEY("group"), XCLOSED, - XCFGBODY(c_humannode), - TYPE_ARGEND); - XPUT("" - "" - "" + cprintf("", + xmlesc(xmlbuf1, CC->cs_inet_email, sizeof xmlbuf1), + xmlesc(xmlbuf2, XMPP->client_jid, sizeof xmlbuf2), + ++unsolicited_id + ); + cprintf(""); + cprintf("", xmlesc(xmlbuf1, presence_jid, sizeof xmlbuf1)); + cprintf("%s", xmlesc(xmlbuf1, config.c_humannode, sizeof xmlbuf1)); + cprintf(""); + cprintf("" + "" ); } @@ -216,28 +198,16 @@ void xmpp_presence_notify(char *presence_jid, int event_type) { visible_sessions, presence_jid, CC->cs_pid); if ( (event_type == XMPP_EVT_LOGIN) && (visible_sessions == 1) ) { - long blen; - char Buf[64]; XMPP_syslog(LOG_DEBUG, "Telling session %d that <%s> logged in\n", CC->cs_pid, presence_jid); /* Do an unsolicited roster update that adds a new contact. */ assert(which_cptr_is_relevant >= 0); - - blen = snprintf(Buf, sizeof(Buf), "unsolicited_%x", ++unsolicited_id); - - XPrint(HKEY("iq"), 0, - XCPROPERTY("type", "result"), - XPROPERTY("id", Buf, blen), - TYPE_ARGEND); - - XPrint(HKEY("query"), 0, - XCPROPERTY("xmlns", "jabber:iq:roster"), - TYPE_ARGEND); - + cprintf("", ++unsolicited_id); + cprintf(""); xmpp_roster_item(&cptr[which_cptr_is_relevant]); - XPUT(""); + cprintf(""); /* Transmit presence information */ xmpp_indicate_presence(presence_jid); @@ -440,11 +410,3 @@ void xmpp_delete_old_buddies_who_no_longer_exist_from_the_client_roster(void) free(cptr); } - -CTDL_MODULE_INIT(xmpp_presence) -{ - if (!threading) { - AddXMPPEndHandler(HKEY("presence"), xmpp_wholist_presence_dump, 0); - } - return "xmpp_presence"; -} diff --git a/citadel/modules/xmpp/xmpp_query_namespace.c b/citadel/modules/xmpp/xmpp_query_namespace.c index d943df16d..cf6f423a5 100644 --- a/citadel/modules/xmpp/xmpp_query_namespace.c +++ b/citadel/modules/xmpp/xmpp_query_namespace.c @@ -59,21 +59,16 @@ /* * Output a single roster item, for roster queries or pushes */ -void xmpp_roster_item(struct CitContext *cptr) -{ - struct CitContext *CCC=CC; - - XPrint(HKEY("item"), 0, - XCPROPERTY("subscription", "both"), - XPROPERTY("jid", cptr->cs_inet_email, strlen(cptr->cs_inet_email)), - XPROPERTY("name", cptr->user.fullname, strlen(cptr->user.fullname)), - TYPE_ARGEND); - - XPrint(HKEY("group"), XCLOSED, - XCFGBODY(c_humannode), - TYPE_ARGEND); - - XPUT(""); +void xmpp_roster_item(struct CitContext *cptr) { + char xmlbuf1[256]; + char xmlbuf2[256]; + + cprintf("", + xmlesc(xmlbuf1, cptr->cs_inet_email, sizeof xmlbuf1), + xmlesc(xmlbuf2, cptr->user.fullname, sizeof xmlbuf2) + ); + cprintf("%s", xmlesc(xmlbuf1, config.c_humannode, sizeof xmlbuf1)); + cprintf(""); } /* @@ -88,7 +83,7 @@ void xmpp_iq_roster_query(void) struct CitContext *cptr; int nContexts, i; - XPUT(""); + cprintf(""); cptr = CtdlGetContextArray(&nContexts); if (cptr) { for (i=0; i"); + cprintf(""); } @@ -112,15 +107,12 @@ xmpp_query_namespace(purple5b5c1e5a, , vcard-temp:query) * */ -void xmpp_query_namespace(TheToken_iq *IQ/*char *iq_id, char *iq_from, char *iq_to*/, char *query_xmlns) +void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_xmlns) { int supported_namespace = 0; int roster_query = 0; - static const ConstStr Type[] = { - {HKEY("result")}, - {HKEY("error")} - }; - + char xmlbuf[256]; + /* We need to know before we begin the response whether this is a supported namespace, so * unfortunately all supported namespaces need to be defined here *and* down below where * they are handled. @@ -132,24 +124,21 @@ void xmpp_query_namespace(TheToken_iq *IQ/*char *iq_id, char *iq_from, char *iq_ supported_namespace = 1; } - XMPP_syslog(LOG_DEBUG, "xmpp_query_namespace(%s, %s, %s, %s)\n", ChrPtr(IQ->id), ChrPtr(IQ->from), ChrPtr(IQ->to), query_xmlns); + XMPP_syslog(LOG_DEBUG, "xmpp_query_namespace(%s, %s, %s, %s)\n", iq_id, iq_from, iq_to, query_xmlns); /* * Beginning of query result. */ if (supported_namespace) { - XPrint(HKEY("iq"), 0, - XPROPERTY("type", Type[0].Key, Type[0].len), - XSPROPERTY("to", IQ->from), - XSPROPERTY("id", IQ->id), - TYPE_ARGEND); + cprintf("id), - TYPE_ARGEND); + cprintf("", xmlesc(xmlbuf, iq_id, sizeof xmlbuf)); /* * Is this a query we know how to handle? @@ -161,9 +150,9 @@ void xmpp_query_namespace(TheToken_iq *IQ/*char *iq_id, char *iq_from, char *iq_ } else if (!strcasecmp(query_xmlns, "jabber:iq:auth:query")) { - XPUT("" - "" - "" + cprintf("" + "" + "" ); } @@ -177,13 +166,13 @@ void xmpp_query_namespace(TheToken_iq *IQ/*char *iq_id, char *iq_from, char *iq_ "Unknown query namespace '%s' - returning \n", query_xmlns ); - XPUT("" - "" - "" + cprintf("" + "" + "" ); } - XPUT(""); + cprintf(""); /* If we told the client who is on the roster, we also need to tell the client * who is *not* on the roster. (It's down here because we can't do it in the same diff --git a/citadel/modules/xmpp/xmpp_queue.c b/citadel/modules/xmpp/xmpp_queue.c index 024336df8..8cb5662d8 100644 --- a/citadel/modules/xmpp/xmpp_queue.c +++ b/citadel/modules/xmpp/xmpp_queue.c @@ -57,7 +57,6 @@ #include "serv_xmpp.h" int queue_event_seq = 0; -struct xmpp_event *xmpp_queue = NULL; void xmpp_queue_event(int event_type, char *email_addr) { @@ -163,14 +162,3 @@ void xmpp_cleanup_events(void) end_critical_section(S_XMPP_QUEUE); } - -CTDL_MODULE_INIT(xmpp_queue) -{ - if (!threading) { - - CtdlRegisterCleanupHook(xmpp_cleanup_events); - } - - /* return our module name for the log */ - return "xmpp_queue"; -} diff --git a/citadel/modules/xmpp/xmpp_sasl_service.c b/citadel/modules/xmpp/xmpp_sasl_service.c index 5e53ceb4c..e7ad1a2b1 100644 --- a/citadel/modules/xmpp/xmpp_sasl_service.c +++ b/citadel/modules/xmpp/xmpp_sasl_service.c @@ -127,9 +127,9 @@ int xmpp_auth_plain(char *authstring) * Output the list of SASL mechanisms offered by this stream. */ void xmpp_output_auth_mechs(void) { - XPUT("" - "PLAIN" - ""); + cprintf(""); + cprintf("PLAIN"); + cprintf(""); } /* @@ -138,28 +138,28 @@ void xmpp_output_auth_mechs(void) { void xmpp_sasl_auth(char *sasl_auth_mech, char *authstring) { if (strcasecmp(sasl_auth_mech, "PLAIN")) { - XPUT("" - "" - ""); + cprintf(""); + cprintf(""); + cprintf(""); return; } if (CC->logged_in) CtdlUserLogout(); /* Client may try to log in twice. Handle this. */ if (CC->nologin) { - XPUT("" - "" - ""); + cprintf(""); + cprintf(""); + cprintf(""); } else if (xmpp_auth_plain(authstring) == 0) { - XPUT(""); + cprintf(""); } else { - XPUT("" - "" - ""); + cprintf(""); + cprintf(""); + cprintf(""); } } @@ -168,8 +168,9 @@ void xmpp_sasl_auth(char *sasl_auth_mech, char *authstring) { /* * Non-SASL authentication */ -void xmpp_non_sasl_authenticate(StrBuf *IQ_id, char *username, char *password, char *resource) { +void xmpp_non_sasl_authenticate(char *iq_id, char *username, char *password, char *resource) { int result; + char xmlbuf[256]; if (CC->logged_in) CtdlUserLogout(); /* Client may try to log in twice. Handle this. */ @@ -177,23 +178,16 @@ void xmpp_non_sasl_authenticate(StrBuf *IQ_id, char *username, char *password, c if (result == login_ok) { result = CtdlTryPassword(password, strlen(password)); if (result == pass_ok) { - XPrint(HKEY("iq"), XCLOSED, - XCPROPERTY("type", "result"), - XSPROPERTY("ID", IQ_id), - TYPE_ARGEND); - /* success */ + cprintf("", xmlesc(xmlbuf, iq_id, sizeof xmlbuf)); /* success */ return; } } /* failure */ - XPrint(HKEY("iq"), 0, - XCPROPERTY("type", "error"), - XSPROPERTY("ID", IQ_id), - TYPE_ARGEND); - XPUT("" - "" - "" - "" + cprintf("", xmlesc(xmlbuf, iq_id, sizeof xmlbuf)); + cprintf("" + "" + "" + "" ); } diff --git a/citadel/modules/xmpp/xmpp_util.h b/citadel/modules/xmpp/xmpp_util.h deleted file mode 100644 index 1485c77a2..000000000 --- a/citadel/modules/xmpp/xmpp_util.h +++ /dev/null @@ -1,49 +0,0 @@ -typedef void* (*GetTokenDataFunc)(void); - -typedef struct __TokenHandler { - HashList *Properties; - GetTokenDataFunc GetToken; -}TokenHandler; - -typedef struct __PropertyHandler { - const char *NameSpace; - long NameSpaceLen; - const char *Token; - long TokenLen; - const char *Property; - long PropertyLen; - long offset; -} PropertyHandler; - -void XUnbuffer(void); -void XPutBody(const char *Str, long Len); -void XPutProp(const char *Str, long Len); -#define XPutSProp(STR) XPutProp(ChrPtr(STR), StrLength(STR)) -void XPut(const char *Str, long Len); -#define XPUT(CONSTSTR) XPut(CONSTSTR, sizeof(CONSTSTR) -1) - -void XPrintf(const char *Format, ...); - -#define XCLOSED (1<<0) -void XPrint(const char *Token, long tlen, - int Flags, - ...); - -#define TYPE_STR 1 -#define TYPE_OPTSTR 2 -#define TYPE_INT 3 -#define TYPE_BODYSTR 4 -#define TYPE_ARGEND 5 -#define XPROPERTY(NAME, VALUE, VLEN) TYPE_STR, NAME, sizeof(NAME)-1, VALUE, VLEN -#define XSPROPERTY(NAME, VALUE) TYPE_STR, NAME, sizeof(NAME)-1, ChrPtr(VALUE), StrLength(VALUE) -#define XOPROPERTY(NAME, VALUE, VLEN) TYPE_OPTSTR, NAME, sizeof(NAME)-1, VALUE, VLEN -#define XCPROPERTY(NAME, VALUE) TYPE_STR, NAME, sizeof(NAME)-1, VALUE, sizeof(VALUE) - 1 -#define XIPROPERTY(NAME, LVALUE) TYPE_INT, NAME, SIZEOF(NAME)-1 -#define XBODY(VALUE, VLEN) TYPE_BODYSTR, VALUE, VLEN -#define XCFGBODY(WHICH) TYPE_BODYSTR, config.WHICH, configlen.WHICH - -void XMPP_RegisterTokenProperty(const char *NS, long NSLen, - const char *Token, long TLen, - const char *Property, long PLen, - GetTokenDataFunc GetToken, - long offset); diff --git a/citadel/modules/xmpp/xmpp_xmacros.c b/citadel/modules/xmpp/xmpp_xmacros.c deleted file mode 100644 index 63c99edab..000000000 --- a/citadel/modules/xmpp/xmpp_xmacros.c +++ /dev/null @@ -1,161 +0,0 @@ -#include -#include -#include -#include "ctdl_module.h" -#include "serv_xmpp.h" - -void *GetToken_iq(void) -{ - return &XMPP->IQ; -} -void *GetToken_piq(void) -{ - return NULL; -} - -void *GetToken_message(void) -{ - return &XMPP->Message; -} - -/// TODO -#define CALLBACK(NAME); - -#define STRPROP(STRUCTNAME, NAME) \ - if (StrLength(pdata->NAME) > 0) \ - { \ - XPut(#NAME, sizeof(#NAME) - 1); \ - XPut("=\"", 2); \ - XPutProp(SKEY(pdata->NAME)); \ - XPut("\" ", 2); \ - } - -#define PAYLOAD(STRUCTNAME, NAME) \ - XPrint(#NAME, sizeof(#NAME) -1, \ - XCLOSED, \ - TYPE_BODYSTR, SKEY(pdata->NAME), \ - TYPE_ARGEND); - -#define THENAMESPACE(STRUCTNAME, NAME) \ - XPut(#NAME, sizeof(#NAME) - 1); \ - XPut("=\"", 2); \ - XPutProp(NAMESPACE_##STRUCTNAME, \ - sizeof(NAMESPACE_##STRUCTNAME)-1); \ - XPut("\" ", 2); - -#define TOKEN(NAME, STRUCT) \ - void serialize_##NAME(TheToken_##NAME *pdata, int Close) \ - { \ - XPUT("<"); \ - XPut(#NAME, sizeof(#NAME)); \ - XPUT(" "); \ - STRUCT ; \ - XPUT(">"); \ - if (Close) \ - { \ - XPut("", 1); \ - } \ - } - -#define SUBTOKEN(NAME, NS, STOKEN, STRUCT) \ - void serialize_##NAME##NS##STOKEN( \ - theSubToken_##NAME##NS##STOKEN *pdata, int Close) \ - { \ - XPUT("<"); \ - XPut(#NAME, sizeof(#NAME)); \ - XPUT(" "); \ - STRUCT ; \ - XPUT(">"); \ - if (Close) \ - { \ - XPut("", 1); \ - } \ - } - -#include "token.def" -#undef STRPROP -#undef PAYLOAD -#undef TOKEN -#undef SUBTOKEN - -#define STRPROP(STRUCTNAME, NAME) \ - FreeStrBuf(&pdata->NAME); - -#define PAYLOAD(STRUCTNAME, NAME) \ - FreeStrBuf(&pdata->NAME); - -#define TOKEN(NAME, STRUCT) \ - void free_buf_##NAME(TheToken_##NAME *pdata) \ - { \ - STRUCT ; \ - } - -#define SUBTOKEN(NAME, NS, STOKEN, STRUCT) void free_buf__##NAME##NS##STOKEN \ - (theSubToken_##NAME##NS##STOKEN *pdata){ \ - STRUCT ; \ - } - -#include "token.def" -#undef STRPROP -#undef PAYLOAD -#undef TOKEN -#undef SUBTOKEN - -#define TOKEN(NAME, STRUCT) \ - void free_##NAME(TheToken_##NAME *pdata) \ - { \ - free_buf_##NAME(pdata); \ - free(pdata); \ - } - -#define SUBTOKEN(NAME, NS, STOKEN, STRUCT) void free__##NAME##NS##STOKEN \ - (theSubToken_##NAME##NS##STOKEN *pdata) \ - { \ - free_buf__##NAME##NS##STOKEN(pdata); \ - free(pdata); \ - } - -#include "token.def" -#undef STRPROP -#undef TOKEN -#undef SUBTOKEN - - - -CTDL_MODULE_INIT(xmpp_xmacros) -{ - if (!threading) { -#define STRPROP(TOKENNAME, PROPERTYNAME) \ - long offset##PROPERTYNAME = \ - offsetof(TheToken_##TOKENNAME, PROPERTYNAME); \ - XMPP_RegisterTokenProperty( \ - NAMESPACE_##TOKENNAME, \ - sizeof(NAMESPACE_##TOKENNAME)-1, \ - #TOKENNAME, sizeof(#TOKENNAME)-1, \ - #PROPERTYNAME, sizeof(#PROPERTYNAME)-1, \ - GetToken_##TOKENNAME, \ - offset##PROPERTYNAME); -#define PAYLOAD(TOKENNAME, PROPERTYNAME) \ - long offset##PROPERTYNAME = \ - offsetof(TheToken_##TOKENNAME, PROPERTYNAME); \ - XMPP_RegisterTokenProperty( \ - NAMESPACE_##TOKENNAME, \ - sizeof(NAMESPACE_##TOKENNAME)-1, \ - #TOKENNAME, sizeof(#TOKENNAME)-1, \ - NULL, 0, \ - GetToken_##TOKENNAME, \ - offset##PROPERTYNAME); -#define TOKEN(NAME, STRUCT) STRUCT -#define SUBTOKEN(NAME, NS, STOKEN, STRUCT) STRUCT -#include "token.def" -#undef STRPROP -#undef TOKEN - } - - /* return our module name for the log */ - return "xmpp_xmacros"; -} diff --git a/citadel/modules/xmpp/xmpp_xmacros.h b/citadel/modules/xmpp/xmpp_xmacros.h deleted file mode 100644 index b38edbc70..000000000 --- a/citadel/modules/xmpp/xmpp_xmacros.h +++ /dev/null @@ -1,57 +0,0 @@ - -/* - * define the structures for one token each - * typename: TheToken_ - */ - -#define XMPPARGS char *token, long len -typedef void (*XMPP_callback)(XMPPARGS); -#define CALLBACK(NAME) XMPP_callback CB_##NAME; -#define PAYLOAD(STRUCTNAME, NAME) StrBuf *NAME;int encoding_##NAME; -#define STRPROP(STRUCTNAME, NAME) StrBuf *NAME; -#define TOKEN(NAME, STRUCT) typedef struct __##NAME \ - STRUCT \ - TheToken_##NAME; -#define SUBTOKEN(NAME, NS, STOKEN, STRUCT) typedef struct __##NAME##NS##STOKEN \ - STRUCT \ - theSubToken_##NAME##NS##STOKEN; - -#include "token.def" - -#undef STRPROP -#undef PAYLOAD -#undef TOKEN -#undef SUBTOKEN - - -/* - * forward declarations for freeing the members of one struct instance - # name: free_buf_ - */ - -#define SUBTOKEN(NAME, NS, STOKEN, STRUCT) void free_buf__##NAME##NS##STOKEN \ - (theSubToken_##NAME##NS##STOKEN *pdata); -#define TOKEN(NAME, STRUCT) \ - void free_buf_##NAME(TheToken_##NAME *pdata); -#include "token.def" -#undef STRPROP -#undef PAYLOAD -#undef TOKEN -#undef SUBTOKEN - -/* - * forward declarations, freeing structs and member. - * name: free_ - */ -#define SUBTOKEN(NAME, NS, STOKEN, STRUCT) void free__##NAME##NS##STOKEN \ - (theSubToken_##NAME##NS##STOKEN *pdata); -#define TOKEN(NAME, STRUCT) \ - void free_##NAME(TheToken_##NAME *pdata); - -#include "token.def" -#undef STRPROP -#undef PAYLOAD -#undef TOKEN -#undef SUBTOKEN - -#undef CALLBACK