X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fxmpp_query_namespace.c;h=795cd0e28a4996f085dc12255320a69c1f6233c3;hb=af679dc8a1dc74b7e4b204ccc1b6e187299ab896;hp=d943df16db6f7e1e7139fec860ca41b2cca0a41a;hpb=4b0153bbdd15ddc4bc7b6193ff7ecb531b330a3c;p=citadel.git diff --git a/citadel/modules/xmpp/xmpp_query_namespace.c b/citadel/modules/xmpp/xmpp_query_namespace.c index d943df16d..795cd0e28 100644 --- a/citadel/modules/xmpp/xmpp_query_namespace.c +++ b/citadel/modules/xmpp/xmpp_query_namespace.c @@ -1,21 +1,15 @@ /* * Handle type situations (namespace queries) * - * Copyright (c) 2007-2009 by Art Cancro + * Copyright (c) 2007-2015 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 version 3. - * - * + * This program is open source software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 3. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * - * - * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. */ #include "sysdep.h" @@ -59,23 +53,19 @@ /* * 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(""); } + /* * Return the results for a "jabber:iq:roster:query" * @@ -88,7 +78,8 @@ void xmpp_iq_roster_query(void) struct CitContext *cptr; int nContexts, i; - XPUT(""); + syslog(LOG_DEBUG, "Roster push!"); + cprintf(""); cptr = CtdlGetContextArray(&nContexts); if (cptr) { for (i=0; i"); + cprintf(""); } + /* - * TODO: handle queries on some or all of these namespaces - * -xmpp_query_namespace(purple5b5c1e58, splorph.xand.com, http://jabber.org/protocol/disco#items:query) -xmpp_query_namespace(purple5b5c1e59, splorph.xand.com, http://jabber.org/protocol/disco#info:query) -xmpp_query_namespace(purple5b5c1e5a, , vcard-temp:query) - * + * Client is doing a namespace query. These are all handled differently. + * A "rumplestiltskin lookup" is the most efficient way to handle this. Please do not refactor this code. */ - -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. @@ -128,28 +112,27 @@ void xmpp_query_namespace(TheToken_iq *IQ/*char *iq_id, char *iq_from, char *iq_ if ( (!strcasecmp(query_xmlns, "jabber:iq:roster:query")) || (!strcasecmp(query_xmlns, "jabber:iq:auth:query")) + || (!strcasecmp(query_xmlns, "http://jabber.org/protocol/disco#items:query")) + || (!strcasecmp(query_xmlns, "http://jabber.org/protocol/disco#info:query")) ) { 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(id=%s, from=%s, to=%s, xmlns=%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("server_name, sizeof xmlbuf) ); } else { - XPrint(HKEY("iq"), 0, - XPROPERTY("type", Type[1].Key, Type[1].len), - XSPROPERTY("id", IQ->id), - TYPE_ARGEND); + cprintf("server_name, sizeof xmlbuf) ); } + if (!IsEmptyStr(iq_from)) { + cprintf("to=\"%s\" ", xmlesc(xmlbuf, iq_from, sizeof xmlbuf)); + } + cprintf("id=\"%s\">", xmlesc(xmlbuf, iq_id, sizeof xmlbuf)); /* * Is this a query we know how to handle? @@ -161,29 +144,36 @@ 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("" + "" + "" ); } + // Extension "xep-0030" (http://xmpp.org/extensions/xep-0030.html) (return an empty set of results) + else if (!strcasecmp(query_xmlns, "http://jabber.org/protocol/disco#items:query")) { + cprintf("", xmlesc(xmlbuf, query_xmlns, sizeof xmlbuf)); + } + + // Extension "xep-0030" (http://xmpp.org/extensions/xep-0030.html) (return an empty set of results) + else if (!strcasecmp(query_xmlns, "http://jabber.org/protocol/disco#info:query")) { + cprintf("", xmlesc(xmlbuf, query_xmlns, sizeof xmlbuf)); + } + /* * If we didn't hit any known query namespaces then we should deliver a * "service unavailable" error (see RFC3921 section 2.4 and 11.1.5.4) */ else { - XMPP_syslog(LOG_DEBUG, - "Unknown query namespace '%s' - returning \n", - query_xmlns - ); - XPUT("" - "" - "" + XMPP_syslog(LOG_DEBUG, "Unknown query namespace '%s' - returning \n", query_xmlns); + 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