X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fserv_xmpp.c;h=e0b61af64413e38b7978d4b42d0f5388cd2ef71a;hb=df8fe1be788cd4193b9e213009b665b47f1ed385;hp=64dc8b7aa2f4e723a1d8a75be85e536506a546b1;hpb=30ad8940ba800c133c0b1cb66973aaacbf68fe5d;p=citadel.git
diff --git a/citadel/modules/xmpp/serv_xmpp.c b/citadel/modules/xmpp/serv_xmpp.c
index 64dc8b7aa..e0b61af64 100644
--- 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-2015 by Art Cancro and citadel.org
+ * 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
@@ -57,6 +57,9 @@
#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
@@ -64,9 +67,6 @@
struct xmpp_event *xmpp_queue = NULL;
-int XMPPSrvDebugEnable = 0;
-
-
#ifdef HAVE_XML_STOPPARSER
/* Stop the parser if an entity declaration is hit. */
@@ -76,13 +76,12 @@ static void xmpp_entity_declaration(void *userData, const XML_Char *entityName,
const XML_Char *systemId, const XML_Char *publicId,
const XML_Char *notationName
) {
- XMPPM_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
-
/*
* Given a source string and a target buffer, returns the string
* properly escaped for insertion into an XML stream. Returns a
@@ -107,6 +106,7 @@ static inline int Ctdl_GetUtf8SequenceLength(const char *CharS, const char *Char
return n;
}
+
char *xmlesc(char *buf, char *str, int bufsiz)
{
int IsUtf8Sequence;
@@ -239,12 +239,12 @@ void xmpp_xml_start(void *data, const char *supplied_el, const char **attr) {
strcpy(el, ++sep);
}
- /*
- 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 */
+#endif
if (!strcasecmp(el, "stream")) {
xmpp_stream_start(data, supplied_el, attr);
@@ -311,33 +311,30 @@ void xmpp_xml_end(void *data, const char *supplied_el) {
strcpy(el, ++sep);
}
- /*
- XMPP_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) {
- XMPP_syslog(LOG_DEBUG, " chardata: %s\n", XMPP->chardata);
+ syslog(LOG_DEBUG, "xmpp: chardata: %s", XMPP->chardata);
}
- uncomment for more verbosity */
+#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);
}
}
@@ -353,8 +350,7 @@ void xmpp_xml_end(void *data, const char *supplied_el) {
* 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);
}
/*
@@ -375,10 +371,7 @@ void xmpp_xml_end(void *data, const char *supplied_el) {
* Unknown query ... return the XML equivalent of a blank stare
*/
else {
- XMPP_syslog(LOG_DEBUG,
- "Unknown query <%s> - returning \n",
- el
- );
+ syslog(LOG_DEBUG, "xmpp: Unknown query <%s> - returning ", el);
cprintf("", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf));
cprintf(""
""
@@ -410,17 +403,27 @@ void xmpp_xml_end(void *data, const char *supplied_el) {
else if (
(XMPP->bind_requested)
&& (!IsEmptyStr(XMPP->iq_id))
- && (!IsEmptyStr(XMPP->iq_client_resource))
&& (CC->logged_in)
- ) {
+ ) {
+
+ /* If the client has not specified a client resource, generate one */
+
+ if (IsEmptyStr(XMPP->iq_client_resource)) {
+ generate_uuid(XMPP->iq_client_resource);
+ }
/* 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
- );
+ if (IsEmptyStr(CC->cs_inet_email)) { // synthetic user@host if no email is set
+ snprintf(XMPP->client_jid, sizeof XMPP->client_jid,
+ "%ld@%s/%s", CC->user.usernum, CtdlGetConfigStr("c_fqdn"), XMPP->iq_client_resource
+ );
+ }
+ else { // use the email address if we have it
+ 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 */
@@ -438,8 +441,9 @@ void xmpp_xml_end(void *data, const char *supplied_el) {
else {
cprintf("", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf));
- cprintf("Don't know howto do '%s'!", xmlesc(xmlbuf, XMPP->iq_type, sizeof xmlbuf));
+ cprintf("Don't know how to do '%s'!", xmlesc(xmlbuf, XMPP->iq_type, sizeof xmlbuf));
cprintf("");
+ 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 */
@@ -510,7 +514,7 @@ void xmpp_xml_end(void *data, const char *supplied_el) {
}
else if (!strcasecmp(el, "stream")) {
- XMPPM_syslog(LOG_DEBUG, "XMPP client shut down their stream\n");
+ syslog(LOG_DEBUG, "xmpp: client shut down their stream");
xmpp_massacre_roster();
cprintf("\n");
CC->kill_me = KILLME_CLIENT_LOGGED_OUT;
@@ -525,7 +529,7 @@ void xmpp_xml_end(void *data, const char *supplied_el) {
}
else {
- XMPP_syslog(LOG_DEBUG, "Ignoring unknown tag <%s>\n", el);
+ syslog(LOG_DEBUG, "xmpp: ignoring unknown tag <%s>", el);
}
XMPP->chardata_len = 0;
@@ -575,7 +579,6 @@ void xmpp_cleanup_function(void) {
}
-
/*
* Here's where our XMPP session begins its happy day.
*/
@@ -590,7 +593,7 @@ void xmpp_greeting(void) {
XMPP->xp = XML_ParserCreateNS("UTF-8", ':');
if (XMPP->xp == NULL) {
- XMPPM_syslog(LOG_ALERT, "Cannot create XML parser!\n");
+ syslog(LOG_ERR, "xmpp: cannot create XML parser");
CC->kill_me = KILLME_XML_PARSER;
return;
}
@@ -627,7 +630,7 @@ void xmpp_command_loop(void) {
XML_Parse(XMPP->xp, ChrPtr(stream_input), rc, 0);
}
else {
- XMPPM_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);
@@ -659,23 +662,18 @@ 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)
{
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);