Removed the 'master user' feature ... if we still need this we'll find another way

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

diff --git a/citadel/modules/xmpp/xmpp_sasl_service.c b/citadel/modules/xmpp/xmpp_sasl_service.c
index 968cef950025830a79e5491153be821a8d0b7a2b..1b2e98ae98197697b75a60f955127dfdef335d0f 100644 (file)
--- a/citadel/modules/xmpp/xmpp_sasl_service.c
+++ b/citadel/modules/xmpp/xmpp_sasl_service.c
@@ -3,22 +3,15 @@
  *
  * Note: RFC3920 says we "must" support DIGEST-MD5 but we only support PLAIN.
  *
- * Copyright (c) 2007-2009 by Art Cancro
+ * Copyright (c) 2007-2018 by Art Cancro
  *
- *  This program is open source software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 3.
- *  
- *  
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  
- *  
- *  
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3.
  *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
 #include "sysdep.h"
@@ -71,7 +64,7 @@ int xmpp_auth_plain(char *authstring)
        char pass[256];
        int result;
        long len;
-
+       int i;
 
        /* Take apart the authentication string */
        memset(pass, 0, sizeof(pass));
@@ -87,16 +80,24 @@ int xmpp_auth_plain(char *authstring)
         * do not allow spaces so we can tell the user to substitute underscores if their
         * login name contains spaces.
         */
-       convert_spaces_to_underscores(ident);
-       convert_spaces_to_underscores(user);
+       for (i=0; ident[i]!=0; ++i) {
+               if (ident[i] == '_') {
+                       ident[i] = ' ';
+               }
+       }
+       for (i=0; user[i]!=0; ++i) {
+               if (user[i] == '_') {
+                       user[i] = ' ';
+               }
+       }
 
        /* Now attempt authentication */
 
        if (!IsEmptyStr(ident)) {
-               result = CtdlLoginExistingUser(user, ident);
+               result = CtdlLoginExistingUser(ident);
        }
        else {
-               result = CtdlLoginExistingUser(NULL, user);
+               result = CtdlLoginExistingUser(user);
        }
 
        if (result == login_ok) {
@@ -113,9 +114,9 @@ int xmpp_auth_plain(char *authstring)
  * Output the list of SASL mechanisms offered by this stream.
  */
 void xmpp_output_auth_mechs(void) {
-       XPUT("<mechanisms xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\">"
-            "<mechanism>PLAIN</mechanism>"
-            "</mechanisms>");
+       cprintf("<mechanisms xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\">");
+       cprintf("<mechanism>PLAIN</mechanism>");
+       cprintf("</mechanisms>");
 }
 
 /*
@@ -124,28 +125,28 @@ void xmpp_output_auth_mechs(void) {
 void xmpp_sasl_auth(char *sasl_auth_mech, char *authstring) {
 
        if (strcasecmp(sasl_auth_mech, "PLAIN")) {
-               XPUT("<failure xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\">"
-                    "<invalid-mechanism/>"
-                    "</failure>");
+               cprintf("<failure xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\">");
+               cprintf("<invalid-mechanism/>");
+               cprintf("</failure>");
                return;
        }
 
         if (CC->logged_in) CtdlUserLogout();  /* Client may try to log in twice.  Handle this. */
 
        if (CC->nologin) {
-               XPUT("<failure xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\">"
-                    "<system-shutdown/>"
-                    "</failure>");
+               cprintf("<failure xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\">");
+               cprintf("<system-shutdown/>");
+               cprintf("</failure>");
        }
 
        else if (xmpp_auth_plain(authstring) == 0) {
-               XPUT("<success xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\"/>");
+               cprintf("<success xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\"/>");
        }
 
        else {
-               XPUT("<failure xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\">"
-                    "<not-authorized/>"
-                    "</failure>");
+               cprintf("<failure xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\">");
+               cprintf("<not-authorized/>");
+               cprintf("</failure>");
        }
 }
 
@@ -154,29 +155,26 @@ void xmpp_sasl_auth(char *sasl_auth_mech, char *authstring) {
 /*
  * Non-SASL authentication
  */
-void xmpp_non_sasl_authenticate(char *iq_id, char *username, char *password, char *resource) {
+void xmpp_non_sasl_authenticate(char *iq_id, char *username, char *password) {
        int result;
+       char xmlbuf[256];
 
         if (CC->logged_in) CtdlUserLogout();  /* Client may try to log in twice.  Handle this. */
 
-       result = CtdlLoginExistingUser(NULL, username);
+       result = CtdlLoginExistingUser(username);
        if (result == login_ok) {
                result = CtdlTryPassword(password, strlen(password));
                if (result == pass_ok) {
-                       XPUT("<iq type=\"result\" id=\"");
-                       XPutProp(iq_id, strlen(iq_id));
-                       XPUT("\"></iq>"); /* success */
+                       cprintf("<iq type=\"result\" id=\"%s\"></iq>", xmlesc(xmlbuf, iq_id, sizeof xmlbuf));   /* success */
                        return;
                }
        }
 
        /* failure */
-       XPUT("<iq type=\"error\" id=\"");
-       XPutProp(iq_id, strlen(iq_id));
-       XPUT("\">"
-            "<error code=\"401\" type=\"auth\">"
-            "<not-authorized xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\"/>"
-            "</error>"
-            "</iq>"
+       cprintf("<iq type=\"error\" id=\"%s\">", xmlesc(xmlbuf, iq_id, sizeof xmlbuf));
+       cprintf("<error code=\"401\" type=\"auth\">"
+               "<not-authorized xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\"/>"
+               "</error>"
+               "</iq>"
        );
 }