/*
* XMPP (Jabber) service for the Citadel system
- * Copyright (c) 2007-2018 by Art Cancro and citadel.org
+ * Copyright (c) 2007-2021 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
#include "database.h"
#include "msgbase.h"
#include "internet_addressing.h"
-#include "md5.h"
#include "ctdl_module.h"
#include "serv_xmpp.h"
/* uncomment for more verbosity - it will log all received XML tags */
-#define XMPP_XML_DEBUG
+// #define XMPP_XML_DEBUG
/* XML_StopParser is present in expat 2.x */
#if XML_MAJOR_VERSION > 1
struct xmpp_event *xmpp_queue = NULL;
-
#ifdef HAVE_XML_STOPPARSER
/* Stop the parser if an entity declaration is hit. */
static void xmpp_entity_declaration(void *userData, const XML_Char *entityName,
/*
- * 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.
+ * support function for xmlesc() which helps with UTF-8 strings
*/
static inline int Ctdl_GetUtf8SequenceLength(const char *CharS, const char *CharE)
{
int n = 0;
unsigned char test = (1<<7);
- if ((*CharS & 0xC0) != 0xC0)
+ if ((*CharS & 0xC0) != 0xC0) {
return 1;
+ }
- while ((n < 8) &&
- ((test & ((unsigned char)*CharS)) != 0))
- {
+ while ((n < 8) && ((test & ((unsigned char)*CharS)) != 0)) {
test = test >> 1;
n ++;
}
- if ((n > 6) || ((CharE - CharS) < n))
+ if ((n > 6) || ((CharE - CharS) < n)) {
n = 0;
+ }
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.
+ */
char *xmlesc(char *buf, char *str, int bufsiz)
{
int IsUtf8Sequence;
buf[len] = 0;
}
else if (ch < 0x20) {
- /* we probably shouldn't be doing this */
- buf[len++] = '_';
+ buf[len++] = '_'; // we probably shouldn't be doing this
buf[len] = 0;
}
else {
}
cprintf("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-
cprintf("<stream:stream ");
cprintf("from=\"%s\" ", xmlesc(xmlbuf, XMPP->server_name, sizeof xmlbuf));
cprintf("id=\"%08x\" ", CC->cs_pid);
/* 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\"/>");
-
cprintf("</stream:features>");
CC->is_async = 1; /* XMPP sessions are inherently async-capable */
char *sep = NULL;
int i;
- /* Axe the namespace, we don't care about it */
+ /* Create a version of the element with the namespace removed.
+ * Now we can access "el" or "supplied_el" depending on whether we want to see the whole namespace.
+ */
safestrncpy(el, supplied_el, sizeof el);
while (sep = strchr(el, ':'), sep) {
strcpy(el, ++sep);
}
-
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 */
+ /* Create a version of the element with the namespace removed.
+ * Now we can access "el" or "supplied_el" depending on whether we want to see the whole namespace.
+ */
safestrncpy(el, supplied_el, sizeof el);
while (sep = strchr(el, ':'), sep) {
strcpy(el, ++sep);
cprintf("id=\"%s\"/>", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf));
}
+ /*
+ * Client is requesting its own vCard
+ * (If we make this more elaborate, move it to a separate function)
+ */
+ else if (XMPP->iq_vcard) {
+ cprintf("<iq type=\"result\" id=\"%s\" ", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf));
+ cprintf("to=\"%s\">", xmlesc(xmlbuf, XMPP->iq_from, sizeof xmlbuf));
+ cprintf("<vCard xmlns=\"vcard-temp\">");
+ cprintf("<fn>%s</fn>", xmlesc(xmlbuf, CC->user.fullname, sizeof xmlbuf));
+ cprintf("<nickname>%s</nickname>", xmlesc(xmlbuf, CC->user.fullname, sizeof xmlbuf));
+ cprintf("</vCard>");
+ cprintf("</iq>");
+ }
+
/*
* Unknown query ... return the XML equivalent of a blank stare
*/
else if (
(!strcasecmp(XMPP->iq_type, "set"))
&& (!strcasecmp(XMPP->iq_query_xmlns, "jabber:iq:auth:query"))
- ) {
-
- xmpp_non_sasl_authenticate(
- XMPP->iq_id,
- XMPP->iq_client_username,
- XMPP->iq_client_password,
- XMPP->iq_client_resource
- );
+ ) {
+ xmpp_non_sasl_authenticate(XMPP->iq_id, XMPP->iq_client_username, 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 */
+ if (IsEmptyStr(XMPP->iq_client_resource)) {
+ snprintf(XMPP->iq_client_resource, sizeof XMPP->iq_client_resource, "%d", CC->cs_pid);
+ }
- snprintf(XMPP->client_jid, sizeof XMPP->client_jid,
- "%s/%s",
- CC->cs_inet_email,
- XMPP->iq_client_resource
- );
+ /* Generate the "full JID" of the client (user@host/resource) */
+ snprintf(XMPP->client_jid, sizeof XMPP->client_jid, "%s/%s", CC->cs_principal_id, XMPP->iq_client_resource);
/* Tell the client what its JID is */
-
cprintf("<iq type=\"result\" id=\"%s\">", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf));
cprintf("<bind xmlns=\"urn:ietf:params:xml:ns:xmpp-bind\">");
cprintf("<jid>%s</jid>", xmlesc(xmlbuf, XMPP->client_jid, sizeof xmlbuf));
XMPP->iq_type[0] = 0;
XMPP->iq_client_resource[0] = 0;
XMPP->iq_session = 0;
+ XMPP->iq_vcard = 0;
XMPP->iq_query_xmlns[0] = 0;
XMPP->bind_requested = 0;
XMPP->ping_requested = 0;
}
else if (!strcasecmp(el, "auth")) {
-
/* Try to authenticate (this function is responsible for the output stanza) */
xmpp_sasl_auth(XMPP->sasl_auth_mech, (XMPP->chardata != NULL ? XMPP->chardata : "") );
XMPP->iq_session = 1;
}
- else if (!strcasecmp(el, "presence")) {
+ else if (!strcasecmp(supplied_el, "vcard-temp:vCard")) {
+ XMPP->iq_vcard = 1;
+ }
+ else if (!strcasecmp(el, "presence")) {
/* Respond to a <presence> update by firing back with presence information
* on the entire wholist. Check this assumption, it's probably wrong.
*/
* Login hook for XMPP sessions
*/
void xmpp_login_hook(void) {
- xmpp_queue_event(XMPP_EVT_LOGIN, CC->cs_inet_email);
+ xmpp_queue_event(XMPP_EVT_LOGIN, CC->cs_principal_id);
}
* Logout hook for XMPP sessions
*/
void xmpp_logout_hook(void) {
- xmpp_queue_event(XMPP_EVT_LOGOUT, CC->cs_inet_email);
+ xmpp_queue_event(XMPP_EVT_LOGOUT, CC->cs_principal_id);
}
const char *CitadelServiceXMPP="XMPP";
-extern void xmpp_cleanup_events(void);
CTDL_MODULE_INIT(xmpp)
{
if (!threading) {
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);
}
projects / citadel.git / blobdiff