X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fxmpp_sasl_service.c;h=da76374987a8a1e81fa377d3a4207072f622a421;hp=5e53ceb4cc08d6d60bc4221a0ab34fbddab6b48c;hb=2976b35710982e72d499db16d648eee7b2cfaa94;hpb=4ad0027c6df24e822b14667e2c038dec576e6b19
diff --git a/citadel/modules/xmpp/xmpp_sasl_service.c b/citadel/modules/xmpp/xmpp_sasl_service.c
index 5e53ceb4c..da7637498 100644
--- a/citadel/modules/xmpp/xmpp_sasl_service.c
+++ b/citadel/modules/xmpp/xmpp_sasl_service.c
@@ -5,20 +5,13 @@
*
* Copyright (c) 2007-2009 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"
@@ -65,11 +58,10 @@
*/
int xmpp_auth_plain(char *authstring)
{
- StrBuf *AuthBuf;
- const char *decoded_authstring;
- char ident[256] = "";
- char user[256] = "";
- char pass[256] = "";
+ char decoded_authstring[1024];
+ char ident[256];
+ char user[256];
+ char pass[256];
int result;
long len;
@@ -77,25 +69,12 @@ int xmpp_auth_plain(char *authstring)
/* Take apart the authentication string */
memset(pass, 0, sizeof(pass));
- AuthBuf = NewStrBufPlain(authstring, -1);
- len = StrBufDecodeBase64(AuthBuf);
- if (len > 0)
- {
- decoded_authstring = ChrPtr(AuthBuf);
-
- len = safestrncpy(ident, decoded_authstring, sizeof ident);
-
- decoded_authstring += len + 1;
-
- len = safestrncpy(user, decoded_authstring, sizeof user);
-
- decoded_authstring += len + 1;
-
- len = safestrncpy(pass, decoded_authstring, sizeof pass);
- if (len < 0)
- len = sizeof(pass) - 1;
- }
- FreeStrBuf(&AuthBuf);
+ CtdlDecodeBase64(decoded_authstring, authstring, strlen(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)
+ 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
@@ -127,9 +106,9 @@ int xmpp_auth_plain(char *authstring)
* Output the list of SASL mechanisms offered by this stream.
*/
void xmpp_output_auth_mechs(void) {
- XPUT(""
- "PLAIN"
- "");
+ cprintf("");
+ cprintf("PLAIN");
+ cprintf("");
}
/*
@@ -138,28 +117,28 @@ void xmpp_output_auth_mechs(void) {
void xmpp_sasl_auth(char *sasl_auth_mech, char *authstring) {
if (strcasecmp(sasl_auth_mech, "PLAIN")) {
- XPUT(""
- ""
- "");
+ cprintf("");
+ cprintf("");
+ cprintf("");
return;
}
if (CC->logged_in) CtdlUserLogout(); /* Client may try to log in twice. Handle this. */
if (CC->nologin) {
- XPUT(""
- ""
- "");
+ cprintf("");
+ cprintf("");
+ cprintf("");
}
else if (xmpp_auth_plain(authstring) == 0) {
- XPUT("");
+ cprintf("");
}
else {
- XPUT(""
- ""
- "");
+ cprintf("");
+ cprintf("");
+ cprintf("");
}
}
@@ -168,8 +147,9 @@ void xmpp_sasl_auth(char *sasl_auth_mech, char *authstring) {
/*
* Non-SASL authentication
*/
-void xmpp_non_sasl_authenticate(StrBuf *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. */
@@ -177,23 +157,16 @@ void xmpp_non_sasl_authenticate(StrBuf *IQ_id, char *username, char *password, c
if (result == login_ok) {
result = CtdlTryPassword(password, strlen(password));
if (result == pass_ok) {
- XPrint(HKEY("iq"), XCLOSED,
- XCPROPERTY("type", "result"),
- XSPROPERTY("ID", IQ_id),
- TYPE_ARGEND);
- /* success */
+ cprintf("", xmlesc(xmlbuf, iq_id, sizeof xmlbuf)); /* success */
return;
}
}
/* failure */
- XPrint(HKEY("iq"), 0,
- XCPROPERTY("type", "error"),
- XSPROPERTY("ID", IQ_id),
- TYPE_ARGEND);
- XPUT(""
- ""
- ""
- ""
+ cprintf("", xmlesc(xmlbuf, iq_id, sizeof xmlbuf));
+ cprintf(""
+ ""
+ ""
+ ""
);
}