XMPP service ... remove from tech preview, as several
[citadel.git] / citadel / modules / jabber / serv_xmpp.c
index b7357925707b7051f4d15bdef7358ebeb5cdc060..6fa8a66b9172ee5105979dd8aa045d043c6a47b8 100644 (file)
@@ -57,8 +57,7 @@ struct xmpp_event *xmpp_queue = NULL;
 
 void xmpp_stream_start(void *data, const char *supplied_el, const char **attr)
 {
-
-       lprintf(CTDL_DEBUG, "New stream detected.\n");
+       lprintf(CTDL_DEBUG, "New XMPP stream.\n");
 
        while (*attr) {
                if (!strcasecmp(attr[0], "to")) {
@@ -89,13 +88,15 @@ void xmpp_stream_start(void *data, const char *supplied_el, const char **attr)
        if (!CC->logged_in) {
                /* If we're not logged in yet, offer SASL as our feature set */
                xmpp_output_auth_mechs();
-       }
-       else {
-               /* If we've logged in, now offer binding and sessions as our feature set */
-               cprintf("<bind xmlns=\"urn:ietf:params:xml:ns:xmpp-bind\"/>");
-               cprintf("<session xmlns=\"urn:ietf:params:xml:ns:xmpp-session\"/>");
+
+               /* Also offer non-SASL authentication */
+               cprintf("<auth xmlns=\"http://jabber.org/features/iq-auth\"/>");
        }
 
+       /* 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 */
@@ -128,6 +129,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")) {
@@ -188,6 +193,23 @@ void xmpp_xml_end(void *data, const char *supplied_el) {
                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);
                }
        }
 
@@ -215,10 +237,31 @@ 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 <iq> 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 */
 
@@ -256,6 +299,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")) {
@@ -435,9 +479,9 @@ const char *CitadelServiceXMPP="XMPP";
 
 CTDL_MODULE_INIT(jabber)
 {
-#ifdef HAVE_EXPAT
        if (!threading) {
-               CtdlRegisterServiceHook(5222,                   /* FIXME change to config.c_xmpp_port */
+#ifdef HAVE_EXPAT
+               CtdlRegisterServiceHook(config.c_xmpp_c2s_port,
                                        NULL,
                                        xmpp_greeting,
                                        xmpp_command_loop,