X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fxmpp_query_namespace.c;h=1b17b952f166ec0c5a3f544f08e033552ac73177;hb=1ab27069271df6ed100343866c93c0ef2eb2a888;hp=e7fcc0c8a98bba7a336e646ec46fc17a8005bbb2;hpb=ccfce1854b9c2547d9b87ce07185d68b0df76d9e;p=citadel.git diff --git a/citadel/modules/xmpp/xmpp_query_namespace.c b/citadel/modules/xmpp/xmpp_query_namespace.c index e7fcc0c8a..1b17b952f 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" @@ -51,7 +45,6 @@ #include "support.h" #include "config.h" #include "internet_addressing.h" -#include "md5.h" #include "ctdl_module.h" #include "serv_xmpp.h" @@ -59,23 +52,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", CCC->cs_inet_email, strlen(CCC->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_principal_id, sizeof xmlbuf1), + xmlesc(xmlbuf2, cptr->user.fullname, sizeof xmlbuf2) + ); + cprintf("%s", xmlesc(xmlbuf1, CtdlGetConfigStr("c_humannode"), sizeof xmlbuf1)); + cprintf(""); } + /* * Return the results for a "jabber:iq:roster:query" * @@ -88,41 +77,32 @@ void xmpp_iq_roster_query(void) struct CitContext *cptr; int nContexts, i; - XPUT(""); + syslog(LOG_DEBUG, "xmpp: 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. */ - -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; - const char *TypeStr; - long TLen; - ConstStr Type[] = { - {HKEY("result")}, - {HKEY("error")} - }; - + char xmlbuf[256]; + int reply_must_be_from_my_jid = 0; + /* 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. @@ -130,29 +110,55 @@ 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); + syslog(LOG_DEBUG, "xmpp: xmpp_query_namespace(id=%s, from=%s, to=%s, xmlns=%s)", iq_id, iq_from, iq_to, query_xmlns); /* * Beginning of query result. */ - if (supported_namespace) { - TypeStr = Type[0].Key; - TLen = Type[0].len; + + if (!strcasecmp(query_xmlns, "jabber:iq:roster:query")) { + reply_must_be_from_my_jid = 1; + } + + char dom[1024]; // client is expecting to see the reply + if (reply_must_be_from_my_jid) { // coming "from" the user's jid + safestrncpy(dom, XMPP->client_jid, sizeof(dom)); + char *slash = strchr(dom, '/'); + if (slash) { + *slash = 0; + } } else { - TypeStr = Type[1].Key; - TLen = Type[1].len; + safestrncpy(dom, XMPP->client_jid, sizeof(dom)); // client is expecting to see the reply + if (IsEmptyStr(dom)) { // coming "from" the domain of the user's jid + safestrncpy(dom, XMPP->server_name, sizeof(dom)); + } + char *at = strrchr(dom, '@'); + if (at) { + strcpy(dom, ++at); + } + char *slash = strchr(dom, '/'); + if (slash) { + *slash = 0; + } } - XPrint(HKEY("iq"), 0, - XPROPERTY("type", TypeStr, TLen), - XSPROPERTY("to", IQ->from), - XSPROPERTY("id", IQ->id), - TYPE_ARGEND); + if (supported_namespace) { + cprintf("", xmlesc(xmlbuf, iq_id, sizeof xmlbuf)); /* * Is this a query we know how to handle? @@ -164,29 +170,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("" - "" - "" + syslog(LOG_DEBUG, "xmpp: unknown query namespace '%s' - returning ", 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