X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fxmpp_query_namespace.c;h=cf6f423a56516cd392ce78ae9c79f93d486ff2f5;hb=e7c125bafc3bd24fd9cfb18c39b29abd19c7478f;hp=5bfe7ae11641fd11ed2210ab2d311831432134a3;hpb=131b59b3ca3c8368c6ad179ef7fb9cc02e99ede4;p=citadel.git

diff --git a/citadel/modules/xmpp/xmpp_query_namespace.c b/citadel/modules/xmpp/xmpp_query_namespace.c
index 5bfe7ae11..cf6f423a5 100644
--- a/citadel/modules/xmpp/xmpp_query_namespace.c
+++ b/citadel/modules/xmpp/xmpp_query_namespace.c
@@ -1,23 +1,21 @@
 /*
- * $Id$ 
- *
  * Handle <iq> <get> <query> 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.
+ *  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
+ *  
+ *  
+ *  
  */
 
 #include "sysdep.h"
@@ -62,11 +60,14 @@
  * Output a single roster item, for roster queries or pushes
  */
 void xmpp_roster_item(struct CitContext *cptr) {
+	char xmlbuf1[256];
+	char xmlbuf2[256];
+
 	cprintf("<item jid=\"%s\" name=\"%s\" subscription=\"both\">",
-		cptr->cs_inet_email,
-		cptr->user.fullname
+		xmlesc(xmlbuf1, cptr->cs_inet_email, sizeof xmlbuf1),
+		xmlesc(xmlbuf2, cptr->user.fullname, sizeof xmlbuf2)
 	);
-	cprintf("<group>%s</group>", config.c_humannode);
+	cprintf("<group>%s</group>", xmlesc(xmlbuf1, config.c_humannode, sizeof xmlbuf1));
 	cprintf("</item>");
 }
 
@@ -81,20 +82,14 @@ void xmpp_iq_roster_query(void)
 {
 	struct CitContext *cptr;
 	int nContexts, i;
-	int aide = (CC->user.axlevel >= 6);
 
 	cprintf("<query xmlns=\"jabber:iq:roster\">");
-
 	cptr = CtdlGetContextArray(&nContexts);
 	if (cptr) {
 		for (i=0; i<nContexts; i++) {
-			if (cptr[i].logged_in) {
-				if (
-			   		(((cptr[i].cs_flags&CS_STEALTH)==0) || (aide))
-			   		&& (cptr[i].user.usernum != CC->user.usernum)
-			   	) {
-					xmpp_roster_item(&cptr[i]);
-				}
+			if (xmpp_is_visible(&cptr[i], CC)) {
+				XMPP_syslog(LOG_DEBUG, "Rosterizing %s\n", cptr[i].user.fullname);
+				xmpp_roster_item(&cptr[i]);
 			}
 		}
 		free (cptr);
@@ -115,6 +110,8 @@ xmpp_query_namespace(purple5b5c1e5a, , vcard-temp:query)
 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];
 
 	/* 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,12 +119,12 @@ 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"))
 	) {
 		supported_namespace = 1;
 	}
 
-	CtdlLogPrintf(CTDL_DEBUG, "xmpp_query_namespace(%s, %s, %s, %s)\n", iq_id, iq_from, 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.
@@ -139,15 +136,16 @@ void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_x
 		cprintf("<iq type=\"error\" ");
 	}
 	if (!IsEmptyStr(iq_from)) {
-		cprintf("to=\"%s\" ", iq_from);
+		cprintf("to=\"%s\" ", xmlesc(xmlbuf, iq_from, sizeof xmlbuf));
 	}
-	cprintf("id=\"%s\">", 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,17 +156,29 @@ void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_x
 		);
 	}
 
+	/*
+	 * 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 namespace; returning <service-unavailable/>\n");
+		XMPP_syslog(LOG_DEBUG,
+			    "Unknown query namespace '%s' - returning <service-unavailable/>\n",
+			    query_xmlns
+		);
 		cprintf("<error code=\"503\" type=\"cancel\">"
 			"<service-unavailable xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\"/>"
 			"</error>"
 		);
 	}
 
-	/*
-	 * End of query result.  If we didn't hit any known namespaces then we should
-	 * deliver a "service unavailable" error (see RFC3921 section 2.4 and 11.1.5.4)
-	 */
 	cprintf("</iq>");
+
+	/* 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();
+	}
 }