stable now but there are GIANT PIECES MISSING

[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 1b2e98ae98197697b75a60f955127dfdef335d0f..bb31ddaba299242de58b9059fc35481022e0a29b 100644 (file)
--- a/citadel/modules/xmpp/xmpp_sasl_service.c
+++ b/citadel/modules/xmpp/xmpp_sasl_service.c
@@ -3,7 +3,7 @@
  *
  * Note: RFC3920 says we "must" support DIGEST-MD5 but we only support PLAIN.
  *
- * Copyright (c) 2007-2018 by Art Cancro
+ * Copyright (c) 2007-2019 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.
@@ -23,18 +23,7 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
+#include <time.h>
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
@@ -48,7 +37,6 @@
 #include "config.h"
 #include "user_ops.h"
 #include "internet_addressing.h"
-#include "md5.h"
 #include "ctdl_module.h"
 #include "serv_xmpp.h"
 
@@ -64,7 +52,6 @@ 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));
@@ -73,26 +60,10 @@ int xmpp_auth_plain(char *authstring)
        safestrncpy(ident, decoded_authstring, sizeof ident);
        safestrncpy(user, &decoded_authstring[strlen(ident) + 1], sizeof user);
        len = safestrncpy(pass, &decoded_authstring[strlen(ident) + strlen(user) + 2], sizeof pass);
-       if (len < 0)
+       if (len < 0) {
                len = -len;
-
-       /* 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.
-        */
-       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(ident);
        }
@@ -119,6 +90,7 @@ void xmpp_output_auth_mechs(void) {
        cprintf("</mechanisms>");
 }
 
+
 /*
  * Here we go ... client is trying to authenticate.
  */
@@ -131,7 +103,9 @@ void xmpp_sasl_auth(char *sasl_auth_mech, char *authstring) {
                return;
        }
 
-        if (CC->logged_in) CtdlUserLogout();  /* Client may try to log in twice.  Handle this. */
+        if (CC->logged_in) {
+               CtdlUserLogout();  /* Client may try to log in twice.  Handle this. */
+       }
 
        if (CC->nologin) {
                cprintf("<failure xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\">");
@@ -151,7 +125,6 @@ void xmpp_sasl_auth(char *sasl_auth_mech, char *authstring) {
 }
 
 
-
 /*
  * Non-SASL authentication
  */
@@ -159,7 +132,9 @@ 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. */
+        if (CC->logged_in) {
+               CtdlUserLogout();  /* Client may try to log in twice.  Handle this. */
+       }
 
        result = CtdlLoginExistingUser(username);
        if (result == login_ok) {