/*
* Handle <iq> <get> <query> type situations (namespace queries)
*
- * Copyright (c) 2007-2009 by Art Cancro
+ * Copyright (c) 2007-2015 by Art Cancro and citadel.org
*
- * 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.
+ * 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.
- *
- * 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"
#include "support.h"
#include "config.h"
#include "internet_addressing.h"
-#include "md5.h"
#include "ctdl_module.h"
#include "serv_xmpp.h"
char xmlbuf2[256];
cprintf("<item jid=\"%s\" name=\"%s\" subscription=\"both\">",
- xmlesc(xmlbuf1, cptr->cs_inet_email, sizeof xmlbuf1),
+ xmlesc(xmlbuf1, cptr->cs_principal_id, sizeof xmlbuf1),
xmlesc(xmlbuf2, cptr->user.fullname, sizeof xmlbuf2)
);
- cprintf("<group>%s</group>", xmlesc(xmlbuf1, config.c_humannode, sizeof xmlbuf1));
+ cprintf("<group>%s</group>", xmlesc(xmlbuf1, CtdlGetConfigStr("c_humannode"), sizeof xmlbuf1));
cprintf("</item>");
}
+
/*
* Return the results for a "jabber:iq:roster:query"
*
struct CitContext *cptr;
int nContexts, i;
+ syslog(LOG_DEBUG, "xmpp: roster push!");
cprintf("<query xmlns=\"jabber:iq:roster\">");
cptr = CtdlGetContextArray(&nContexts);
if (cptr) {
for (i=0; i<nContexts; i++) {
if (xmpp_is_visible(&cptr[i], CC)) {
- syslog(LOG_DEBUG, "Rosterizing %s\n", cptr[i].user.fullname);
+ syslog(LOG_DEBUG, "xmpp: rosterizing %s", cptr[i].user.fullname);
xmpp_roster_item(&cptr[i]);
}
}
/*
- * 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
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;
}
- syslog(LOG_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 type=\"result\" ");
+ cprintf("<iq type=\"result\" from=\"%s\" ", xmlesc(xmlbuf, dom, sizeof xmlbuf) );
}
else {
- cprintf("<iq type=\"error\" ");
+ cprintf("<iq type=\"error\" from=\"%s\" ", xmlesc(xmlbuf, dom, sizeof xmlbuf) );
}
if (!IsEmptyStr(iq_from)) {
cprintf("to=\"%s\" ", xmlesc(xmlbuf, iq_from, 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#items:query")) {
+ cprintf("<query xmlns=\"%s\"/>", 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("<query xmlns=\"%s\"/>", 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 {
- syslog(LOG_DEBUG,
- "Unknown query namespace '%s' - returning <service-unavailable/>\n",
- query_xmlns
- );
+ syslog(LOG_DEBUG, "xmpp: unknown query namespace '%s' - returning <service-unavailable/>", query_xmlns);
cprintf("<error code=\"503\" type=\"cancel\">"
"<service-unavailable xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\"/>"
"</error>"
projects / citadel.git / blobdiff