X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Frssclient%2Fserv_rssclient.c;h=acae637871a5830a0b3aac56ead9ab2662b36738;hb=d268ace45e855ddadeea5c837a31dea33f0f26bd;hp=514ba1afd05b751131d5c3261bb1764ec7c493dc;hpb=b1fbde571ede625ac08a575b75384c670008fcc5;p=citadel.git

diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c
index 514ba1afd..acae63787 100644
--- a/citadel/modules/rssclient/serv_rssclient.c
+++ b/citadel/modules/rssclient/serv_rssclient.c
@@ -1,7 +1,7 @@
 /*
  * Bring external RSS feeds into rooms.
  *
- * Copyright (c) 2007-2012 by the citadel.org team
+ * Copyright (c) 2007-2016 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 version 3.
@@ -75,13 +75,13 @@ int RSSClientDebugEnabled = 0;
 
 #define EVRSSC_syslog(LEVEL, FORMAT, ...)				\
 	DBGLOG(LEVEL) syslog(LEVEL,					\
-			     "IO[%ld]CC[%d][%ld]RSS" FORMAT,		\
-			     IO->ID, CCID, N, __VA_ARGS__)
+			     "%s[%ld]CC[%d][%ld]RSS" FORMAT,		\
+			     IOSTR, IO->ID, CCID, N, __VA_ARGS__)
 
 #define EVRSSCM_syslog(LEVEL, FORMAT)					\
 	DBGLOG(LEVEL) syslog(LEVEL,					\
-			     "IO[%ld]CC[%d][%ld]RSS" FORMAT,		\
-			     IO->ID, CCID, N)
+			     "%s[%ld]CC[%d][%ld]RSS" FORMAT,		\
+			     IOSTR, IO->ID, CCID, N)
 
 #define EVRSSQ_syslog(LEVEL, FORMAT, ...)				\
 	DBGLOG(LEVEL) syslog(LEVEL, "RSS" FORMAT,			\
@@ -90,8 +90,8 @@ int RSSClientDebugEnabled = 0;
 	DBGLOG(LEVEL) syslog(LEVEL, "RSS" FORMAT)
 
 #define EVRSSCSM_syslog(LEVEL, FORMAT)					\
-	DBGLOG(LEVEL) syslog(LEVEL, "IO[%ld][%ld]RSS" FORMAT,		\
-			     IO->ID, N)
+	DBGLOG(LEVEL) syslog(LEVEL, "%s[%ld][%ld]RSS" FORMAT,		\
+			     IOSTR, IO->ID, N)
 
 typedef enum _RSSState {
 	eRSSCreated,
@@ -108,6 +108,37 @@ ConstStr RSSStates[] = {
 	{HKEY("checking usetable")}
 };
 
+
+static size_t GetLocationString( void *ptr, size_t size, size_t nmemb, void *userdata)
+{
+#define LOCATION "location"
+	if (strncasecmp((char*)ptr, LOCATION, sizeof(LOCATION) - 1) == 0)
+	{
+		AsyncIO *IO = (AsyncIO *) userdata;
+		rss_aggregator *RSSAggr = (rss_aggregator *)IO->Data;
+
+		char *pch = (char*) ptr;
+		char *pche;
+		
+		pche = pch + (size * nmemb);
+		pch += sizeof(LOCATION);
+		
+		while (isspace(*pch) || (*pch == ':'))
+			pch ++;
+
+		while (isspace(*pche) || (*pche == '\0'))
+			pche--;
+		if (RSSAggr->RedirectUrl == NULL) {
+			RSSAggr->RedirectUrl = NewStrBufPlain(pch, pche - pch + 1);
+		}
+		else {
+			FlushStrBuf(RSSAggr->RedirectUrl);
+			StrBufPlain(RSSAggr->RedirectUrl, pch, pche - pch + 1);	
+		}
+	}
+	return size * nmemb;
+}
+
 static void SetRSSState(AsyncIO *IO, RSSState State)
 {
 	CitContext* CCC = IO->CitContext;
@@ -191,6 +222,7 @@ void DeleteRssCfg(void *vptr)
 		EVRSSCM_syslog(LOG_DEBUG, "RSS: destroying\n");
 
 	FreeStrBuf(&RSSAggr->Url);
+	FreeStrBuf(&RSSAggr->RedirectUrl);
 	FreeStrBuf(&RSSAggr->rooms);
 	FreeStrBuf(&RSSAggr->CData);
 	FreeStrBuf(&RSSAggr->Key);
@@ -274,11 +306,24 @@ void AppendLink(StrBuf *Message,
 }
 
 
-void rss_format_item(networker_save_message *SaveMsg)
+int rss_format_item(AsyncIO *IO, networker_save_message *SaveMsg)
 {
 	StrBuf *Message;
 	int msglen = 0;
 
+	if (StrLength(SaveMsg->description) + 
+	    StrLength(SaveMsg->link) + 
+	    StrLength(SaveMsg->linkTitle) + 
+	    StrLength(SaveMsg->reLink) +
+	    StrLength(SaveMsg->reLinkTitle) +
+	    StrLength(SaveMsg->title) == 0)
+	{
+		EVRSSCM_syslog(LOG_INFO, "Refusing to save empty message.");
+		return 0;
+	}
+
+	CM_Flush(&SaveMsg->Msg);
+
 	if (SaveMsg->author_or_creator != NULL) {
 
 		char *From;
@@ -296,36 +341,31 @@ void rss_format_item(networker_save_message *SaveMsg)
 		if (!FromAt && StrLength (SaveMsg->author_email) > 0)
 		{
 			StrBufRFC2047encode(&Encoded, SaveMsg->author_or_creator);
-			SaveMsg->Msg.cm_fields['A'] = SmashStrBuf(&Encoded);
-			SaveMsg->Msg.cm_fields['P'] =
-				SmashStrBuf(&SaveMsg->author_email);
+			CM_SetAsFieldSB(&SaveMsg->Msg, eAuthor, &Encoded);
+			CM_SetAsFieldSB(&SaveMsg->Msg, eMessagePath, &SaveMsg->author_email);
 		}
 		else
 		{
 			if (FromAt)
 			{
-				SaveMsg->Msg.cm_fields['A'] =
-					SmashStrBuf(&SaveMsg->author_or_creator);
-				SaveMsg->Msg.cm_fields['P'] =
-					strdup(SaveMsg->Msg.cm_fields['A']);
+				CM_SetAsFieldSB(&SaveMsg->Msg, eAuthor, &SaveMsg->author_or_creator);
+				CM_CopyField(&SaveMsg->Msg, eMessagePath, eAuthor);
 			}
 			else
 			{
 				StrBufRFC2047encode(&Encoded,
 						    SaveMsg->author_or_creator);
-				SaveMsg->Msg.cm_fields['A'] =
-					SmashStrBuf(&Encoded);
-				SaveMsg->Msg.cm_fields['P'] =
-					strdup("rss@localhost");
+				CM_SetAsFieldSB(&SaveMsg->Msg, eAuthor, &Encoded);
+				CM_SetField(&SaveMsg->Msg, eMessagePath, HKEY("rss@localhost"));
 
 			}
 		}
 	}
 	else {
-		SaveMsg->Msg.cm_fields['A'] = strdup("rss");
+		CM_SetField(&SaveMsg->Msg, eAuthor, HKEY("rss"));
 	}
 
-	SaveMsg->Msg.cm_fields['N'] = strdup(NODENAME);
+	CM_SetField(&SaveMsg->Msg, eNodeName, CtdlGetConfigStr("c_nodename"), strlen(CtdlGetConfigStr("c_nodename")));
 	if (SaveMsg->title != NULL) {
 		long len;
 		char *Sbj;
@@ -335,20 +375,25 @@ void rss_format_item(networker_save_message *SaveMsg)
 		StrBufSpaceToBlank(SaveMsg->title);
 		len = StrLength(SaveMsg->title);
 		Sbj = html_to_ascii(ChrPtr(SaveMsg->title), len, 512, 0);
-		len = strlen(Sbj);
-		if ((len > 0) && (Sbj[len - 1] == '\n'))
-		{
-			len --;
-			Sbj[len] = '\0';
-		}
-		Encoded = NewStrBufPlain(Sbj, len);
-		free(Sbj);
-
-		StrBufTrim(Encoded);
-		StrBufRFC2047encode(&QPEncoded, Encoded);
+		if (!IsEmptyStr(Sbj)) {
+			len = strlen(Sbj);
+			if ((Sbj[len - 1] == '\n'))
+			{
+				len --;
+				Sbj[len] = '\0';
+			}
+			Encoded = NewStrBufPlain(Sbj, len);
+		
 
-		SaveMsg->Msg.cm_fields['U'] = SmashStrBuf(&QPEncoded);
-		FreeStrBuf(&Encoded);
+			StrBufTrim(Encoded);
+			StrBufRFC2047encode(&QPEncoded, Encoded);
+			
+			CM_SetAsFieldSB(&SaveMsg->Msg, eMsgSubject, &QPEncoded);
+			FreeStrBuf(&Encoded);
+		}
+		if (Sbj != NULL) {
+			free(Sbj);
+		}
 	}
 	if (SaveMsg->link == NULL)
 		SaveMsg->link = NewStrBufPlain(HKEY(""));
@@ -375,8 +420,8 @@ void rss_format_item(networker_save_message *SaveMsg)
 	AppendLink(Message, SaveMsg->reLink, SaveMsg->reLinkTitle, "Reply to this");
 	StrBufAppendBufPlain(Message, HKEY("</body></html>\n"), 0);
 
-
 	SaveMsg->Message = Message;
+	return 1;
 }
 
 eNextState RSSSaveMessage(AsyncIO *IO)
@@ -385,16 +430,17 @@ eNextState RSSSaveMessage(AsyncIO *IO)
 	const char *Key;
 	rss_aggregator *RSSAggr = (rss_aggregator *) IO->Data;
 
-	rss_format_item(RSSAggr->ThisMsg);
-
-	RSSAggr->ThisMsg->Msg.cm_fields['M'] =
-		SmashStrBuf(&RSSAggr->ThisMsg->Message);
-
-	CtdlSubmitMsg(&RSSAggr->ThisMsg->Msg, &RSSAggr->recp, NULL, 0);
-
-	/* write the uidl to the use table so we don't store this item again */
+	if (rss_format_item(IO, RSSAggr->ThisMsg))
+	{
+		CM_SetAsFieldSB(&RSSAggr->ThisMsg->Msg, eMesageText,
+				       &RSSAggr->ThisMsg->Message);
 
-	CheckIfAlreadySeen("RSS Item Insert", RSSAggr->ThisMsg->MsgGUID, IO->Now, 0, eWrite, IO->ID, CCID);
+		CtdlSubmitMsg(&RSSAggr->ThisMsg->Msg, &RSSAggr->recp, NULL, 0);
+		
+		/* write the uidl to the use table so we don't store this item again */
+		
+		CheckIfAlreadySeen("RSS Item Insert", RSSAggr->ThisMsg->MsgGUID, EvGetNow(IO), 0, eWrite, CCID, IO->ID);
+	}
 
 	if (GetNextHashPos(RSSAggr->Messages,
 			   RSSAggr->Pos,
@@ -407,26 +453,30 @@ eNextState RSSSaveMessage(AsyncIO *IO)
 
 eNextState RSS_FetchNetworkUsetableEntry(AsyncIO *IO)
 {
+	static const time_t antiExpire = USETABLE_ANTIEXPIRE_HIRES;
+#ifndef DEBUG_RSS
+	time_t seenstamp = 0;
 	const char *Key;
 	long len;
 	rss_aggregator *Ctx = (rss_aggregator *) IO->Data;
 
 	/* Find out if we've already seen this item */
 // todo: expiry?
-#ifndef DEBUG_RSS
 	SetRSSState(IO, eRSSUT);
-	if (CheckIfAlreadySeen("RSS Item Seen",
-			       Ctx->ThisMsg->MsgGUID,
-			       IO->Now,
-			       IO->Now - USETABLE_ANTIEXPIRE,
-			       eCheckUpdate,
-			       IO->ID, CCID)
-	    != 0)
+	seenstamp = CheckIfAlreadySeen("RSS Item Seen",
+				       Ctx->ThisMsg->MsgGUID,
+				       EvGetNow(IO),
+				       antiExpire,
+				       eCheckUpdate,
+				       CCID, IO->ID);
+	if (seenstamp != 0)
 	{
 		/* Item has already been seen */
 		EVRSSC_syslog(LOG_DEBUG,
-			  "%s has already been seen\n",
-			  ChrPtr(Ctx->ThisMsg->MsgGUID));
+			      "%s has already been seen - %ld < %ld",
+			      ChrPtr(Ctx->ThisMsg->MsgGUID),
+			      seenstamp, antiExpire);
+
 		SetRSSState(IO, eRSSParsing);
 
 		if (GetNextHashPos(Ctx->Messages,
@@ -442,6 +492,11 @@ eNextState RSS_FetchNetworkUsetableEntry(AsyncIO *IO)
 	else
 #endif
 	{
+		/* Item has already been seen */
+		EVRSSC_syslog(LOG_DEBUG,
+			      "%s Parsing - %ld >= %ld",
+			      ChrPtr(Ctx->ThisMsg->MsgGUID),
+			      seenstamp, antiExpire);
 		SetRSSState(IO, eRSSParsing);
 
 		NextDBOperation(IO, RSSSaveMessage);
@@ -452,9 +507,9 @@ eNextState RSS_FetchNetworkUsetableEntry(AsyncIO *IO)
 
 void UpdateLastKnownGood(pRSSConfig *pCfg, time_t now)
 {
-	OneRoomNetCfg* pRNCfg;
+	OneRoomNetCfg *pRNCfg;
 	begin_critical_section(S_NETCONFIGS);
-	pRNCfg = CtdlGetNetCfgForRoom (pCfg->QRnumber);
+	pRNCfg = CtdlGetNetCfgForRoom(pCfg->QRnumber);
 	if (pRNCfg != NULL)
 	{
 		RSSCfgLine *RSSCfg = (RSSCfgLine *)pRNCfg->NetConfigs[rssclient];
@@ -473,6 +528,8 @@ void UpdateLastKnownGood(pRSSConfig *pCfg, time_t now)
 		}
 	}
 
+	SaveRoomNetConfigFile(pRNCfg, pCfg->QRnumber);
+	FreeRoomNetworkStruct(&pRNCfg);
 	end_critical_section(S_NETCONFIGS);
 }
 
@@ -487,36 +544,97 @@ eNextState RSSAggregator_AnalyseReply(AsyncIO *IO)
 	StrBuf *guid;
 	rss_aggregator *Ctx = (rss_aggregator *) IO->Data;
 
-	if (IO->HttpReq.httpcode != 200)
-	{
+
+	if ((IO->HttpReq.httpcode >= 300) &&
+	    (IO->HttpReq.httpcode < 400)  && 
+	    (Ctx->RedirectUrl != NULL)) {
+
 		StrBuf *ErrMsg;
 		long lens[2];
 		const char *strs[2];
 
 		SetRSSState(IO, eRSSFailure);
 		ErrMsg = NewStrBuf();
-		EVRSSC_syslog(LOG_ALERT, "need a 200, got a %ld !\n",
+		if (IO) EVRSSC_syslog(LOG_ALERT, "need a 200, got a %ld !\n",
 			      IO->HttpReq.httpcode);
+		strs[0] = ChrPtr(Ctx->Url);
+		lens[0] = StrLength(Ctx->Url);
+
+		strs[1] = ChrPtr(Ctx->rooms);
+		lens[1] = StrLength(Ctx->rooms);
+
+		if (IO->HttpReq.CurlError == NULL)
+			IO->HttpReq.CurlError = "";
+
+		StrBufPrintf(ErrMsg,
+			     "Error while RSS-Aggregation Run of %s\n"
+			     " need a 200, got a %ld !\n"
+			     " Curl Error message: \n%s / %s\n"
+			     " Redirect header points to: %s\n"
+			     " Response text was: \n"
+			     " \n %s\n",
+			     ChrPtr(Ctx->Url),
+			     IO->HttpReq.httpcode,
+			     IO->HttpReq.errdesc,
+			     IO->HttpReq.CurlError,
+			     ChrPtr(Ctx->RedirectUrl),
+			     ChrPtr(IO->HttpReq.ReplyData)
+			);
+
+		CtdlAideFPMessage(
+			ChrPtr(ErrMsg),
+			"RSS Aggregation run failure",
+			2, strs, (long*) &lens,
+			CCID,
+			IO->ID,
+			EvGetNow(IO));
 		
+		FreeStrBuf(&ErrMsg);
+		EVRSSC_syslog(LOG_DEBUG,
+			      "RSS feed returned an invalid http status code. <%s><HTTP %ld>\n",
+			      ChrPtr(Ctx->Url),
+			      IO->HttpReq.httpcode);
+		return eAbort;
+	}
+	else if (IO->HttpReq.httpcode != 200)
+	{
+		StrBuf *ErrMsg;
+		long lens[2];
+		const char *strs[2];
+
+		SetRSSState(IO, eRSSFailure);
+		ErrMsg = NewStrBuf();
+		if (IO) EVRSSC_syslog(LOG_ALERT, "need a 200, got a %ld !\n",
+			      IO->HttpReq.httpcode);
 		strs[0] = ChrPtr(Ctx->Url);
 		lens[0] = StrLength(Ctx->Url);
 
 		strs[1] = ChrPtr(Ctx->rooms);
 		lens[1] = StrLength(Ctx->rooms);
+
+		if (IO->HttpReq.CurlError == NULL)
+			IO->HttpReq.CurlError = "";
+
 		StrBufPrintf(ErrMsg,
 			     "Error while RSS-Aggregation Run of %s\n"
 			     " need a 200, got a %ld !\n"
+			     " Curl Error message: \n%s / %s\n"
 			     " Response text was: \n"
 			     " \n %s\n",
 			     ChrPtr(Ctx->Url),
 			     IO->HttpReq.httpcode,
-			     ChrPtr(IO->HttpReq.ReplyData));
+			     IO->HttpReq.errdesc,
+			     IO->HttpReq.CurlError,
+			     ChrPtr(IO->HttpReq.ReplyData)
+			);
+
 		CtdlAideFPMessage(
 			ChrPtr(ErrMsg),
 			"RSS Aggregation run failure",
 			2, strs, (long*) &lens,
-			IO->Now,
-			IO->ID, CCID);
+			CCID,
+			IO->ID,
+			EvGetNow(IO));
 		
 		FreeStrBuf(&ErrMsg);
 		EVRSSC_syslog(LOG_DEBUG,
@@ -530,7 +648,7 @@ eNextState RSSAggregator_AnalyseReply(AsyncIO *IO)
 
 	while (pCfg != NULL)
 	{
-		UpdateLastKnownGood (pCfg, IO->Now);
+		UpdateLastKnownGood (pCfg, EvGetNow(IO));
 		if ((Ctx->roomlist_parts > 1) && 
 		    (it == NULL))
 		{
@@ -539,8 +657,10 @@ eNextState RSSAggregator_AnalyseReply(AsyncIO *IO)
 		if (it != NULL)
 		{
 			void *vptr;
-			GetNextHashPos(Ctx->OtherQRnumbers, it, &len, &Key, &vptr);
-			pCfg = vptr;
+			if (GetNextHashPos(Ctx->OtherQRnumbers, it, &len, &Key, &vptr))
+				pCfg = vptr;
+			else
+				pCfg = NULL;
 		}
 		else 
 			pCfg = NULL;
@@ -570,10 +690,10 @@ eNextState RSSAggregator_AnalyseReply(AsyncIO *IO)
 
 	if (CheckIfAlreadySeen("RSS Whole",
 			       guid,
-			       IO->Now,
-			       IO->Now - USETABLE_ANTIEXPIRE,
-			       eCheckUpdate,
-			       IO->ID, CCID)
+			       EvGetNow(IO),
+			       EvGetNow(IO) - USETABLE_ANTIEXPIRE,
+			       eUpdate,
+			       CCID, IO->ID)
 	    != 0)
 	{
 		FreeStrBuf(&guid);
@@ -589,7 +709,7 @@ eNextState RSSAggregator_AnalyseReply(AsyncIO *IO)
 
 eNextState RSSAggregator_FinishHttp(AsyncIO *IO)
 {
-	return QueueDBOperation(IO, RSSAggregator_AnalyseReply);
+	return CurlQueueDBOperation(IO, RSSAggregator_AnalyseReply);
 }
 
 /*
@@ -600,6 +720,9 @@ int rss_do_fetching(rss_aggregator *RSSAggr)
 	AsyncIO		*IO = &RSSAggr->IO;
 	rss_item *ri;
 	time_t now;
+	CURLcode sta;
+	CURL *chnd;
+
 
 	now = time(NULL);
 
@@ -621,6 +744,9 @@ int rss_do_fetching(rss_aggregator *RSSAggr)
 		EVRSSCM_syslog(LOG_ALERT, "Unable to initialize libcurl.\n");
 		return 0;
 	}
+	chnd = IO->HttpReq.chnd;
+	OPT(HEADERDATA, IO);
+	OPT(HEADERFUNCTION, GetLocationString);
 	SetRSSState(IO, eRSSCreated);
 
 	safestrncpy(((CitContext*)RSSAggr->IO.CitContext)->cs_host,
@@ -646,6 +772,8 @@ void rssclient_scan_room(struct ctdlroom *qrbuf, void *data, OneRoomNetCfg *OneR
 	rss_aggregator *use_this_RSSAggr = NULL;
 	void *vptr;
 
+	TRACE;
+
 	pthread_mutex_lock(&RSSQueueMutex);
 	if (GetHash(RSSQueueRooms, LKEY(qrbuf->QRnumber), &vptr))
 	{