Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

[citadel.git] / citadel / modules / xmpp / xmpp_query_namespace.c

diff --git a/citadel/modules/xmpp/xmpp_query_namespace.c b/citadel/modules/xmpp/xmpp_query_namespace.c
index fba04f75f0408ac02ef210b34e132bc72029bd70..848fcc735897a79eceeab0c876098c399638155b 100644 (file)
--- 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.
@@ -61,7 +61,7 @@ void xmpp_roster_item(struct CitContext *cptr) {
                xmlesc(xmlbuf1, cptr->cs_inet_email, 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>");
 }
 
@@ -104,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
@@ -123,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));