Updated XMPP server to new logging standard

[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 ea4adc48be009d30aecf3b85e65063d64f5d7226..2ee2493cc1fe8b6e48fbbbe53e4ef64826be5228 100644 (file)
--- a/citadel/modules/xmpp/serv_xmpp.c
+++ b/citadel/modules/xmpp/serv_xmpp.c
@@ -1,6 +1,6 @@
 /*
  * XMPP (Jabber) service for the Citadel system
- * Copyright (c) 2007-2011 by Art Cancro
+ * Copyright (c) 2007-2017 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 as published by
@@ -17,9 +17,6 @@
  * 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>
@@ -79,14 +76,20 @@ 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.");
+       syslog(LOG_WARNING, "xmpp: illegal entity declaration encountered; stopping parser.");
        XML_StopParser(XMPP->xp, XML_FALSE);
 }
 #endif
 
-static inline int XMPP_GetUtf8SequenceLength(const char *CharS, const char *CharE)
+
+
+/*
+ * Given a source string and a target buffer, returns the string
+ * properly escaped for insertion into an XML stream.  Returns a
+ * pointer to the target buffer for convenience.
+ */
+static inline int Ctdl_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);
 
@@ -104,22 +107,13 @@ static inline int XMPP_GetUtf8SequenceLength(const char *CharS, const char *Char
        return n;
 }
 
-
-/*
- * Given a source string and a target buffer, returns the string
- * properly escaped for insertion into an XML stream.  Returns a
- * pointer to the target buffer for convenience.
- *
- * BUG: this does not properly handle UTF-8
- */
 char *xmlesc(char *buf, char *str, int bufsiz)
 {
-       char *ptr;
-       char *eiptr;
+       int IsUtf8Sequence;
+       char *ptr, *pche;
        unsigned char ch;
        int inlen;
        int len = 0;
-       int IsUtf8Sequence;
 
        if (!buf) return(NULL);
        buf[0] = 0;
@@ -127,9 +121,8 @@ char *xmlesc(char *buf, char *str, int bufsiz)
        if (!str) {
                return(buf);
        }
-
        inlen = strlen(str);
-       eiptr = str + inlen;
+       pche = str + inlen;
 
        for (ptr=str; *ptr; ptr++) {
                ch = *ptr;
@@ -155,21 +148,20 @@ char *xmlesc(char *buf, char *str, int bufsiz)
                        buf[len] = 0;
                }
                else {
-                       char oct[32];
-
-                       IsUtf8Sequence =  XMPP_GetUtf8SequenceLength(&buf[len], eiptr);
+                       IsUtf8Sequence =  Ctdl_GetUtf8SequenceLength(ptr, pche);
                        if (IsUtf8Sequence)
                        {
-                               while (IsUtf8Sequence > 0){
+                               while ((IsUtf8Sequence > 0) && 
+                                      (ptr < pche))
+                               {
                                        buf[len] = *ptr;
-                                       len ++;
-                                       if (--IsUtf8Sequence)
-                                               ptr++;
+                                       ptr ++;
+                                       --IsUtf8Sequence;
                                }
-                               buf[len] = '\0';
                        }
                        else
                        {
+                               char oct[10];
                                sprintf(oct, "&#%o;", ch);
                                strcpy(&buf[len], oct);
                                len += strlen(oct);
@@ -247,12 +239,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);
+       /*
+       syslog(LOG_DEBUG, "xmpp: ELEMENT START: <%s>", el);
        for (i=0; attr[i] != NULL; i+=2) {
-               syslog(LOG_DEBUG, "                    Attribute '%s' = '%s'\n", attr[i], attr[i+1]);
+               syslog(LOG_DEBUG, "xmpp: Attribute '%s' = '%s'", attr[i], attr[i+1]);
        }
-#endif /* XMPP_DEBUG */
+       uncomment for more verbosity */
 
        if (!strcasecmp(el, "stream")) {
                xmpp_stream_start(data, supplied_el, attr);
@@ -319,12 +311,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);
+       /*
+       syslog(LOG_DEBUG, "xmpp: ELEMENT END  : <%s>", el);
        if (XMPP->chardata_len > 0) {
-               syslog(LOG_DEBUG, "          chardata: %s\n", XMPP->chardata);
+               syslog(LOG_DEBUG, "xmpp: chardata: %s", XMPP->chardata);
        }
-#endif /* XMPP_DEBUG */
+       uncomment for more verbosity */
 
        if (!strcasecmp(el, "resource")) {
                if (XMPP->chardata_len > 0) {
@@ -383,10 +375,7 @@ 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
-                               );
+                               syslog(LOG_DEBUG, "xmpp: Unknown query <%s> - returning <service-unavailable/>", el);
                                cprintf("<iq type=\"error\" id=\"%s\">", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf));
                                cprintf("<error code=\"503\" type=\"cancel\">"
                                        "<service-unavailable xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\"/>"
@@ -518,18 +507,22 @@ 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");
+               syslog(LOG_DEBUG, "xmpp: client shut down their stream");
                xmpp_massacre_roster();
                cprintf("</stream>\n");
                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()
+               /* already processed , no further action needed here */
+       }
+
+       else if (!strcasecmp(el, "bind")) {
+               /* already processed , no further action needed here */
        }
 
        else {
-               syslog(LOG_DEBUG, "Ignoring unknown tag <%s>\n", el);
+               syslog(LOG_DEBUG, "xmpp: ignoring unknown tag <%s>", el);
        }
 
        XMPP->chardata_len = 0;
@@ -594,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");
+               syslog(LOG_ERR, "xmpp: cannot create XML parser");
                CC->kill_me = KILLME_XML_PARSER;
                return;
        }
@@ -628,11 +621,10 @@ 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, "client disconnected: ending session.\n");
+               syslog(LOG_ERR, "xmpp: client disconnected: ending session.");
                CC->kill_me = KILLME_CLIENT_DISCONNECTED;
        }
        FreeStrBuf(&stream_input);
@@ -673,7 +665,7 @@ extern void xmpp_cleanup_events(void);
 CTDL_MODULE_INIT(xmpp)
 {
        if (!threading) {
-               CtdlRegisterServiceHook(config.c_xmpp_c2s_port,
+               CtdlRegisterServiceHook(CtdlGetConfigInt("c_xmpp_c2s_port"),
                                        NULL,
                                        xmpp_greeting,
                                        xmpp_command_loop,