/*
* 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.
{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;
EVRSSCM_syslog(LOG_DEBUG, "RSS: destroying\n");
FreeStrBuf(&RSSAggr->Url);
+ FreeStrBuf(&RSSAggr->RedirectUrl);
FreeStrBuf(&RSSAggr->rooms);
FreeStrBuf(&RSSAggr->CData);
FreeStrBuf(&RSSAggr->Key);
CM_SetField(&SaveMsg->Msg, eAuthor, HKEY("rss"));
}
- CM_SetField(&SaveMsg->Msg, eNodeName, CFG_KEY(c_nodename));
+ CM_SetField(&SaveMsg->Msg, eNodeName, CtdlGetConfigStr("c_nodename"), strlen(CtdlGetConfigStr("c_nodename")));
if (SaveMsg->title != NULL) {
long len;
char *Sbj;
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);
+
- CM_SetAsFieldSB(&SaveMsg->Msg, eMsgSubject, &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(""));
/* write the uidl to the use table so we don't store this item again */
- CheckIfAlreadySeen("RSS Item Insert", RSSAggr->ThisMsg->MsgGUID, IO->Now, 0, eWrite, CCID, IO->ID);
+ CheckIfAlreadySeen("RSS Item Insert", RSSAggr->ThisMsg->MsgGUID, EvGetNow(IO), 0, eWrite, CCID, IO->ID);
}
if (GetNextHashPos(RSSAggr->Messages,
eNextState RSS_FetchNetworkUsetableEntry(AsyncIO *IO)
{
static const time_t antiExpire = USETABLE_ANTIEXPIRE_HIRES;
- time_t seenstamp = 0;
#ifndef DEBUG_RSS
+ time_t seenstamp = 0;
const char *Key;
long len;
rss_aggregator *Ctx = (rss_aggregator *) IO->Data;
SetRSSState(IO, eRSSUT);
seenstamp = CheckIfAlreadySeen("RSS Item Seen",
Ctx->ThisMsg->MsgGUID,
- IO->Now,
+ EvGetNow(IO),
antiExpire,
eCheckUpdate,
CCID, IO->ID);
- if (seenstamp < antiExpire)
+ if (seenstamp != 0)
{
/* Item has already been seen */
EVRSSC_syslog(LOG_DEBUG,
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];
}
if (RSSCfg != NULL)
{
- pRNCfg->changed = 1;
RSSCfg->last_known_good = now;
}
}
-
+ SaveRoomNetConfigFile(pRNCfg, pCfg->QRnumber);
+ FreeRoomNetworkStruct(&pRNCfg);
end_critical_section(S_NETCONFIGS);
}
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);
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,
while (pCfg != NULL)
{
- UpdateLastKnownGood (pCfg, IO->Now);
+ UpdateLastKnownGood (pCfg, EvGetNow(IO));
if ((Ctx->roomlist_parts > 1) &&
(it == NULL))
{
if (CheckIfAlreadySeen("RSS Whole",
guid,
- IO->Now,
- IO->Now - USETABLE_ANTIEXPIRE,
- eCheckUpdate,
+ EvGetNow(IO),
+ EvGetNow(IO) - USETABLE_ANTIEXPIRE,
+ eUpdate,
CCID, IO->ID)
!= 0)
{
AsyncIO *IO = &RSSAggr->IO;
rss_item *ri;
time_t now;
+ CURLcode sta;
+ CURL *chnd;
+
now = time(NULL);
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,
rss_aggregator *use_this_RSSAggr = NULL;
void *vptr;
+ TRACE;
+
pthread_mutex_lock(&RSSQueueMutex);
if (GetHash(RSSQueueRooms, LKEY(qrbuf->QRnumber), &vptr))
{
projects / citadel.git / blobdiff