/*
* Consolidate mail from remote POP3 accounts.
*
- * Copyright (c) 2007-2017 by the citadel.org team
+ * Copyright (c) 2007-2020 by the citadel.org team
*
* This program is open source software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as published
#include <sys/types.h>
#include <sys/stat.h>
#include <libcitadel.h>
+#include <curl/curl.h>
#include "citadel.h"
#include "server.h"
#include "citserver.h"
#include "internet_addressing.h"
#include "database.h"
#include "citadel_dirs.h"
-#include "event_client.h"
-
-#define POP3C_OK (strncasecmp(ChrPtr(RecvMsg->IO.IOBuf), "+OK", 3) == 0)
-int Pop3ClientID = 0;
-
-#define N ((pop3aggr*)IO->Data)->n
-
-struct CitContext pop3_client_CC;
-
-pthread_mutex_t POP3QueueMutex; /* locks the access to the following vars: */
-HashList *POP3QueueRooms = NULL;
-HashList *POP3FetchUrls = NULL;
-
-typedef struct pop3aggr pop3aggr;
-typedef eNextState(*Pop3ClientHandler)(pop3aggr* RecvMsg);
-
-eNextState POP3_C_Shutdown(AsyncIO *IO);
-eNextState POP3_C_Timeout(AsyncIO *IO);
-eNextState POP3_C_ConnFail(AsyncIO *IO);
-eNextState POP3_C_DNSFail(AsyncIO *IO);
-eNextState POP3_C_DispatchReadDone(AsyncIO *IO);
-eNextState POP3_C_DispatchWriteDone(AsyncIO *IO);
-eNextState POP3_C_Terminate(AsyncIO *IO);
-eReadState POP3_C_ReadServerStatus(AsyncIO *IO);
-eNextState POP3_C_ReAttachToFetchMessages(AsyncIO *IO);
-
-typedef struct __pop3_room_counter {
- int count;
- long QRnumber;
-}pop3_room_counter;
-
-typedef enum ePOP3_C_States {
- ReadGreeting,
- GetUserState,
- GetPassState,
- GetListCommandState,
- GetListOneLine,
- GetOneMessageIDState,
- ReadMessageBodyFollowing,
- ReadMessageBody,
- GetDeleteState,
- ReadQuitState,
- POP3C_MaxRead
-}ePOP3_C_States;
-
-
-typedef struct _FetchItem {
- long MSGID;
- long MSGSize;
- StrBuf *MsgUIDL;
- StrBuf *MsgUID;
- int NeedFetch;
- struct CtdlMessage *Msg;
-} FetchItem;
-
-void HfreeFetchItem(void *vItem)
-{
- FetchItem *Item = (FetchItem*) vItem;
- FreeStrBuf(&Item->MsgUIDL);
- FreeStrBuf(&Item->MsgUID);
- free(Item);
-}
-
-
-
-typedef enum _POP3State {
- eCreated,
- eGreeting,
- eUser,
- ePassword,
- eListing,
- eUseTable,
- eGetMsgID,
- eGetMsg,
- eStoreMsg,
- eDelete,
- eQuit
-} POP3State;
-
-ConstStr POP3States[] = {
- {HKEY("Aggregator created")},
- {HKEY("Reading Greeting")},
- {HKEY("Sending User")},
- {HKEY("Sending Password")},
- {HKEY("Listing")},
- {HKEY("Fetching Usetable")},
- {HKEY("Get MSG ID")},
- {HKEY("Get Message")},
- {HKEY("Store Msg")},
- {HKEY("Delete Upstream")},
- {HKEY("Quit")}
-};
-
-static void SetPOP3State(AsyncIO *IO, POP3State State)
-{
- CitContext* CCC = IO->CitContext;
- if (CCC != NULL)
- memcpy(CCC->cs_clientname, POP3States[State].Key, POP3States[State].len + 1);
-}
-
-
-struct pop3aggr {
- AsyncIO IO;
-
- long n;
- double IOStart;
- long count;
- long RefCount;
- DNSQueryParts HostLookup;
-
- long QRnumber;
- HashList *OtherQRnumbers;
-
- StrBuf *Url;
- StrBuf *pop3user;
- StrBuf *pop3pass;
- StrBuf *Host;
- StrBuf *RoomName; // TODO: fill me
+struct p3cq { // module-local queue of pop3 client work that needs processing
+ struct p3cq *next;
+ char *room;
+ char *host;
+ char *user;
+ char *pass;
int keep;
- time_t interval;
- ePOP3_C_States State;
- HashList *MsgNumbers;
- HashPos *Pos;
- FetchItem *CurrMsg;
+ long interval;
};
-void DeletePOP3Aggregator(void *vptr)
-{
- pop3aggr *ptr = vptr;
- DeleteHashPos(&ptr->Pos);
- DeleteHash(&ptr->MsgNumbers);
-// FreeStrBuf(&ptr->rooms);
- FreeStrBuf(&ptr->pop3user);
- FreeStrBuf(&ptr->pop3pass);
- FreeStrBuf(&ptr->Host);
- FreeStrBuf(&ptr->RoomName);
- FreeURL(&ptr->IO.ConnectMe);
- FreeStrBuf(&ptr->Url);
- FreeStrBuf(&ptr->IO.IOBuf);
- FreeStrBuf(&ptr->IO.SendBuf.Buf);
- FreeStrBuf(&ptr->IO.RecvBuf.Buf);
- DeleteAsyncMsg(&ptr->IO.ReadMsg);
- if (((struct CitContext*)ptr->IO.CitContext)) {
- ((struct CitContext*)ptr->IO.CitContext)->state = CON_IDLE;
- ((struct CitContext*)ptr->IO.CitContext)->kill_me = 1;
- }
- FreeAsyncIOContents(&ptr->IO);
- free(ptr);
-}
-
-eNextState FinalizePOP3AggrRun(AsyncIO *IO)
-{
- HashPos *It;
- pop3aggr *cpptr = (pop3aggr *)IO->Data;
-
- syslog(LOG_INFO,
- "%s@%s: fetched %ld new of %d messages in %fs. bye.",
- ChrPtr(cpptr->pop3user),
- ChrPtr(cpptr->Host),
- cpptr->count,
- GetCount(cpptr->MsgNumbers),
- IO->Now - cpptr->IOStart
- );
-
- It = GetNewHashPos(POP3FetchUrls, 0);
- pthread_mutex_lock(&POP3QueueMutex);
- {
- if (GetHashPosFromKey(POP3FetchUrls, SKEY(cpptr->Url), It))
- DeleteEntryFromHash(POP3FetchUrls, It);
- }
- pthread_mutex_unlock(&POP3QueueMutex);
- DeleteHashPos(&It);
- return eAbort;
-}
-
-eNextState FailAggregationRun(AsyncIO *IO)
-{
- return eAbort;
-}
-
-eNextState POP3C_ReadGreeting(pop3aggr *RecvMsg)
-{
- AsyncIO *IO = &RecvMsg->IO;
- SetPOP3State(IO, eGreeting);
- /* Read the server greeting */
- if (!POP3C_OK) return eTerminateConnection;
- else return eSendReply;
-}
-
-eNextState POP3C_SendUser(pop3aggr *RecvMsg)
-{
- AsyncIO *IO = &RecvMsg->IO;
- SetPOP3State(IO, eUser);
- /* Identify ourselves. NOTE: we have to append a CR to each command.
- * The LF will automatically be appended by sock_puts(). Believe it
- * or not, leaving out the CR will cause problems if the server happens
- * to be Exchange, which is so b0rken it actually barfs on
- * LF-terminated newlines.
- */
- StrBufPrintf(RecvMsg->IO.SendBuf.Buf,
- "USER %s\r\n", ChrPtr(RecvMsg->pop3user));
- return eReadMessage;
-}
-
-eNextState POP3C_GetUserState(pop3aggr *RecvMsg)
-{
- if (!POP3C_OK) return eTerminateConnection;
- else return eSendReply;
-}
-
-eNextState POP3C_SendPassword(pop3aggr *RecvMsg)
-{
- AsyncIO *IO = &RecvMsg->IO;
- SetPOP3State(IO, ePassword);
- /* Password */
- StrBufPrintf(RecvMsg->IO.SendBuf.Buf,
- "PASS %s\r\n", ChrPtr(RecvMsg->pop3pass));
- syslog(LOG_DEBUG, "<PASS <password>\n");
- return eReadMessage;
-}
-
-eNextState POP3C_GetPassState(pop3aggr *RecvMsg)
-{
- if (!POP3C_OK) return eTerminateConnection;
- else return eSendReply;
-}
-
-eNextState POP3C_SendListCommand(pop3aggr *RecvMsg)
-{
- AsyncIO *IO = &RecvMsg->IO;
- SetPOP3State(IO, eListing);
-
- /* Get the list of messages */
- StrBufPlain(RecvMsg->IO.SendBuf.Buf, HKEY("LIST\r\n"));
- return eReadMessage;
-}
-
-eNextState POP3C_GetListCommandState(pop3aggr *RecvMsg)
-{
- if (!POP3C_OK) return eTerminateConnection;
- RecvMsg->MsgNumbers = NewHash(1, NULL);
- RecvMsg->State++;
- return eReadMore;
-}
-
-
-eNextState POP3C_GetListOneLine(pop3aggr *RecvMsg)
-{
-#if 0
- int rc;
-#endif
- const char *pch;
- FetchItem *OneMsg = NULL;
-
- if ((StrLength(RecvMsg->IO.IOBuf) == 1) &&
- (ChrPtr(RecvMsg->IO.IOBuf)[0] == '.'))
- {
- if (GetCount(RecvMsg->MsgNumbers) == 0)
- {
- //// RecvMsg->Sate = ReadQuitState;
- }
- else
- {
- RecvMsg->Pos = GetNewHashPos(RecvMsg->MsgNumbers, 0);
- }
- return eSendReply;
-
- }
-
- /*
- * work around buggy pop3 servers which send
- * empty lines in their listings.
- */
- if ((StrLength(RecvMsg->IO.IOBuf) == 0) ||
- !isdigit(ChrPtr(RecvMsg->IO.IOBuf)[0]))
- {
- return eReadMore;
- }
-
- OneMsg = (FetchItem*) malloc(sizeof(FetchItem));
- memset(OneMsg, 0, sizeof(FetchItem));
- OneMsg->MSGID = atol(ChrPtr(RecvMsg->IO.IOBuf));
-
- pch = strchr(ChrPtr(RecvMsg->IO.IOBuf), ' ');
- if (pch != NULL)
- {
- OneMsg->MSGSize = atol(pch + 1);
- }
-#if 0
- rc = TestValidateHash(RecvMsg->MsgNumbers);
- if (rc != 0)
- syslog(LOG_DEBUG, "Hash Invalid: %d\n", rc);
-#endif
-
- Put(RecvMsg->MsgNumbers, LKEY(OneMsg->MSGID), OneMsg, HfreeFetchItem);
-#if 0
- rc = TestValidateHash(RecvMsg->MsgNumbers);
- if (rc != 0)
- syslog(LOG_DEBUG, "Hash Invalid: %d\n", rc);
-#endif
- //RecvMsg->State --; /* read next Line */
- return eReadMore;
-}
-
-eNextState POP3_FetchNetworkUsetableEntry(AsyncIO *IO)
-{
- long HKLen;
- const char *HKey;
- void *vData;
- pop3aggr *RecvMsg = (pop3aggr *) IO->Data;
- time_t seenstamp = 0;
-
- SetPOP3State(IO, eUseTable);
-
- if((RecvMsg->Pos != NULL) &&
- GetNextHashPos(RecvMsg->MsgNumbers,
- RecvMsg->Pos,
- &HKLen,
- &HKey,
- &vData))
- {
- if (server_shutting_down)
- return eAbort;
-
- RecvMsg->CurrMsg = (FetchItem*)vData;
-
- seenstamp = CheckIfAlreadySeen(RecvMsg->CurrMsg->MsgUID,
- EvGetNow(IO),
- EvGetNow(IO) - USETABLE_ANTIEXPIRE,
- eCheckUpdate
- );
- if (seenstamp != 0)
- {
- /* Item has already been seen */
- RecvMsg->CurrMsg->NeedFetch = 0;
- }
- else
- {
- syslog(LOG_DEBUG, "NO\n");
- RecvMsg->CurrMsg->NeedFetch = 1;
- }
- return NextDBOperation(&RecvMsg->IO,
- POP3_FetchNetworkUsetableEntry);
- }
- else
- {
- /* ok, now we know them all,
- * continue with reading the actual messages. */
- DeleteHashPos(&RecvMsg->Pos);
- return DBQueueEventContext(IO, POP3_C_ReAttachToFetchMessages);
- }
-}
-
-eNextState POP3C_GetOneMessagID(pop3aggr *RecvMsg)
-{
- AsyncIO *IO = &RecvMsg->IO;
- long HKLen;
- const char *HKey;
- void *vData;
-
- SetPOP3State(IO, eGetMsgID);
-#if 0
- int rc;
- rc = TestValidateHash(RecvMsg->MsgNumbers);
- if (rc != 0)
- syslog(LOG_DEBUG, "Hash Invalid: %d\n", rc);
-#endif
- if((RecvMsg->Pos != NULL) &&
- GetNextHashPos(RecvMsg->MsgNumbers,
- RecvMsg->Pos,
- &HKLen, &HKey,
- &vData))
- {
- RecvMsg->CurrMsg = (FetchItem*) vData;
- /* Find out the UIDL of the message,
- * to determine whether we've already downloaded it */
- StrBufPrintf(RecvMsg->IO.SendBuf.Buf,
- "UIDL %ld\r\n", RecvMsg->CurrMsg->MSGID);
- }
- else
- {
- RecvMsg->State++;
- DeleteHashPos(&RecvMsg->Pos);
- /// done receiving uidls.. start looking them up now.
- RecvMsg->Pos = GetNewHashPos(RecvMsg->MsgNumbers, 0);
- return EventQueueDBOperation(&RecvMsg->IO,
- POP3_FetchNetworkUsetableEntry,
- 0);
- }
- return eReadMore; /* TODO */
-}
-
-eNextState POP3C_GetOneMessageIDState(pop3aggr *RecvMsg)
-{
-#if 0
- int rc;
- rc = TestValidateHash(RecvMsg->MsgNumbers);
- if (rc != 0)
- syslog(LOG_DEBUG, "Hash Invalid: %d\n", rc);
-#endif
-
- if (!POP3C_OK) return eTerminateConnection;
- RecvMsg->CurrMsg->MsgUIDL = NewStrBufPlain(NULL, StrLength(RecvMsg->IO.IOBuf));
- RecvMsg->CurrMsg->MsgUID = NewStrBufPlain(NULL, StrLength(RecvMsg->IO.IOBuf) * 2);
-
- StrBufExtract_token(RecvMsg->CurrMsg->MsgUIDL, RecvMsg->IO.IOBuf, 2, ' ');
-
- StrBufPrintf(RecvMsg->CurrMsg->MsgUID,
- "pop3/%s/%s:%s@%s",
- ChrPtr(RecvMsg->RoomName),
- ChrPtr(RecvMsg->CurrMsg->MsgUIDL),
- RecvMsg->IO.ConnectMe->User,
- RecvMsg->IO.ConnectMe->Host
- );
- RecvMsg->State --;
- return eSendReply;
-}
-
-
-eNextState POP3C_SendGetOneMsg(pop3aggr *RecvMsg)
-{
- AsyncIO *IO = &RecvMsg->IO;
- long HKLen;
- const char *HKey;
- void *vData;
-
- SetPOP3State(IO, eGetMsg);
-
- syslog(LOG_DEBUG, "fast forwarding to the next unknown message");
-
- RecvMsg->CurrMsg = NULL;
- while ((RecvMsg->Pos != NULL) &&
- GetNextHashPos(RecvMsg->MsgNumbers,
- RecvMsg->Pos,
- &HKLen, &HKey,
- &vData) &&
- (RecvMsg->CurrMsg = (FetchItem*) vData,
- RecvMsg->CurrMsg->NeedFetch == 0))
- {}
-
- if ((RecvMsg->CurrMsg != NULL ) && (RecvMsg->CurrMsg->NeedFetch == 1))
- {
- syslog(LOG_DEBUG, "fetching next");
- /* Message has not been seen.
- * Tell the server to fetch the message... */
- StrBufPrintf(RecvMsg->IO.SendBuf.Buf, "RETR %ld\r\n", RecvMsg->CurrMsg->MSGID);
- return eReadMessage;
- }
- else {
- syslog(LOG_DEBUG, "no more messages to fetch.");
- RecvMsg->State = ReadQuitState;
- return POP3_C_DispatchWriteDone(&RecvMsg->IO);
- }
-}
-
-
-eNextState POP3C_ReadMessageBodyFollowing(pop3aggr *RecvMsg)
-{
- if (!POP3C_OK) return eTerminateConnection;
- RecvMsg->IO.ReadMsg = NewAsyncMsg(HKEY("."),
- RecvMsg->CurrMsg->MSGSize,
- CtdlGetConfigLong("c_maxmsglen"),
- NULL, -1,
- 1
- );
-
- return eReadPayload;
-}
-
+static int doing_pop3client = 0;
+struct p3cq *p3cq = NULL;
-eNextState POP3C_StoreMsgRead(AsyncIO *IO)
+/*
+ * Process one mailbox.
+ */
+void pop3client_one_mailbox(char *room, const char *host, const char *user, const char *pass, int keep, long interval)
{
- pop3aggr *RecvMsg = (pop3aggr *) IO->Data;
-
- SetPOP3State(IO, eStoreMsg);
-
- syslog(LOG_DEBUG, "MARKING: %s as seen: ", ChrPtr(RecvMsg->CurrMsg->MsgUID));
- CheckIfAlreadySeen(RecvMsg->CurrMsg->MsgUID, EvGetNow(IO), EvGetNow(IO) - USETABLE_ANTIEXPIRE, eWrite);
-
- return DBQueueEventContext(&RecvMsg->IO, POP3_C_ReAttachToFetchMessages);
-}
-
+ syslog(LOG_DEBUG, "pop3client: room=<%s> host=<%s> user=<%s> keep=<%d> interval=<%ld>", room, host, user, keep, interval);
-eNextState POP3C_SaveMsg(AsyncIO *IO)
-{
- long msgnum;
- pop3aggr *RecvMsg = (pop3aggr *) IO->Data;
+ char url[SIZ];
+ CURL *curl;
+ CURLcode res = CURLE_OK;
+ StrBuf *Uidls = NULL;
+ int i;
+ char cmd[1024];
- /* Do Something With It (tm) */
- msgnum = CtdlSubmitMsg(RecvMsg->CurrMsg->Msg,
- NULL,
- ChrPtr(RecvMsg->RoomName),
- 0);
- if (msgnum > 0L)
- {
- /* Message has been committed to the store
- * write the uidl to the use table
- * so we don't fetch this message again
- */
+ curl = curl_easy_init();
+ if (!curl) {
+ return;
}
- CM_Free(RecvMsg->CurrMsg->Msg);
-
- RecvMsg->count ++;
- return NextDBOperation(&RecvMsg->IO, POP3C_StoreMsgRead);
-}
-
-
-eNextState POP3C_ReadMessageBody(pop3aggr *RecvMsg)
-{
- syslog(LOG_DEBUG, "Converting message...");
- RecvMsg->CurrMsg->Msg = convert_internet_message_buf(&RecvMsg->IO.ReadMsg->MsgBuf);
- return EventQueueDBOperation(&RecvMsg->IO, POP3C_SaveMsg, 0);
-}
-
-eNextState POP3C_SendDelete(pop3aggr *RecvMsg)
-{
- AsyncIO *IO = &RecvMsg->IO;
-
- SetPOP3State(IO, eDelete);
-
- if (!RecvMsg->keep) {
- StrBufPrintf(RecvMsg->IO.SendBuf.Buf, "DELE %ld\r\n", RecvMsg->CurrMsg->MSGID);
- return eReadMessage;
+ Uidls = NewStrBuf();
+
+ curl_easy_setopt(curl, CURLOPT_USERNAME, user);
+ curl_easy_setopt(curl, CURLOPT_PASSWORD, pass);
+ curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
+ curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L);
+ curl_easy_setopt(curl, CURLOPT_TIMEOUT, 15);
+ curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, CurlFillStrBuf_callback); // What to do with downloaded data
+ curl_easy_setopt(curl, CURLOPT_WRITEDATA, Uidls); // Give it our StrBuf to work with
+ curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "UIDL");
+
+ /* Try POP3S (SSL encrypted) first */
+ snprintf(url, sizeof url, "pop3s://%s", host);
+ curl_easy_setopt(curl, CURLOPT_URL, url);
+ res = curl_easy_perform(curl);
+ if (res == CURLE_OK) {
+ } else {
+ syslog(LOG_DEBUG, "pop3client: POP3S connection failed: %s , trying POP3 next", curl_easy_strerror(res));
+ snprintf(url, sizeof url, "pop3://%s", host); // try unencrypted next
+ curl_easy_setopt(curl, CURLOPT_URL, url);
+ FlushStrBuf(Uidls);
+ res = curl_easy_perform(curl);
}
- else {
- RecvMsg->State = ReadMessageBodyFollowing;
- return POP3_C_DispatchWriteDone(&RecvMsg->IO);
- }
-}
-
-
-eNextState POP3C_ReadDeleteState(pop3aggr *RecvMsg)
-{
- RecvMsg->State = GetOneMessageIDState;
- return POP3_C_DispatchWriteDone(&RecvMsg->IO);
-}
-
-
-eNextState POP3C_SendQuit(pop3aggr *RecvMsg)
-{
- AsyncIO *IO = &RecvMsg->IO;
- SetPOP3State(IO, eQuit);
-
- /* Log out */
- StrBufPlain(RecvMsg->IO.SendBuf.Buf,
- HKEY("QUIT\r\n3)"));
- return eReadMessage;
-}
-
-
-eNextState POP3C_ReadQuitState(pop3aggr *RecvMsg)
-{
- return eTerminateConnection;
-}
-
-
-const long POP3_C_ConnTimeout = 1000;
-const long DefaultPOP3Port = 110;
-
-Pop3ClientHandler POP3C_ReadHandlers[] = {
- POP3C_ReadGreeting,
- POP3C_GetUserState,
- POP3C_GetPassState,
- POP3C_GetListCommandState,
- POP3C_GetListOneLine,
- POP3C_GetOneMessageIDState,
- POP3C_ReadMessageBodyFollowing,
- POP3C_ReadMessageBody,
- POP3C_ReadDeleteState,
- POP3C_ReadQuitState,
-};
-
-const long POP3_C_SendTimeouts[POP3C_MaxRead] = {
- 100,
- 100,
- 100,
- 100,
- 100,
- 100,
- 100,
- 100
-};
-const ConstStr POP3C_ReadErrors[POP3C_MaxRead] = {
- {HKEY("Connection broken during ")},
- {HKEY("Connection broken during ")},
- {HKEY("Connection broken during ")},
- {HKEY("Connection broken during ")},
- {HKEY("Connection broken during ")},
- {HKEY("Connection broken during ")},
- {HKEY("Connection broken during ")},
- {HKEY("Connection broken during ")}
-};
-
-Pop3ClientHandler POP3C_SendHandlers[] = {
- NULL, /* we don't send a greeting */
- POP3C_SendUser,
- POP3C_SendPassword,
- POP3C_SendListCommand,
- NULL,
- POP3C_GetOneMessagID,
- POP3C_SendGetOneMsg,
- NULL,
- POP3C_SendDelete,
- POP3C_SendQuit
-};
-
-const long POP3_C_ReadTimeouts[] = {
- 100,
- 100,
- 100,
- 100,
- 100,
- 100,
- 100,
- 100,
- 100,
- 100
-};
-/*****************************************************************************/
-/* POP3 CLIENT DISPATCHER */
-/*****************************************************************************/
-void POP3SetTimeout(eNextState NextTCPState, pop3aggr *pMsg)
-{
- double Timeout = 0.0;
-
- syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
-
- switch (NextTCPState) {
- case eSendFile:
- case eSendReply:
- case eSendMore:
- Timeout = POP3_C_SendTimeouts[pMsg->State];
-/*
- if (pMsg->State == eDATABody) {
- / * if we're sending a huge message, we need more time. * /
- Timeout += StrLength(pMsg->msgtext) / 1024;
- }
-*/
- break;
- case eReadFile:
- case eReadMessage:
- Timeout = POP3_C_ReadTimeouts[pMsg->State];
-/*
- if (pMsg->State == eDATATerminateBody) {
- / *
- * some mailservers take a nap before accepting the message
- * content inspection and such.
- * /
- Timeout += StrLength(pMsg->msgtext) / 1024;
- }
-*/
- break;
- case eReadPayload:
- Timeout = 100000;
- /* TODO!!! */
- break;
- case eSendDNSQuery:
- case eReadDNSReply:
- case eConnect:
- case eTerminateConnection:
- case eDBQuery:
- case eAbort:
- case eReadMore://// TODO
+ if (res != CURLE_OK) {
+ syslog(LOG_DEBUG, "pop3client: POP3 connection failed: %s", curl_easy_strerror(res));
+ curl_easy_cleanup(curl);
+ FreeStrBuf(&Uidls);
return;
}
- SetNextTimeout(&pMsg->IO, Timeout);
-}
-eNextState POP3_C_DispatchReadDone(AsyncIO *IO)
-{
-/* syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__); to noisy anyways. */
- pop3aggr *pMsg = IO->Data;
- eNextState rc;
-
- rc = POP3C_ReadHandlers[pMsg->State](pMsg);
- if (rc != eReadMore)
- pMsg->State++;
- POP3SetTimeout(rc, pMsg);
- return rc;
-}
-eNextState POP3_C_DispatchWriteDone(AsyncIO *IO)
-{
- pop3aggr *pMsg = IO->Data;
- eNextState rc;
-
-/* syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__); to noisy anyways. */
- rc = POP3C_SendHandlers[pMsg->State](pMsg);
- POP3SetTimeout(rc, pMsg);
- return rc;
-}
-
-
-/*****************************************************************************/
-/* POP3 CLIENT ERROR CATCHERS */
-/*****************************************************************************/
-eNextState POP3_C_Terminate(AsyncIO *IO)
-{
- syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
- FinalizePOP3AggrRun(IO);
- return eAbort;
-}
-eNextState POP3_C_TerminateDB(AsyncIO *IO)
-{
- syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
- FinalizePOP3AggrRun(IO);
- return eAbort;
-}
-eNextState POP3_C_Timeout(AsyncIO *IO)
-{
- pop3aggr *pMsg = IO->Data;
-
- syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
- StrBufPlain(IO->ErrMsg, CKEY(POP3C_ReadErrors[pMsg->State]));
- return FailAggregationRun(IO);
-}
-eNextState POP3_C_ConnFail(AsyncIO *IO)
-{
- pop3aggr *pMsg = (pop3aggr *)IO->Data;
-
- syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
- StrBufPlain(IO->ErrMsg, CKEY(POP3C_ReadErrors[pMsg->State]));
- return FailAggregationRun(IO);
-}
-eNextState POP3_C_DNSFail(AsyncIO *IO)
-{
- pop3aggr *pMsg = (pop3aggr *)IO->Data;
-
- syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
- StrBufPlain(IO->ErrMsg, CKEY(POP3C_ReadErrors[pMsg->State]));
- return FailAggregationRun(IO);
-}
-eNextState POP3_C_Shutdown(AsyncIO *IO)
-{
- syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
- FinalizePOP3AggrRun(IO);
- return eAbort;
-}
-
-/*
- * lineread Handler; understands when to read more POP3 lines, and when this is a one-lined reply.
- */
-eReadState POP3_C_ReadServerStatus(AsyncIO *IO)
-{
- eReadState Finished = eBufferNotEmpty;
-
- switch (IO->NextState) {
- case eSendDNSQuery:
- case eReadDNSReply:
- case eDBQuery:
- case eConnect:
- case eTerminateConnection:
- case eAbort:
- Finished = eReadFail;
- break;
- case eSendFile:
- case eSendReply:
- case eSendMore:
- case eReadMore:
- case eReadMessage:
- Finished = StrBufChunkSipLine(IO->IOBuf, &IO->RecvBuf);
- break;
- case eReadFile:
- case eReadPayload:
- Finished = CtdlReadMessageBodyAsync(IO);
- break;
- }
- return Finished;
-}
-
-/*****************************************************************************
- * So we connect our Server IP here. *
- *****************************************************************************/
-eNextState POP3_C_ReAttachToFetchMessages(AsyncIO *IO)
-{
- pop3aggr *cpptr = IO->Data;
-
- syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
-////??? cpptr->State ++;
- if (cpptr->Pos == NULL)
- cpptr->Pos = GetNewHashPos(cpptr->MsgNumbers, 0);
-
- POP3_C_DispatchWriteDone(IO);
- ReAttachIO(IO, cpptr, 0);
- IO->NextState = eReadMessage;
- return IO->NextState;
-}
-
-eNextState pop3_connect_ip(AsyncIO *IO)
-{
- pop3aggr *cpptr = IO->Data;
-
- if (cpptr->IOStart == 0.0) /* whith or without DNS? */
- cpptr->IOStart = IO->Now;
-
- syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
-
- return EvConnectSock(IO,
- POP3_C_ConnTimeout,
- POP3_C_ReadTimeouts[0],
- 1);
-}
-
-eNextState pop3_get_one_host_ip_done(AsyncIO *IO)
-{
- pop3aggr *cpptr = IO->Data;
- struct hostent *hostent;
-
- QueryCbDone(IO);
-
- hostent = cpptr->HostLookup.VParsedDNSReply;
- if ((cpptr->HostLookup.DNSStatus == ARES_SUCCESS) &&
- (hostent != NULL) ) {
- memset(&cpptr->IO.ConnectMe->Addr, 0, sizeof(struct in6_addr));
- if (cpptr->IO.ConnectMe->IPv6) {
- memcpy(&cpptr->IO.ConnectMe->Addr.sin6_addr.s6_addr,
- &hostent->h_addr_list[0],
- sizeof(struct in6_addr));
-
- cpptr->IO.ConnectMe->Addr.sin6_family =
- hostent->h_addrtype;
- cpptr->IO.ConnectMe->Addr.sin6_port =
- htons(DefaultPOP3Port);
- }
- else {
- struct sockaddr_in *addr =
- (struct sockaddr_in*)
- &cpptr->IO.ConnectMe->Addr;
-
- memcpy(&addr->sin_addr.s_addr,
- hostent->h_addr_list[0],
- sizeof(uint32_t));
-
- addr->sin_family = hostent->h_addrtype;
- addr->sin_port = htons(DefaultPOP3Port);
+ // If we got this far, a connection was established, we know whether it's pop3s or pop3, and UIDL is supported.
+ // Now go through the UIDL list and look for messages.
+
+ int num_msgs = num_tokens(ChrPtr(Uidls), '\n');
+ syslog(LOG_DEBUG, "pop3client: there are %d messages", num_msgs);
+ for (i=0; i<num_msgs; ++i) {
+ char oneuidl[1024];
+ extract_token(oneuidl, ChrPtr(Uidls), i, '\n', sizeof oneuidl);
+ if (strlen(oneuidl) > 2) {
+ if (oneuidl[strlen(oneuidl)-1] == '\r') {
+ oneuidl[strlen(oneuidl)-1] = 0;
+ }
+ int this_msg = atoi(oneuidl);
+ char *c = strchr(oneuidl, ' ');
+ if (c) strcpy(oneuidl, ++c);
+
+ // Make up the Use Table record so we can check if we've already seen this message.
+ StrBuf *UT = NewStrBuf();
+ StrBufPrintf(UT, "pop3/%s/%s:%s@%s", room, oneuidl, user, host);
+ int already_seen = CheckIfAlreadySeen(UT);
+ FreeStrBuf(&UT);
+
+ // Only fetch the message if we haven't seen it before.
+ if (already_seen == 0) {
+ StrBuf *TheMsg = NewStrBuf();
+ snprintf(cmd, sizeof cmd, "RETR %d", this_msg);
+ curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, cmd);
+ curl_easy_setopt(curl, CURLOPT_WRITEDATA, TheMsg);
+ res = curl_easy_perform(curl);
+ if (res == CURLE_OK) {
+ struct CtdlMessage *msg = convert_internet_message_buf(&TheMsg);
+ CtdlSubmitMsg(msg, NULL, room);
+ CM_Free(msg);
+ }
+ else {
+ FreeStrBuf(&TheMsg);
+ }
+
+ // Unless the configuration says to keep the message on the server, delete it.
+ if (keep == 0) {
+ snprintf(cmd, sizeof cmd, "DELE %d", this_msg);
+ curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, cmd);
+ res = curl_easy_perform(curl);
+ }
+ }
+ else {
+ syslog(LOG_DEBUG, "pop3client: %s has already been retrieved", oneuidl);
+ }
}
- return pop3_connect_ip(IO);
}
- else
- return eAbort;
-}
-
-eNextState pop3_get_one_host_ip(AsyncIO *IO)
-{
- pop3aggr *cpptr = IO->Data;
- cpptr->IOStart = IO->Now;
-
- syslog(LOG_DEBUG, "POP3: %s\n", __FUNCTION__);
-
- syslog(LOG_DEBUG,
- "POP3 client[%ld]: looking up %s-Record %s : %d ...\n",
- cpptr->n,
- (cpptr->IO.ConnectMe->IPv6)? "aaaa": "a",
- cpptr->IO.ConnectMe->Host,
- cpptr->IO.ConnectMe->Port);
-
- QueueQuery((cpptr->IO.ConnectMe->IPv6)? ns_t_aaaa : ns_t_a,
- cpptr->IO.ConnectMe->Host,
- &cpptr->IO,
- &cpptr->HostLookup,
- pop3_get_one_host_ip_done);
- IO->NextState = eReadDNSReply;
- return IO->NextState;
+ curl_easy_cleanup(curl);
+ FreeStrBuf(&Uidls);
+ return;
}
-
-int pop3_do_fetching(pop3aggr *cpptr)
-{
- AsyncIO *IO = &cpptr->IO;
-
- InitIOStruct(IO,
- cpptr,
- eReadMessage,
- POP3_C_ReadServerStatus,
- POP3_C_DNSFail,
- POP3_C_DispatchWriteDone,
- POP3_C_DispatchReadDone,
- POP3_C_Terminate,
- POP3_C_TerminateDB,
- POP3_C_ConnFail,
- POP3_C_Timeout,
- POP3_C_Shutdown);
-
- safestrncpy(((CitContext *)cpptr->IO.CitContext)->cs_host,
- ChrPtr(cpptr->Url),
- sizeof(((CitContext *)cpptr->IO.CitContext)->cs_host));
-
- if (cpptr->IO.ConnectMe->IsIP) {
- QueueEventContext(&cpptr->IO,
- pop3_connect_ip);
- }
- else {
- QueueEventContext(&cpptr->IO,
- pop3_get_one_host_ip);
- }
- return 1;
-}
-
/*
* Scan a room's netconfig to determine whether it requires POP3 aggregation
*/
void pop3client_scan_room(struct ctdlroom *qrbuf, void *data, OneRoomNetCfg *OneRNCFG)
{
const RoomNetCfgLine *pLine;
- void *vptr;
-
- pthread_mutex_lock(&POP3QueueMutex);
- if (GetHash(POP3QueueRooms, LKEY(qrbuf->QRnumber), &vptr))
- {
- pthread_mutex_unlock(&POP3QueueMutex);
- syslog(LOG_DEBUG,
- "pop3client: [%ld] %s already in progress.",
- qrbuf->QRnumber,
- qrbuf->QRname);
- return;
- }
- pthread_mutex_unlock(&POP3QueueMutex);
+ struct p3cq *pptr = NULL;
if (server_shutting_down) return;
while (pLine != NULL)
{
- pop3aggr *cptr;
-
- cptr = (pop3aggr *) malloc(sizeof(pop3aggr));
- memset(cptr, 0, sizeof(pop3aggr));
- ///TODO do we need this? cptr->roomlist_parts=1;
- cptr->RoomName = NewStrBufPlain(qrbuf->QRname, -1);
- cptr->pop3user = NewStrBufDup(pLine->Value[1]);
- cptr->pop3pass = NewStrBufDup(pLine->Value[2]);
- cptr->Url = NewStrBuf();
- cptr->Host = NewStrBufDup(pLine->Value[0]);
-
- cptr->keep = atol(ChrPtr(pLine->Value[3]));
- cptr->interval = atol(ChrPtr(pLine->Value[4]));
-
- StrBufAppendBufPlain(cptr->Url, HKEY("pop3://"), 0);
- StrBufUrlescUPAppend(cptr->Url, cptr->pop3user, NULL);
- StrBufAppendBufPlain(cptr->Url, HKEY(":"), 0);
- StrBufUrlescUPAppend(cptr->Url, cptr->pop3pass, NULL);
- StrBufAppendBufPlain(cptr->Url, HKEY("@"), 0);
- StrBufAppendBuf(cptr->Url, cptr->Host, 0);
- StrBufAppendBufPlain(cptr->Url, HKEY("/"), 0);
- StrBufUrlescAppend(cptr->Url, cptr->RoomName, NULL);
-
- ParseURL(&cptr->IO.ConnectMe, cptr->Url, 110);
-
- cptr->n = Pop3ClientID++;
- pthread_mutex_lock(&POP3QueueMutex);
- Put(POP3FetchUrls,
- SKEY(cptr->Url),
- cptr,
- DeletePOP3Aggregator);
-
- pthread_mutex_unlock(&POP3QueueMutex);
+ pptr = malloc(sizeof(struct p3cq));
+ pptr->next = p3cq;
+ p3cq = pptr;
+ pptr->room = strdup(qrbuf->QRname);
+ pptr->host = strdup(ChrPtr(pLine->Value[0]));
+ pptr->user = strdup(ChrPtr(pLine->Value[1]));
+ pptr->pass = strdup(ChrPtr(pLine->Value[2]));
+ pptr->keep = atoi(ChrPtr(pLine->Value[3]));
+ pptr->interval = atol(ChrPtr(pLine->Value[4]));
+
pLine = pLine->next;
-
}
}
-static int doing_pop3client = 0;
void pop3client_scan(void) {
static time_t last_run = 0L;
time_t fastest_scan;
- HashPos *it;
- long len;
- const char *Key;
- void *vrptr;
- pop3aggr *cptr;
-
- become_session(&pop3_client_CC);
+ struct p3cq *pptr = NULL;
- if (CtdlGetConfigLong("c_pop3_fastest") < CtdlGetConfigLong("c_pop3_fetch"))
+ if (CtdlGetConfigLong("c_pop3_fastest") < CtdlGetConfigLong("c_pop3_fetch")) {
fastest_scan = CtdlGetConfigLong("c_pop3_fastest");
- else
+ }
+ else {
fastest_scan = CtdlGetConfigLong("c_pop3_fetch");
+ }
/*
* Run POP3 aggregation no more frequently than once every n seconds
if (doing_pop3client) return;
doing_pop3client = 1;
- syslog(LOG_DEBUG, "pop3client started");
+ syslog(LOG_DEBUG, "pop3client: scan started");
CtdlForEachNetCfgRoom(pop3client_scan_room, NULL);
- pthread_mutex_lock(&POP3QueueMutex);
- it = GetNewHashPos(POP3FetchUrls, 0);
- while (!server_shutting_down &&
- GetNextHashPos(POP3FetchUrls, it, &len, &Key, &vrptr) &&
- (vrptr != NULL)) {
- cptr = (pop3aggr *)vrptr;
- if (cptr->RefCount == 0) {
- if (!pop3_do_fetching(cptr)) {
- DeletePOP3Aggregator(cptr);////TODO
- }
- }
+ /*
+ * We have to queue and process in separate phases, otherwise we leave a cursor open
+ */
+ syslog(LOG_DEBUG, "pop3client: processing started");
+ while (p3cq != NULL) {
+ pptr = p3cq;
+ p3cq = p3cq->next;
+
+ pop3client_one_mailbox(pptr->room, pptr->host, pptr->user, pptr->pass, pptr->keep, pptr->interval);
+
+ free(pptr->room);
+ free(pptr->host);
+ free(pptr->user);
+ free(pptr->pass);
+ free(pptr);
}
- DeleteHashPos(&it);
- pthread_mutex_unlock(&POP3QueueMutex);
- syslog(LOG_DEBUG, "pop3client ended");
+ syslog(LOG_DEBUG, "pop3client: ended");
last_run = time(NULL);
doing_pop3client = 0;
}
-void pop3_cleanup(void)
-{
- /* citthread_mutex_destroy(&POP3QueueMutex); TODO */
- while (doing_pop3client != 0) ;
- DeleteHash(&POP3FetchUrls);
- DeleteHash(&POP3QueueRooms);
-}
-
-
-
CTDL_MODULE_INIT(pop3client)
{
if (!threading)
{
- CtdlFillSystemContext(&pop3_client_CC, "POP3aggr");
CtdlREGISTERRoomCfgType(pop3client, ParseGeneric, 0, 5, SerializeGeneric, DeleteGenericCfgLine);
- pthread_mutex_init(&POP3QueueMutex, NULL);
- POP3QueueRooms = NewHash(1, lFlathash);
- POP3FetchUrls = NewHash(1, NULL);
CtdlRegisterSessionHook(pop3client_scan, EVT_TIMER, PRIO_AGGR + 50);
- CtdlRegisterEVCleanupHook(pop3_cleanup);
}
/* return our module id for the log */