Revert xmpp back to a working state

[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..7986cb573fdb254de00bac8f1684f79cff2896e6 100644 (file)
--- a/citadel/modules/xmpp/serv_xmpp.c
+++ b/citadel/modules/xmpp/serv_xmpp.c
@@ -57,13 +57,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
@@ -74,11 +76,30 @@ static void xmpp_entity_declaration(void *userData, const XML_Char *entityName,
                                const XML_Char *systemId, const XML_Char *publicId,
                                const XML_Char *notationName
 ) {
-       syslog(LOG_WARNING, "Illegal entity declaration encountered; stopping parser.");
+       XMPPM_syslog(LOG_WARNING, "Illegal entity declaration encountered; stopping parser.");
        XML_StopParser(XMPP->xp, XML_FALSE);
 }
 #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 +112,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 +125,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 +152,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);
@@ -166,13 +208,13 @@ void xmpp_stream_start(void *data, const char *supplied_el, const char **attr)
 
        /*
         * TLS encryption (but only if it isn't already active)
-        */ 
+        * / 
 #ifdef HAVE_OPENSSL
        if (!CC->redirect_ssl) {
                cprintf("<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'></starttls>");
        }
 #endif
-
+       */
        if (!CC->logged_in) {
                /* If we're not logged in yet, offer SASL as our feature set */
                xmpp_output_auth_mechs();
@@ -203,9 +245,9 @@ void xmpp_xml_start(void *data, const char *supplied_el, const char **attr) {
        }
 
        /*
-       syslog(LOG_DEBUG, "XMPP ELEMENT START: <%s>\n", el);
+       XMPP_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]);
+               XMPP_syslog(LOG_DEBUG, "                    Attribute '%s' = '%s'\n", attr[i], attr[i+1]);
        }
        uncomment for more verbosity */
 
@@ -275,9 +317,9 @@ void xmpp_xml_end(void *data, const char *supplied_el) {
        }
 
        /*
-       syslog(LOG_DEBUG, "XMPP ELEMENT END  : <%s>\n", el);
+       XMPP_syslog(LOG_DEBUG, "XMPP ELEMENT END  : <%s>\n", el);
        if (XMPP->chardata_len > 0) {
-               syslog(LOG_DEBUG, "          chardata: %s\n", XMPP->chardata);
+               XMPP_syslog(LOG_DEBUG, "          chardata: %s\n", XMPP->chardata);
        }
        uncomment for more verbosity */
 
@@ -338,9 +380,9 @@ void xmpp_xml_end(void *data, const char *supplied_el) {
                         * Unknown query ... return the XML equivalent of a blank stare
                         */
                        else {
-                               syslog(LOG_DEBUG,
-                                       "Unknown query <%s> - returning <service-unavailable/>\n",
-                                       el
+                               XMPP_syslog(LOG_DEBUG,
+                                           "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\">"
@@ -473,14 +515,14 @@ void xmpp_xml_end(void *data, const char *supplied_el) {
        }
 
        else if (!strcasecmp(el, "stream")) {
-               syslog(LOG_DEBUG, "XMPP client shut down their stream\n");
+               XMPPM_syslog(LOG_DEBUG, "XMPP client shut down their stream\n");
                xmpp_massacre_roster();
                cprintf("</stream>\n");
                CC->kill_me = KILLME_CLIENT_LOGGED_OUT;
        }
 
        else {
-               syslog(LOG_DEBUG, "Ignoring unknown tag <%s>\n", el);
+               XMPP_syslog(LOG_DEBUG, "Ignoring unknown tag <%s>\n", el);
        }
 
        XMPP->chardata_len = 0;
@@ -545,7 +587,7 @@ void xmpp_greeting(void) {
 
        XMPP->xp = XML_ParserCreateNS("UTF-8", ':');
        if (XMPP->xp == NULL) {
-               syslog(LOG_ALERT, "Cannot create XML parser!\n");
+               XMPPM_syslog(LOG_ALERT, "Cannot create XML parser!\n");
                CC->kill_me = KILLME_XML_PARSER;
                return;
        }
@@ -582,7 +624,7 @@ void xmpp_command_loop(void) {
                XML_Parse(XMPP->xp, ChrPtr(stream_input), rc, 0);
        }
        else {
-               syslog(LOG_ERR, "XMPP: client disconnected: ending session.\n");
+               XMPPM_syslog(LOG_ERR, "client disconnected: ending session.\n");
                CC->kill_me = KILLME_CLIENT_DISCONNECTED;
        }
        FreeStrBuf(&stream_input);
@@ -614,6 +656,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 +672,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);
 
        }