-/**
+/*
* $Id$
*
* This module is an managesieve implementation for the Citadel system.
* http://tools.ietf.org/html/draft-martin-managesieve-06
* as this draft expires with this writing, you might need to search for
* the new one.
+ *
+ * Copyright (c) 2007-2009 by the citadel.org team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "sysdep.h"
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
+#include <libcitadel.h>
#include "citadel.h"
#include "server.h"
#include "citserver.h"
#include "policy.h"
#include "database.h"
#include "msgbase.h"
-#include "tools.h"
#include "internet_addressing.h"
-#include "imap_tools.h"
+#include "imap_tools.h" /* Needed for imap_parameterize */
#include "genstamp.h"
#include "domain.h"
#include "clientsocket.h"
#include "locate_host.h"
#include "citadel_dirs.h"
-#ifdef HAVE_OPENSSL
-#include "serv_crypto.h"
-#endif
-
#ifndef HAVE_SNPRINTF
#include "snprintf.h"
#endif
#include "ctdl_module.h"
-
-
-
-#ifdef HAVE_LIBSIEVE
-
#include "serv_sieve.h"
mgsve_plain
};
-#define MGSVE CC->MGSVE
+#define MGSVE ((struct citmgsve *)CC->session_specific_data)
/*****************************************************************************/
/* MANAGESIEVE Server */
/*****************************************************************************/
+
void sieve_outbuf_append(char *str)
{
size_t newlen = strlen(str)+1;
*/
void cmd_mgsve_caps(void)
{
- cprintf("\"IMPLEMENTATION\" \"CITADEL Sieve v6.84\"\r\n" /* TODO: put citversion here. */
+ cprintf("\"IMPLEMENTATION\" \"CITADEL Sieve " PACKAGE_VERSION "\"\r\n"
"\"SASL\" \"PLAIN\"\r\n" /*DIGEST-MD5 GSSAPI SASL sucks.*/
#ifdef HAVE_OPENSSL
/* if TLS is already there, should we say that again? */
strcpy(CC->cs_clientname, "Managesieve session");
- CC->internal_pgm = 1;
+ CC->internal_pgm = 0;
CC->cs_flags |= CS_STEALTH;
- MGSVE = malloc(sizeof(struct citmgsve));
+ CC->session_specific_data = malloc(sizeof(struct citmgsve));
memset(MGSVE, 0, sizeof(struct citmgsve));
cmd_mgsve_caps();
}
char *cursor = token;
char *number;
- while ((*cursor != '\0') &&
+ while (!IsEmptyStr(cursor) &&
(*cursor != '{'))
{
cursor++;
}
- if (*cursor == '\0')
+ if (IsEmptyStr(cursor))
return -1;
number = cursor + 1;
while ((*cursor != '\0') &&
if (cursor[-1] == '+')
cursor--;
- if (*cursor == '\0')
+ if (IsEmptyStr(cursor))
return -1;
return atol(number);
{
char auth[SIZ];
int retval;
- char *message = ReadString(GetSizeToken(parms[2]), parms[0]);
+ char *message;
+ char *username;
+
+ message = NULL;
+ memset (auth, 0, SIZ);
+ if (parms[2][0] == '{')
+ message = ReadString(GetSizeToken(parms[2]), parms[0]);
if (message != NULL) {/**< do we have tokenized login? */
retval = CtdlDecodeBase64(auth, MGSVE->transmitted_message, SIZ);
}
else
retval = CtdlDecodeBase64(auth, parms[2], SIZ);
-
- if (login_ok == CtdlLoginExistingUser(NULL, auth))
+ username = auth;
+ if ((*username == '\0') && (*(username + 1) != '\0'))
+ username ++;
+
+ if (login_ok == CtdlLoginExistingUser(NULL, username))
{
char *pass;
pass = &(auth[strlen(auth)+1]);
}
}
}
-
cprintf("NO \"Authentication Failure.\"\r\n");/* we just support auth plain. */
CC->kill_me = 1;
}
-#ifdef HAVE_OPENSSL
/**
* STARTTLS command chapter 2.2
*/
void cmd_mgsve_starttls(void)
{ /** answer with OK, and fire off tls session. */
cprintf("OK\r\n");
- CtdlStartTLS(NULL, NULL, NULL);
+ CtdlModuleStartCryptoMsgs(NULL, NULL, NULL);
cmd_mgsve_caps();
}
-#endif
void cmd_mgsve_logout(struct sdm_userdata *u)
{
cprintf("OK\r\n");
- lprintf(CTDL_NOTICE, "MgSve bye.");
+ CtdlLogPrintf(CTDL_NOTICE, "MgSve bye.");
CC->kill_me = 1;
}
if (strlen(argbuf) >= 7) {
}
else {
- CtdlEncodeBase64(username_prompt, "Username:", 9);
+ CtdlEncodeBase64(username_prompt, "Username:", 9, 0);
cprintf("334 %s\r\n", username_prompt);
}
return;
/*
* implements the STARTTLS command (Citadel API version)
*/
-#ifdef HAVE_OPENSSL
void _mgsve_starttls(void)
{
char ok_response[SIZ];
"554 5.7.3 TLS not supported here\r\n");
sprintf(error_response,
"554 5.7.3 Internal error\r\n");
- CtdlStartTLS(ok_response, nosup_response, error_response);
+ CtdlModuleStartCryptoMsgs(ok_response, nosup_response, error_response);
}
-#endif
/*
length = strlen(parms[0]);
}
if (length < 1) {
- lprintf(CTDL_CRIT, "Client disconnected: ending session.\n");
+ CtdlLogPrintf(CTDL_CRIT, "Client disconnected: ending session.\n");
CC->kill_me = 1;
return;
}
- lprintf(CTDL_INFO, "MANAGESIEVE: %s\n", cmdbuf);
+ CtdlLogPrintf(CTDL_INFO, "MANAGESIEVE: %s\n", cmdbuf);
if ((length>= 12) && (!strncasecmp(parms[0], "AUTHENTICATE", 12))){
cmd_mgsve_auth(num_parms, parms, &u);
}
cmd_mgsve_caps();
}
/** these commands need to be authenticated. throw it out if it tries. */
- else if (!CtdlAccessCheck(ac_logged_in))
+ else if (CC->logged_in != 0)
{
msiv_load(&u);
if ((length>= 9) && (!strncasecmp(parms[0], "HAVESPACE", 9))){
msiv_store(&u, changes_made);
}
else {
- cprintf("No\r\n");
- lprintf(CTDL_INFO, "illegal Managesieve command: %s", parms[0]);
+ cprintf("No Invalid access or command.\r\n");
+ CtdlLogPrintf(CTDL_INFO, "illegal Managesieve command: %s", parms[0]);
CC->kill_me = 1;
}
}
+/*
+ * This cleanup function blows away the temporary memory and files used by
+ * the server.
+ */
+void managesieve_cleanup_function(void) {
-#endif /* HAVE_LIBSIEVE */
-
-CTDL_MODULE_INIT(managesieve)
-{
-
-#ifdef HAVE_LIBSIEVE
-
- CtdlRegisterServiceHook(config.c_managesieve_port, /* MGSVE */
- NULL,
- managesieve_greeting,
- managesieve_command_loop,
- NULL);
+ /* Don't do this stuff if this is not a managesieve session! */
+ if (CC->h_command_function != managesieve_command_loop) return;
-#else /* HAVE_LIBSIEVE */
+ CtdlLogPrintf(CTDL_DEBUG, "Performing managesieve cleanup hook\n");
+ free(MGSVE);
+}
- lprintf(CTDL_INFO, "This server is missing libsieve. Managesieve protocol is disabled..\n");
-#endif /* HAVE_LIBSIEVE */
+const char* CitadelServiceManageSieve = "ManageSieve";
+CTDL_MODULE_INIT(managesieve)
+{
+ if (!threading)
+ {
+ CtdlRegisterServiceHook(config.c_managesieve_port,
+ NULL,
+ managesieve_greeting,
+ managesieve_command_loop,
+ NULL,
+ CitadelServiceManageSieve);
+ CtdlRegisterSessionHook(managesieve_cleanup_function, EVT_STOP);
+ }
+
/* return our Subversion id for the Log */
return "$Id$";
}
projects / citadel.git / blobdiff