X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fxmpp_query_namespace.c;h=df7671798a280cbccf6f04756c08fb5845315ca0;hb=2dea277848e779e7a923c9b4c8b98414d41abbda;hp=805b5101eaf09506ac8b4d488b85329fc5748771;hpb=313ec8cd15d8b4b0490862ef294f3aaa6390172c;p=citadel.git

diff --git a/citadel/modules/xmpp/xmpp_query_namespace.c b/citadel/modules/xmpp/xmpp_query_namespace.c
index 805b5101e..df7671798 100644
--- a/citadel/modules/xmpp/xmpp_query_namespace.c
+++ b/citadel/modules/xmpp/xmpp_query_namespace.c
@@ -1,7 +1,7 @@
 /*
  * 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 open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3.
@@ -78,12 +78,13 @@ void xmpp_iq_roster_query(void)
 	struct CitContext *cptr;
 	int nContexts, i;
 
+	syslog(LOG_DEBUG, "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);
+				XMPP_syslog(LOG_DEBUG, "Rosterizing %s\n", cptr[i].user.fullname);
 				xmpp_roster_item(&cptr[i]);
 			}
 		}
@@ -103,6 +104,7 @@ void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_x
 	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,11 +124,39 @@ void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_x
 	/*
 	 * 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));