XMPP service ... remove from tech preview, as several

[citadel.git] / citadel / modules / jabber / xmpp_sasl_service.c

diff --git a/citadel/modules/jabber/xmpp_sasl_service.c b/citadel/modules/jabber/xmpp_sasl_service.c
index 2595423d82002a3305fca0c0ed21488f98d8dbc7..f444ba9b9da232c5cdd87a6ef6444a2f3b333088 100644 (file)
--- a/citadel/modules/jabber/xmpp_sasl_service.c
+++ b/citadel/modules/jabber/xmpp_sasl_service.c
@@ -3,8 +3,7 @@
  *
  * Barebones SASL authentication service for XMPP (Jabber) clients.
  *
- * Why barebones?  Because RFC3920 says we "must" support DIGEST-MD5 but
- * we only support PLAIN.
+ * Note: RFC3920 says we "must" support DIGEST-MD5 but we only support PLAIN.
  *
  * Copyright (c) 2007 by Art Cancro
  * This code is released under the terms of the GNU General Public License.
@@ -62,12 +61,31 @@ int xmpp_auth_plain(char *authstring)
        char user[256];
        char pass[256];
        int result;
+       char *ptr = NULL;
+
+
+       /* Take apart the authentication string */
 
        CtdlDecodeBase64(decoded_authstring, authstring, strlen(authstring));
        safestrncpy(ident, decoded_authstring, sizeof ident);
        safestrncpy(user, &decoded_authstring[strlen(ident) + 1], sizeof user);
        safestrncpy(pass, &decoded_authstring[strlen(ident) + strlen(user) + 2], sizeof pass);
 
+
+       /* If there are underscores in either string, change them to spaces.  Some clients
+        * do not allow spaces so we can tell the user to substitute underscores if their
+        * login name contains spaces.
+        */
+       while (ptr=strstr(ident, "_")) {
+               *ptr = ' ';
+       }
+
+       while (ptr=strstr(user, "_")) {
+               *ptr = ' ';
+       }
+
+       /* Now attempt authentication */
+
        if (!IsEmptyStr(ident)) {
                result = CtdlLoginExistingUser(user, ident);
        }
@@ -119,4 +137,34 @@ void xmpp_sasl_auth(char *sasl_auth_mech, char *authstring) {
        }
 }
 
+
+
+/*
+ * Non-SASL authentication
+ */
+void jabber_non_sasl_authenticate(char *iq_id, char *username, char *password, char *resource) {
+       int result;
+
+        if (CC->logged_in) logout(CC);  /* Client may try to log in twice.  Handle this. */
+
+       result = CtdlLoginExistingUser(NULL, username);
+       if (result == login_ok) {
+               result = CtdlTryPassword(password);
+               if (result == pass_ok) {
+                       cprintf("<iq type=\"result\" id=\"%s\"></iq>", iq_id);  /* success */
+                       return;
+               }
+       }
+
+       /* failure */
+       cprintf("<iq type=\"error\" id=\"%s\">", iq_id);
+       cprintf("<error code=\"401\" type=\"auth\">"
+               "<not-authorized xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\"/>"
+               "</error>"
+               "</iq>"
+       );
+}
+
+
+
 #endif /* HAVE_EXPAT */