/*
* XMPP (Jabber) service for the Citadel system
- * Copyright (c) 2007-2011 by Art Cancro
+ * Copyright (c) 2007-2018 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
* 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>
#include "ctdl_module.h"
#include "serv_xmpp.h"
+/* uncomment for more verbosity - it will log all received XML tags */
+#define XMPP_XML_DEBUG
+
/* XML_StopParser is present in expat 2.x */
#if XML_MAJOR_VERSION > 1
#define HAVE_XML_STOPPARSER
struct xmpp_event *xmpp_queue = NULL;
-int XMPPSrvDebugEnable = 0;
-
-
#ifdef HAVE_XML_STOPPARSER
/* Stop the parser if an entity declaration is hit. */
const XML_Char *systemId, const XML_Char *publicId,
const XML_Char *notationName
) {
-<<<<<<< HEAD
- syslog(LOG_WARNING, "Illegal entity declaration encountered; stopping parser.");
-=======
- XMPPM_syslog(LOG_WARNING, "Illegal entity declaration encountered; stopping parser.");
->>>>>>> 1c0b8162b0a90f2e97028a531005c11b09441498
+ 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);
}
-/*
- * 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;
if (!str) {
return(buf);
}
-
inlen = strlen(str);
- eiptr = str + inlen;
+ pche = str + inlen;
for (ptr=str; *ptr; ptr++) {
ch = *ptr;
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);
/*
* TLS encryption (but only if it isn't already active)
-<<<<<<< HEAD
*/
-=======
- * /
->>>>>>> 1c0b8162b0a90f2e97028a531005c11b09441498
#ifdef HAVE_OPENSSL
if (!CC->redirect_ssl) {
cprintf("<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'></starttls>");
}
#endif
-<<<<<<< HEAD
-=======
- */
->>>>>>> 1c0b8162b0a90f2e97028a531005c11b09441498
if (!CC->logged_in) {
/* If we're not logged in yet, offer SASL as our feature set */
xmpp_output_auth_mechs();
/* Offer binding and sessions as part of our feature set */
cprintf("<bind xmlns=\"urn:ietf:params:xml:ns:xmpp-bind\"/>");
cprintf("<session xmlns=\"urn:ietf:params:xml:ns:xmpp-session\"/>");
-<<<<<<< HEAD
cprintf("</stream:features>");
-=======
->>>>>>> 1c0b8162b0a90f2e97028a531005c11b09441498
- cprintf("</stream:features>");
-
-<<<<<<< HEAD
-
-=======
CC->is_async = 1; /* XMPP sessions are inherently async-capable */
}
->>>>>>> 1c0b8162b0a90f2e97028a531005c11b09441498
void xmpp_xml_start(void *data, const char *supplied_el, const char **attr) {
char el[256];
char *sep = NULL;
strcpy(el, ++sep);
}
-<<<<<<< HEAD
-#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]);
- }
-#endif /* XMPP_DEBUG */
-=======
- /*
- XMPP_syslog(LOG_DEBUG, "XMPP ELEMENT START: <%s>\n", el);
+#ifdef XMPP_XML_DEBUG
+ syslog(LOG_DEBUG, "xmpp: ELEMENT START: <%s>", el);
for (i=0; attr[i] != NULL; i+=2) {
- XMPP_syslog(LOG_DEBUG, " Attribute '%s' = '%s'\n", attr[i], attr[i+1]);
+ syslog(LOG_DEBUG, "xmpp: Attribute '%s' = '%s'", attr[i], attr[i+1]);
}
- uncomment for more verbosity */
->>>>>>> 1c0b8162b0a90f2e97028a531005c11b09441498
+#endif
if (!strcasecmp(el, "stream")) {
xmpp_stream_start(data, supplied_el, attr);
else if (!strcasecmp(el, "query")) {
XMPP->iq_query_xmlns[0] = 0;
safestrncpy(XMPP->iq_query_xmlns, supplied_el, sizeof XMPP->iq_query_xmlns);
-<<<<<<< HEAD
- }
-
- else if (!strcasecmp(el, "bind")) {
- XMPP->bind_requested = 1;
- }
-
- else if (!strcasecmp(el, "iq")) {
- for (i=0; attr[i] != NULL; i+=2) {
- if (!strcasecmp(attr[i], "type")) {
- safestrncpy(XMPP->iq_type, attr[i+1], sizeof XMPP->iq_type);
- }
- else if (!strcasecmp(attr[i], "id")) {
- safestrncpy(XMPP->iq_id, attr[i+1], sizeof XMPP->iq_id);
- }
- else if (!strcasecmp(attr[i], "from")) {
- safestrncpy(XMPP->iq_from, attr[i+1], sizeof XMPP->iq_from);
- }
- else if (!strcasecmp(attr[i], "to")) {
- safestrncpy(XMPP->iq_to, attr[i+1], sizeof XMPP->iq_to);
- }
- }
- }
-
- else if (!strcasecmp(el, "auth")) {
- XMPP->sasl_auth_mech[0] = 0;
- for (i=0; attr[i] != NULL; i+=2) {
- if (!strcasecmp(attr[i], "mechanism")) {
- safestrncpy(XMPP->sasl_auth_mech, attr[i+1], sizeof XMPP->sasl_auth_mech);
- }
- }
- }
-
- else if (!strcasecmp(el, "message")) {
- for (i=0; attr[i] != NULL; i+=2) {
- if (!strcasecmp(attr[i], "to")) {
- safestrncpy(XMPP->message_to, attr[i+1], sizeof XMPP->message_to);
- }
- }
-=======
}
else if (!strcasecmp(el, "bind")) {
strcpy(el, ++sep);
}
- /*
- XMPP_syslog(LOG_DEBUG, "XMPP ELEMENT END : <%s>\n", el);
- if (XMPP->chardata_len > 0) {
- XMPP_syslog(LOG_DEBUG, " chardata: %s\n", XMPP->chardata);
->>>>>>> 1c0b8162b0a90f2e97028a531005c11b09441498
- }
-
-<<<<<<< HEAD
- else if (!strcasecmp(el, "html")) {
- ++XMPP->html_tag_level;
- }
-}
-
-
-
-void xmpp_xml_end(void *data, const char *supplied_el) {
- char el[256];
- char *sep = NULL;
- char xmlbuf[256];
-
- /* Axe the namespace, we don't care about it */
- safestrncpy(el, supplied_el, sizeof el);
- while (sep = strchr(el, ':'), sep) {
- strcpy(el, ++sep);
- }
-
-#ifdef XMPP_DEBUG
- syslog(LOG_DEBUG, "XMPP ELEMENT END : <%s>\n", el);
+#ifdef XMPP_XML_DEBUG
+ 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 */
-
- if (!strcasecmp(el, "resource")) {
- if (XMPP->chardata_len > 0) {
- safestrncpy(XMPP->iq_client_resource, XMPP->chardata,
- sizeof XMPP->iq_client_resource);
- striplt(XMPP->iq_client_resource);
- }
- }
-
- else if (!strcasecmp(el, "username")) { /* NON SASL ONLY */
- if (XMPP->chardata_len > 0) {
- safestrncpy(XMPP->iq_client_username, XMPP->chardata,
- sizeof XMPP->iq_client_username);
- striplt(XMPP->iq_client_username);
- }
- }
-
- else if (!strcasecmp(el, "password")) { /* NON SASL ONLY */
- if (XMPP->chardata_len > 0) {
- safestrncpy(XMPP->iq_client_password, XMPP->chardata,
- sizeof XMPP->iq_client_password);
- striplt(XMPP->iq_client_password);
- }
- }
-
- else if (!strcasecmp(el, "iq")) {
+#endif
-=======
if (!strcasecmp(el, "resource")) {
if (XMPP->chardata_len > 0) {
- safestrncpy(XMPP->iq_client_resource, XMPP->chardata,
- sizeof XMPP->iq_client_resource);
+ safestrncpy(XMPP->iq_client_resource, XMPP->chardata, sizeof XMPP->iq_client_resource);
striplt(XMPP->iq_client_resource);
}
}
else if (!strcasecmp(el, "username")) { /* NON SASL ONLY */
if (XMPP->chardata_len > 0) {
- safestrncpy(XMPP->iq_client_username, XMPP->chardata,
- sizeof XMPP->iq_client_username);
+ safestrncpy(XMPP->iq_client_username, XMPP->chardata, sizeof XMPP->iq_client_username);
striplt(XMPP->iq_client_username);
}
}
else if (!strcasecmp(el, "password")) { /* NON SASL ONLY */
if (XMPP->chardata_len > 0) {
- safestrncpy(XMPP->iq_client_password, XMPP->chardata,
- sizeof XMPP->iq_client_password);
+ safestrncpy(XMPP->iq_client_password, XMPP->chardata, sizeof XMPP->iq_client_password);
striplt(XMPP->iq_client_password);
}
}
else if (!strcasecmp(el, "iq")) {
->>>>>>> 1c0b8162b0a90f2e97028a531005c11b09441498
/*
* iq type="get" (handle queries)
*/
* Query on a namespace
*/
if (!IsEmptyStr(XMPP->iq_query_xmlns)) {
- xmpp_query_namespace(XMPP->iq_id, XMPP->iq_from,
- XMPP->iq_to, XMPP->iq_query_xmlns);
+ xmpp_query_namespace(XMPP->iq_id, XMPP->iq_from, XMPP->iq_to, XMPP->iq_query_xmlns);
}
/*
* Unknown query ... return the XML equivalent of a blank stare
*/
else {
-<<<<<<< HEAD
- syslog(LOG_DEBUG,
-=======
- XMPP_syslog(LOG_DEBUG,
->>>>>>> 1c0b8162b0a90f2e97028a531005c11b09441498
- "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\"/>"
xmpp_non_sasl_authenticate(
XMPP->iq_id,
XMPP->iq_client_username,
- XMPP->iq_client_password,
- XMPP->iq_client_resource
+ XMPP->iq_client_password
);
}
else if (
(XMPP->bind_requested)
&& (!IsEmptyStr(XMPP->iq_id))
- && (!IsEmptyStr(XMPP->iq_client_resource))
&& (CC->logged_in)
- ) {
+ ) {
- /* Generate the "full JID" of the client resource */
+ /* If the client has not specified a client resource, generate one */
- snprintf(XMPP->client_jid, sizeof XMPP->client_jid,
- "%s/%s",
- CC->cs_inet_email,
- XMPP->iq_client_resource
- );
+ if (IsEmptyStr(XMPP->iq_client_resource)) {
+ snprintf(XMPP->iq_client_resource, sizeof XMPP->iq_client_resource, "%d", CC->cs_pid);
+ }
+
+ /* Generate the "full JID" of the client resource */
+ snprintf(XMPP->client_jid, sizeof XMPP->client_jid, "%s/%s", CC->cs_inet_email, XMPP->iq_client_resource);
/* Tell the client what its JID is */
else {
cprintf("<iq type=\"error\" id=\"%s\">", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf));
- cprintf("<error>Don't know howto do '%s'!</error>", xmlesc(xmlbuf, XMPP->iq_type, sizeof xmlbuf));
+ cprintf("<error>Don't know how to do '%s'!</error>", xmlesc(xmlbuf, XMPP->iq_type, sizeof xmlbuf));
cprintf("</iq>");
+ syslog(LOG_DEBUG, "XMPP: don't know how to do iq_type='%s' with iq_query_xmlns='%s'", XMPP->iq_type, XMPP->iq_query_xmlns);
}
/* Now clear these fields out so they don't get used by a future stanza */
else if (!strcasecmp(el, "ping")) {
XMPP->ping_requested = 1;
-<<<<<<< HEAD
}
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 {
- syslog(LOG_DEBUG, "Ignoring unknown tag <%s>\n", el);
-=======
- }
-
- else if (!strcasecmp(el, "stream")) {
- 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 if (!strcasecmp(el, "bind")) {
+ /* already processed , no further action needed here */
}
else {
- XMPP_syslog(LOG_DEBUG, "Ignoring unknown tag <%s>\n", el);
->>>>>>> 1c0b8162b0a90f2e97028a531005c11b09441498
+ syslog(LOG_DEBUG, "xmpp: ignoring unknown tag <%s>", el);
}
XMPP->chardata_len = 0;
}
-
/*
* Here's where our XMPP session begins its happy day.
*/
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;
}
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);
}
-void LogXMPPSrvDebugEnable(const int n)
-{
- XMPPSrvDebugEnable = n;
-}
const char *CitadelServiceXMPP="XMPP";
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,
xmpp_async_loop,
CitadelServiceXMPP
);
- 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);
projects / citadel.git / blobdiff