Revert some of the later changes in XMPP and fix other parts

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

diff --git a/citadel/modules/xmpp/serv_xmpp.c b/citadel/modules/xmpp/serv_xmpp.c
index 733c2363c6d6324e42aefd859fa99356444c4b31..ea4adc48be009d30aecf3b85e65063d64f5d7226 100644 (file)
--- a/citadel/modules/xmpp/serv_xmpp.c
+++ b/citadel/modules/xmpp/serv_xmpp.c
@@ -17,6 +17,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+// uncomment for more verbosity
+#define XMPP_DEBUG 1
+
 #include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
@@ -57,13 +60,15 @@
 #include "ctdl_module.h"
 #include "serv_xmpp.h"
 
-#if XML_MAJOR_VERSION > 0
 /* XML_StopParser is present in expat 2.x */
+#if XML_MAJOR_VERSION > 1
 #define HAVE_XML_STOPPARSER
 #endif
 
 struct xmpp_event *xmpp_queue = NULL;
 
+int XMPPSrvDebugEnable = 0;
+
 
 
 #ifdef HAVE_XML_STOPPARSER
@@ -79,6 +84,25 @@ static void xmpp_entity_declaration(void *userData, const XML_Char *entityName,
 }
 #endif
 
+static inline int XMPP_GetUtf8SequenceLength(const char *CharS, const char *CharE)
+{
+       /* if this is is migrated to strbuf, remove this copy. */
+       int n = 0;
+        unsigned char test = (1<<7);
+
+       if ((*CharS & 0xC0) != 0xC0) 
+               return 1;
+
+       while ((n < 8) && 
+              ((test & ((unsigned char)*CharS)) != 0)) 
+       {
+               test = test >> 1;
+               n ++;
+       }
+       if ((n > 6) || ((CharE - CharS) < n))
+               n = 0;
+       return n;
+}
 
 
 /*
@@ -91,8 +115,11 @@ static void xmpp_entity_declaration(void *userData, const XML_Char *entityName,
 char *xmlesc(char *buf, char *str, int bufsiz)
 {
        char *ptr;
+       char *eiptr;
        unsigned char ch;
+       int inlen;
        int len = 0;
+       int IsUtf8Sequence;
 
        if (!buf) return(NULL);
        buf[0] = 0;
@@ -101,6 +128,9 @@ char *xmlesc(char *buf, char *str, int bufsiz)
                return(buf);
        }
 
+       inlen = strlen(str);
+       eiptr = str + inlen;
+
        for (ptr=str; *ptr; ptr++) {
                ch = *ptr;
                if (ch == '<') {
@@ -125,10 +155,25 @@ char *xmlesc(char *buf, char *str, int bufsiz)
                        buf[len] = 0;
                }
                else {
-                       char oct[10];
-                       sprintf(oct, "&#%o;", ch);
-                       strcpy(&buf[len], oct);
-                       len += strlen(oct);
+                       char oct[32];
+
+                       IsUtf8Sequence =  XMPP_GetUtf8SequenceLength(&buf[len], eiptr);
+                       if (IsUtf8Sequence)
+                       {
+                               while (IsUtf8Sequence > 0){
+                                       buf[len] = *ptr;
+                                       len ++;
+                                       if (--IsUtf8Sequence)
+                                               ptr++;
+                               }
+                               buf[len] = '\0';
+                       }
+                       else
+                       {
+                               sprintf(oct, "&#%o;", ch);
+                               strcpy(&buf[len], oct);
+                               len += strlen(oct);
+                       }
                }
                if ((len + 6) > bufsiz) {
                        return(buf);
@@ -202,12 +247,12 @@ void xmpp_xml_start(void *data, const char *supplied_el, const char **attr) {
                strcpy(el, ++sep);
        }
 
-       /*
+#ifdef XMPP_DEBUG
        syslog(LOG_DEBUG, "XMPP ELEMENT START: <%s>\n", el);
        for (i=0; attr[i] != NULL; i+=2) {
                syslog(LOG_DEBUG, "                    Attribute '%s' = '%s'\n", attr[i], attr[i+1]);
        }
-       uncomment for more verbosity */
+#endif /* XMPP_DEBUG */
 
        if (!strcasecmp(el, "stream")) {
                xmpp_stream_start(data, supplied_el, attr);
@@ -274,12 +319,12 @@ void xmpp_xml_end(void *data, const char *supplied_el) {
                strcpy(el, ++sep);
        }
 
-       /*
+#ifdef XMPP_DEBUG
        syslog(LOG_DEBUG, "XMPP ELEMENT END  : <%s>\n", el);
        if (XMPP->chardata_len > 0) {
                syslog(LOG_DEBUG, "          chardata: %s\n", XMPP->chardata);
        }
-       uncomment for more verbosity */
+#endif /* XMPP_DEBUG */
 
        if (!strcasecmp(el, "resource")) {
                if (XMPP->chardata_len > 0) {
@@ -339,8 +384,8 @@ void xmpp_xml_end(void *data, const char *supplied_el) {
                         */
                        else {
                                syslog(LOG_DEBUG,
-                                       "Unknown query <%s> - returning <service-unavailable/>\n",
-                                       el
+                                           "Unknown query <%s> - returning <service-unavailable/>\n",
+                                           el
                                );
                                cprintf("<iq type=\"error\" id=\"%s\">", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf));
                                cprintf("<error code=\"503\" type=\"cancel\">"
@@ -479,6 +524,10 @@ void xmpp_xml_end(void *data, const char *supplied_el) {
                CC->kill_me = KILLME_CLIENT_LOGGED_OUT;
        }
 
+       else if (!strcasecmp(el, "query")) {
+               // no action required here, we picked up the xmlns= parameter during xmpp_xml_start()
+       }
+
        else {
                syslog(LOG_DEBUG, "Ignoring unknown tag <%s>\n", el);
        }
@@ -579,10 +628,11 @@ void xmpp_command_loop(void) {
        time(&CC->lastcmd);
        rc = client_read_random_blob(stream_input, 30);
        if (rc > 0) {
+               syslog(LOG_DEBUG, "\033[32m%s\033[0m", ChrPtr(stream_input));
                XML_Parse(XMPP->xp, ChrPtr(stream_input), rc, 0);
        }
        else {
-               syslog(LOG_ERR, "XMPP: client disconnected: ending session.\n");
+               syslog(LOG_ERR, "client disconnected: ending session.\n");
                CC->kill_me = KILLME_CLIENT_DISCONNECTED;
        }
        FreeStrBuf(&stream_input);
@@ -614,6 +664,10 @@ void xmpp_logout_hook(void) {
 }
 
 
+void LogXMPPSrvDebugEnable(const int n)
+{
+       XMPPSrvDebugEnable = n;
+}
 const char *CitadelServiceXMPP="XMPP";
 extern void xmpp_cleanup_events(void);
 CTDL_MODULE_INIT(xmpp)
@@ -626,11 +680,12 @@ CTDL_MODULE_INIT(xmpp)
                                        xmpp_async_loop,
                                        CitadelServiceXMPP
                );
-               CtdlRegisterSessionHook(xmpp_cleanup_function, EVT_STOP);
-                CtdlRegisterSessionHook(xmpp_login_hook, EVT_LOGIN);
-                CtdlRegisterSessionHook(xmpp_logout_hook, EVT_LOGOUT);
-                CtdlRegisterSessionHook(xmpp_login_hook, EVT_UNSTEALTH);
-                CtdlRegisterSessionHook(xmpp_logout_hook, EVT_STEALTH);
+               CtdlRegisterDebugFlagHook(HKEY("serv_xmpp"), LogXMPPSrvDebugEnable, &XMPPSrvDebugEnable);
+               CtdlRegisterSessionHook(xmpp_cleanup_function, EVT_STOP, PRIO_STOP + 70);
+                CtdlRegisterSessionHook(xmpp_login_hook, EVT_LOGIN, PRIO_LOGIN + 90);
+                CtdlRegisterSessionHook(xmpp_logout_hook, EVT_LOGOUT, PRIO_LOGOUT + 90);
+                CtdlRegisterSessionHook(xmpp_login_hook, EVT_UNSTEALTH, PRIO_UNSTEALTH + 1);
+                CtdlRegisterSessionHook(xmpp_logout_hook, EVT_STEALTH, PRIO_STEALTH + 1);
                CtdlRegisterCleanupHook(xmpp_cleanup_events);
 
        }