X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fxmpp_query_namespace.c;h=1b17b952f166ec0c5a3f544f08e033552ac73177;hb=1ab27069271df6ed100343866c93c0ef2eb2a888;hp=6dad562b399ac1d16f642a00ff6d770ff7c8998c;hpb=d82fe20d6fa89efc51aac93ce60577ab23bb4059;p=citadel.git diff --git a/citadel/modules/xmpp/xmpp_query_namespace.c b/citadel/modules/xmpp/xmpp_query_namespace.c index 6dad562b3..1b17b952f 100644 --- a/citadel/modules/xmpp/xmpp_query_namespace.c +++ b/citadel/modules/xmpp/xmpp_query_namespace.c @@ -1,23 +1,15 @@ /* - * $Id$ - * * Handle type situations (namespace queries) * - * Copyright (c) 2007-2009 by Art Cancro - * - * This program is free 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. + * Copyright (c) 2007-2015 by Art Cancro and citadel.org * - * 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 open source software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 3. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 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" @@ -53,7 +45,6 @@ #include "support.h" #include "config.h" #include "internet_addressing.h" -#include "md5.h" #include "ctdl_module.h" #include "serv_xmpp.h" @@ -62,14 +53,18 @@ * Output a single roster item, for roster queries or pushes */ void xmpp_roster_item(struct CitContext *cptr) { + char xmlbuf1[256]; + char xmlbuf2[256]; + cprintf("", - cptr->cs_inet_email, - cptr->user.fullname + xmlesc(xmlbuf1, cptr->cs_principal_id, sizeof xmlbuf1), + xmlesc(xmlbuf2, cptr->user.fullname, sizeof xmlbuf2) ); - cprintf("%s", config.c_humannode); + cprintf("%s", xmlesc(xmlbuf1, CtdlGetConfigStr("c_humannode"), sizeof xmlbuf1)); cprintf(""); } + /* * Return the results for a "jabber:iq:roster:query" * @@ -81,20 +76,15 @@ void xmpp_iq_roster_query(void) { struct CitContext *cptr; int nContexts, i; - int aide = (CC->user.axlevel >= 6); + syslog(LOG_DEBUG, "xmpp: roster push!"); cprintf(""); - cptr = CtdlGetContextArray(&nContexts); if (cptr) { for (i=0; iuser.usernum) - ) { - xmpp_roster_item(&cptr[i]); - } + if (xmpp_is_visible(&cptr[i], CC)) { + syslog(LOG_DEBUG, "xmpp: rosterizing %s", cptr[i].user.fullname); + xmpp_roster_item(&cptr[i]); } } free (cptr); @@ -104,17 +94,14 @@ void xmpp_iq_roster_query(void) /* - * 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(char *iq_id, char *iq_from, char *iq_to, char *query_xmlns) { int supported_namespace = 0; + int roster_query = 0; + 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 @@ -122,32 +109,63 @@ void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_x */ if ( (!strcasecmp(query_xmlns, "jabber:iq:roster:query")) - && (!strcasecmp(query_xmlns, "jabber:iq:auth: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; } - CtdlLogPrintf(CTDL_DEBUG, "xmpp_query_namespace(%s, %s, %s, %s)\n", iq_id, iq_from, 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 (!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 { + 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; + } + } + if (supported_namespace) { - cprintf("", iq_id); + cprintf("id=\"%s\">", xmlesc(xmlbuf, iq_id, sizeof xmlbuf)); /* * Is this a query we know how to handle? */ if (!strcasecmp(query_xmlns, "jabber:iq:roster:query")) { + roster_query = 1; xmpp_iq_roster_query(); } @@ -158,16 +176,23 @@ void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_x ); } + // 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 { - CtdlLogPrintf(CTDL_DEBUG, - "Unknown query namespace '%s' - returning \n", - query_xmlns - ); + syslog(LOG_DEBUG, "xmpp: unknown query namespace '%s' - returning ", query_xmlns); cprintf("" "" "" @@ -175,4 +200,12 @@ void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_x } 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 + * stanza; this will be an unsolicited push.) + */ + if (roster_query) { + xmpp_delete_old_buddies_who_no_longer_exist_from_the_client_roster(); + } }