X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Fmessagelistrequester.cpp;h=41f7d8584056ce9dfce695be8b2404842f4227ae;hb=c0ebc7b53a977885ebc2d3a679c586ae20c0bc4a;hp=62d5bb2f1c03a238881cac8b9559becb178ef650;hpb=026dc6b2bc548c945359c4e166eff514f2c47c6a;p=fms.git

diff --git a/src/freenet/messagelistrequester.cpp b/src/freenet/messagelistrequester.cpp
index 62d5bb2..41f7d85 100644
--- a/src/freenet/messagelistrequester.cpp
+++ b/src/freenet/messagelistrequester.cpp
@@ -19,6 +19,36 @@ MessageListRequester::MessageListRequester(FCPv2 *fcp):IIndexRequester<long>(fcp
 	Initialize();
 }
 
+const bool MessageListRequester::CheckDateNotFuture(const std::string &datestr) const
+{
+	std::vector<std::string> dateparts;
+	int year=0;
+	int month=0;
+	int day=0;
+	Poco::DateTime today;
+
+	StringFunctions::Split(datestr,"-",dateparts);
+	if(dateparts.size()==3)
+	{
+		StringFunctions::Convert(dateparts[0],year);
+		StringFunctions::Convert(dateparts[1],month);
+		StringFunctions::Convert(dateparts[2],day);
+		if(today.year()>year || (today.year()==year && today.month()>month) || (today.year()==year && today.month()==month && today.day()>=day))
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+	else
+	{
+		return false;
+	}
+
+}
+
 void MessageListRequester::GetBoardList(std::map<std::string,bool> &boards)
 {
 	SQLite3DB::Statement st=m_db->Prepare("SELECT BoardName, SaveReceivedMessages FROM tblBoard;");
@@ -56,6 +86,8 @@ const bool MessageListRequester::HandleAllData(FCPMessage &message)
 	std::map<std::string,bool> boards;	// list of boards and if we will save messages for that board or not
 	bool addmessage=false;
 	std::string boardsstr="";
+	std::string datestr="";
+	std::vector<std::string> dateparts;
 
 	GetBoardList(boards);
 
@@ -78,10 +110,13 @@ const bool MessageListRequester::HandleAllData(FCPMessage &message)
 
 	// receive the file
 	data.resize(datalength);
-	m_fcp->ReceiveRaw(&data[0],datalength);
+	if(data.size()>0)
+	{
+		m_fcp->ReceiveRaw(&data[0],datalength);
+	}
 
 	// parse file into xml and update the database
-	if(xml.ParseXML(std::string(data.begin(),data.end()))==true)
+	if(data.size()>0 && xml.ParseXML(std::string(data.begin(),data.end()))==true)
 	{
 
 		SQLite3DB::Statement st=m_db->Prepare("SELECT IdentityID FROM tblMessageRequests WHERE IdentityID=? AND Day=? AND RequestIndex=?;");
@@ -115,6 +150,12 @@ const bool MessageListRequester::HandleAllData(FCPMessage &message)
 				boardsstr+=(*j);
 			}
 
+			if(CheckDateNotFuture(xml.GetDate(i))==false)
+			{
+				addmessage=false;
+				m_log->error("MessageListRequester::HandleAllData date for message is in future! "+xml.GetDate(i));
+			}
+
 			if(addmessage==true)
 			{
 				st.Bind(0,identityid);
@@ -167,6 +208,12 @@ const bool MessageListRequester::HandleAllData(FCPMessage &message)
 					boardsstr+=(*j);
 				}
 
+				if(CheckDateNotFuture(xml.GetExternalDate(i))==false)
+				{
+					addmessage=false;
+					m_log->error("MessageListRequester::HandleAllData date for external message is in future! "+xml.GetExternalDate(i));
+				}
+
 				if(addmessage==true)
 				{
 					spk.Bind(0,xml.GetExternalIdentity(i));
@@ -259,9 +306,10 @@ const bool MessageListRequester::HandleGetFailed(FCPMessage &message)
 void MessageListRequester::Initialize()
 {
 	m_fcpuniquename="MessageListRequester";
-	std::string tempval;
-	Option::Instance()->Get("MaxMessageListRequests",tempval);
-	StringFunctions::Convert(tempval,m_maxrequests);
+	std::string tempval="";
+
+	m_maxrequests=0;
+	Option::Instance()->GetInt("MaxMessageListRequests",m_maxrequests);
 	if(m_maxrequests<1)
 	{
 		m_maxrequests=1;