X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fjabber%2Fserv_xmpp.c;h=c6fc94731b61d342a3c647eece8a55b97158096e;hb=98979e042ba6cf2dbb9e1656fc44769ebf628c48;hp=ecf73671c4cd4cecaafec9644b1dcd717cd0a4ce;hpb=fa7cd4b929a3486d5108c8b84032d360e3ec2420;p=citadel.git diff --git a/citadel/modules/jabber/serv_xmpp.c b/citadel/modules/jabber/serv_xmpp.c index ecf73671c..c6fc94731 100644 --- a/citadel/modules/jabber/serv_xmpp.c +++ b/citadel/modules/jabber/serv_xmpp.c @@ -33,6 +33,7 @@ #include #include #include +#include #include "citadel.h" #include "server.h" #include "citserver.h" @@ -46,18 +47,15 @@ #include "internet_addressing.h" #include "md5.h" #include "ctdl_module.h" - -#ifdef HAVE_EXPAT -#include #include "serv_xmpp.h" +struct xmpp_event *xmpp_queue = NULL; /* We have just received a 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 stream detected.\n"); + CtdlLogPrintf(CTDL_DEBUG, "New XMPP stream.\n"); while (*attr) { if (!strcasecmp(attr[0], "to")) { @@ -78,17 +76,28 @@ void xmpp_stream_start(void *data, const char *supplied_el, const char **attr) /* The features of this stream are... */ cprintf(""); +#ifdef HAVE_OPENSSL_XXXX_COMMENTED_OUT + /* TLS encryption (but only if it isn't already active) */ + if (!CC->redirect_ssl) { + cprintf(""); + } +#endif + 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(""); } - else { - /* If we've logged in, now offer binding and sessions as our feature set */ - cprintf(""); - cprintf(""); - } + + /* Offer binding and sessions as part of our feature set */ + cprintf(""); + cprintf(""); cprintf(""); + + CC->is_async = 1; /* XMPP sessions are inherently async-capable */ } @@ -103,10 +112,10 @@ void xmpp_xml_start(void *data, const char *supplied_el, const char **attr) { strcpy(el, ++sep); } - lprintf(CTDL_DEBUG, "XMPP ELEMENT START: <%s>\n", el); + CtdlLogPrintf(CTDL_DEBUG, "XMPP ELEMENT START: <%s>\n", el); for (i=0; attr[i] != NULL; i+=2) { - lprintf(CTDL_DEBUG, " Attribute '%s' = '%s'\n", attr[i], attr[i+1]); + CtdlLogPrintf(CTDL_DEBUG, " Attribute '%s' = '%s'\n", attr[i], attr[i+1]); } if (!strcasecmp(el, "stream")) { @@ -118,6 +127,10 @@ void xmpp_xml_start(void *data, const char *supplied_el, const char **attr) { 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")) { for (i=0; attr[i] != NULL; i+=2) { if (!strcasecmp(attr[i], "type")) { @@ -143,6 +156,18 @@ void xmpp_xml_start(void *data, const char *supplied_el, const char **attr) { } } } + + 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; + } } @@ -157,15 +182,32 @@ void xmpp_xml_end(void *data, const char *supplied_el) { strcpy(el, ++sep); } - lprintf(CTDL_DEBUG, "XMPP ELEMENT END : <%s>\n", el); + CtdlLogPrintf(CTDL_DEBUG, "XMPP ELEMENT END : <%s>\n", el); if (XMPP->chardata_len > 0) { - lprintf(CTDL_DEBUG, " chardata: %s\n", XMPP->chardata); + CtdlLogPrintf(CTDL_DEBUG, " chardata: %s\n", XMPP->chardata); } 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); + } + } + + 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); } } @@ -193,20 +235,34 @@ void xmpp_xml_end(void *data, const char *supplied_el) { } } + /* + * 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 stanza was a "bind" attempt, process it ... */ - else if ( (!IsEmptyStr(XMPP->iq_id)) && (!IsEmptyStr(XMPP->iq_client_resource)) ) { + 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, - // XMPP->iq_client_resource - //); - snprintf(XMPP->client_jid, sizeof XMPP->client_jid, "%s/%s", CC->cs_inet_email, @@ -241,6 +297,7 @@ void xmpp_xml_end(void *data, const char *supplied_el) { 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")) { @@ -264,6 +321,36 @@ void xmpp_xml_end(void *data, const char *supplied_el) { 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(""); + CtdlModuleStartCryptoMsgs(NULL, NULL, NULL); + if (!CC->redirect_ssl) CC->kill_me = 1; +#else + cprintf(""); + CC->kill_me = 1; +#endif + } + XMPP->chardata_len = 0; if (XMPP->chardata_alloc > 0) { XMPP->chardata[0] = 0; @@ -297,12 +384,15 @@ void xmpp_cleanup_function(void) { /* Don't do this stuff if this is not a XMPP session! */ if (CC->h_command_function != xmpp_command_loop) return; - lprintf(CTDL_DEBUG, "Performing XMPP cleanup hook\n"); + CtdlLogPrintf(CTDL_DEBUG, "Performing XMPP cleanup hook\n"); if (XMPP->chardata != NULL) { free(XMPP->chardata); 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); @@ -317,12 +407,13 @@ void xmpp_greeting(void) { 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. */ XMPP->xp = XML_ParserCreateNS("UTF-8", ':'); if (XMPP->xp == NULL) { - lprintf(CTDL_ALERT, "Cannot create XML parser!\n"); + CtdlLogPrintf(CTDL_ALERT, "Cannot create XML parser!\n"); CC->kill_me = 1; return; } @@ -333,6 +424,18 @@ void xmpp_greeting(void) { } +/* + * Here's where our XMPPs session begins its happy day. + */ +void xmpps_greeting(void) { + CtdlModuleStartCryptoMsgs(NULL, NULL, NULL); +#ifdef HAVE_OPENSSL + if (!CC->redirect_ssl) CC->kill_me = 1; /* kill session if no crypto */ +#endif + xmpp_greeting(); +} + + /* * Main command loop for XMPP sessions. */ @@ -344,7 +447,7 @@ void xmpp_command_loop(void) { memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */ retval = client_read(cmdbuf, 1); if (retval != 1) { - lprintf(CTDL_ERR, "Client disconnected: ending session.\r\n"); + CtdlLogPrintf(CTDL_ERR, "Client disconnected: ending session.\r\n"); CC->kill_me = 1; return; } @@ -354,25 +457,64 @@ void xmpp_command_loop(void) { 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"; +const char *CitadelServiceXMPPs="XMPPs"; 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"); + CtdlRegisterSessionHook(xmpp_login_hook, EVT_LOGIN); + CtdlRegisterSessionHook(xmpp_logout_hook, EVT_LOGOUT); + CtdlRegisterSessionHook(xmpp_login_hook, EVT_UNSTEALTH); + CtdlRegisterSessionHook(xmpp_logout_hook, EVT_STEALTH); + +#ifdef HAVE_OPENSSL + CtdlRegisterServiceHook(config.c_xmpps_c2s_port, + NULL, + xmpps_greeting, + xmpp_command_loop, + xmpp_async_loop, + CitadelServiceXMPPs); #endif + + CtdlRegisterSessionHook(xmpp_cleanup_function, EVT_STOP); + 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 */