/*
- * $Id: $
+ * $Id$
*
* XMPP (Jabber) service for the Citadel system
* Copyright (c) 2007 by Art Cancro
#include <limits.h>
#include <ctype.h>
#include <libcitadel.h>
+#include <expat.h>
#include "citadel.h"
#include "server.h"
#include "citserver.h"
#include "internet_addressing.h"
#include "md5.h"
#include "ctdl_module.h"
-
-#ifdef HAVE_EXPAT
-#include <expat.h>
#include "serv_xmpp.h"
+struct xmpp_event *xmpp_queue = NULL;
/* We have just received a <stream> tag from the client, so send them ours */
void xmpp_stream_start(void *data, const char *supplied_el, const char **attr)
{
+ lprintf(CTDL_DEBUG, "New XMPP stream.\n");
- lprintf(CTDL_DEBUG, "New stream detected.\n");
while (*attr) {
if (!strcasecmp(attr[0], "to")) {
safestrncpy(XMPP->server_name, attr[1], sizeof XMPP->server_name);
/* The features of this stream are... */
cprintf("<stream:features>");
- /* Binding... */
- cprintf("<bind xmlns=\"urn:ietf:params:xml:ns:xmpp-bind\"/>");
+#ifdef HAVE_OPENSSL_XXXX_COMMENTED_OUT
+ /* TLS encryption (but only if it isn't already active) */
+ if (!CC->redirect_ssl) {
+ cprintf("<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'></starttls>");
+ }
+#endif
- /* Sessions... */
- cprintf("<session xmlns=\"urn:ietf:params:xml:ns:xmpp-session\"/>");
+ if (!CC->logged_in) {
+ /* If we're not logged in yet, offer SASL as our feature set */
+ xmpp_output_auth_mechs();
+
+ /* Also offer non-SASL authentication */
+ cprintf("<auth xmlns=\"http://jabber.org/features/iq-auth\"/>");
+ }
- /* A really bad SASL implementation... */
- 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\"/>");
- /* ...and the ability to close XML tags using angle brackets. We should patent this. */
cprintf("</stream:features>");
+
+ CC->is_async = 1; /* XMPP sessions are inherently async-capable */
}
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);
+ }
+
+ else if (!strcasecmp(el, "bind")) {
+ XMPP->bind_requested = 1;
+ }
+
else if (!strcasecmp(el, "iq")) {
- const char *iqtype = NULL;
- const char *iqid = NULL;
for (i=0; attr[i] != NULL; i+=2) {
- if (!strcasecmp(attr[i], "type")) iqtype = attr[i+1];
- if (!strcasecmp(attr[i], "id")) iqid = attr[i+1];
- }
- if ((iqtype != NULL) && (iqid != NULL)) {
- if (!strcasecmp(iqtype, "set")) {
- safestrncpy(XMPP->iq_bind_id, iqid, sizeof XMPP->iq_bind_id);
+ 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, "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, "html")) {
+ ++XMPP->html_tag_level;
+ }
}
if (XMPP->chardata_len > 0) {
safestrncpy(XMPP->iq_client_resource, XMPP->chardata,
sizeof XMPP->iq_client_resource);
+ striplt(XMPP->iq_client_resource);
+ }
+ }
+
+ 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);
+ }
+ }
+
+ 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")) {
+ /*
+ * iq type="get" (handle queries)
+ */
+ if (!strcasecmp(XMPP->iq_type, "get")) {
+
+ /*
+ * 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);
+ }
- /* If this <iq> stanza was a "bind" attempt, process it ... */
+ /*
+ * Unknown queries ... return the XML equivalent of a blank stare
+ */
+ else {
+ cprintf("<iq type=\"result\" id=\"%s\">", XMPP->iq_id);
+ cprintf("</iq>");
+ }
+ }
- if ( (!IsEmptyStr(XMPP->iq_bind_id)) && (!IsEmptyStr(XMPP->iq_client_resource)) ) {
+ /*
+ * Non SASL authentication
+ */
+ else if (
+ (!strcasecmp(XMPP->iq_type, "set"))
+ && (!strcasecmp(XMPP->iq_query_xmlns, "jabber:iq:auth:query"))
+ ) {
+
+ jabber_non_sasl_authenticate(
+ XMPP->iq_id,
+ XMPP->iq_client_username,
+ XMPP->iq_client_password,
+ XMPP->iq_client_resource
+ );
+ }
+
+ /*
+ * If this <iq> stanza was a "bind" attempt, process it ...
+ */
+ 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 */
snprintf(XMPP->client_jid, sizeof XMPP->client_jid,
- "%d@%s/%s",
- CC->cs_pid,
- config.c_fqdn,
+ "%s/%s",
+ CC->cs_inet_email,
XMPP->iq_client_resource
);
/* Tell the client what its JID is */
- cprintf("<iq type=\"result\" id=\"%s\">", XMPP->iq_bind_id);
+ cprintf("<iq type=\"result\" id=\"%s\">", XMPP->iq_id);
cprintf("<bind xmlns=\"urn:ietf:params:xml:ns:xmpp-bind\">");
cprintf("<jid>%s</jid>", XMPP->client_jid);
cprintf("</bind>");
cprintf("</iq>");
}
+ else if (XMPP->iq_session) {
+ cprintf("<iq type=\"result\" id=\"%s\">", XMPP->iq_id);
+ cprintf("</iq>");
+ }
+
else {
- cprintf("<iq type=\"error\" id=\"%s\">", XMPP->iq_bind_id);
+ cprintf("<iq type=\"error\" id=\"%s\">", XMPP->iq_id);
cprintf("<error></error>");
cprintf("</iq>");
}
/* Now clear these fields out so they don't get used by a future stanza */
- XMPP->iq_bind_id[0] = 0;
+ XMPP->iq_id[0] = 0;
+ XMPP->iq_from[0] = 0;
+ XMPP->iq_to[0] = 0;
+ XMPP->iq_type[0] = 0;
XMPP->iq_client_resource[0] = 0;
+ XMPP->iq_session = 0;
+ XMPP->iq_query_xmlns[0] = 0;
+ XMPP->bind_requested = 0;
}
else if (!strcasecmp(el, "auth")) {
XMPP->sasl_auth_mech[0] = 0;
}
+ else if (!strcasecmp(el, "session")) {
+ XMPP->iq_session = 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.
+ */
+ jabber_wholist_presence_dump();
+ }
+
+ else if ( (!strcasecmp(el, "body")) && (XMPP->html_tag_level == 0) ) {
+ if (XMPP->message_body != NULL) {
+ free(XMPP->message_body);
+ XMPP->message_body = NULL;
+ }
+ if (XMPP->chardata_len > 0) {
+ XMPP->message_body = strdup(XMPP->chardata);
+ }
+ }
+
+ else if (!strcasecmp(el, "message")) {
+ jabber_send_message(XMPP->message_to, XMPP->message_body);
+ XMPP->html_tag_level = 0;
+ }
+
+ else if (!strcasecmp(el, "html")) {
+ --XMPP->html_tag_level;
+ }
+
+ else if (!strcasecmp(el, "starttls")) {
+#ifdef HAVE_OPENSSL
+ cprintf("<proceed xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>");
+ CtdlModuleStartCryptoMsgs(NULL, NULL, NULL);
+ if (!CC->redirect_ssl) CC->kill_me = 1;
+#else
+ cprintf("<failure xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>");
+ CC->kill_me = 1;
+#endif
+ }
+
XMPP->chardata_len = 0;
if (XMPP->chardata_alloc > 0) {
XMPP->chardata[0] = 0;
XMPP->chardata = NULL;
XMPP->chardata_len = 0;
XMPP->chardata_alloc = 0;
+ if (XMPP->message_body != NULL) {
+ free(XMPP->message_body);
+ }
}
XML_ParserFree(XMPP->xp);
free(XMPP);
strcpy(CC->cs_clientname, "Jabber session");
CC->session_specific_data = malloc(sizeof(struct citxmpp));
memset(XMPP, 0, sizeof(struct citxmpp));
+ XMPP->last_event_processed = queue_event_seq;
/* XMPP does not use a greeting, but we still have to initialize some things. */
XML_Parse(XMPP->xp, cmdbuf, 1, 0);
}
-const char *CitadelServiceXMPP="XMPP";
-#endif /* HAVE_EXPAT */
+/*
+ * Async loop for XMPP sessions (handles the transmission of unsolicited stanzas)
+ */
+void xmpp_async_loop(void) {
+ xmpp_process_events();
+ jabber_output_incoming_messages();
+}
+
+
+/*
+ * Login hook for XMPP sessions
+ */
+void xmpp_login_hook(void) {
+ xmpp_queue_event(XMPP_EVT_LOGIN, CC->cs_inet_email);
+}
+
+
+/*
+ * Logout hook for XMPP sessions
+ */
+void xmpp_logout_hook(void) {
+ xmpp_queue_event(XMPP_EVT_LOGOUT, CC->cs_inet_email);
+}
+
+
+const char *CitadelServiceXMPP="XMPP";
CTDL_MODULE_INIT(jabber)
{
-#ifdef HAVE_EXPAT
if (!threading) {
- /* CtdlRegisterServiceHook(config.c_xmpp_port, FIXME */
- CtdlRegisterServiceHook(5222,
+ CtdlRegisterServiceHook(config.c_xmpp_c2s_port,
NULL,
xmpp_greeting,
xmpp_command_loop,
- NULL,
+ xmpp_async_loop,
CitadelServiceXMPP);
CtdlRegisterSessionHook(xmpp_cleanup_function, EVT_STOP);
- #else
- lprintf(CTDL_INFO, "This server is missing the Expat XML parser. Jabber service will be disabled.\n");
-#endif
+ CtdlRegisterSessionHook(xmpp_login_hook, EVT_LOGIN);
+ CtdlRegisterSessionHook(xmpp_logout_hook, EVT_LOGOUT);
+ CtdlRegisterSessionHook(xmpp_login_hook, EVT_UNSTEALTH);
+ CtdlRegisterSessionHook(xmpp_logout_hook, EVT_STEALTH);
}
/* return our Subversion id for the Log */
- return "$Id: $";
+ return "$Id$";
}
projects / citadel.git / blobdiff