X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Fintroductionpuzzlerequester.cpp;h=39ffb364b9d68935898a4905f4bea350a1be4781;hb=14fff12d9df0ee30e2df4bf9d22c2e83065816df;hp=c42e4cb44187bbaa424bdc09073629345aea7065;hpb=8adfd604a97d385869b0ce763b35d014d7aa2cca;p=fms.git

diff --git a/src/freenet/introductionpuzzlerequester.cpp b/src/freenet/introductionpuzzlerequester.cpp
index c42e4cb..39ffb36 100644
--- a/src/freenet/introductionpuzzlerequester.cpp
+++ b/src/freenet/introductionpuzzlerequester.cpp
@@ -38,6 +38,7 @@ const bool IntroductionPuzzleRequester::HandleAllData(FCPMessage &message)
 	IntroductionPuzzleXML xml;
 	long identityid;
 	long index;
+	bool validmessage=true;
 
 	now.SetToGMTime();
 	StringFunctions::Split(message["Identifier"],"|",idparts);
@@ -64,15 +65,65 @@ const bool IntroductionPuzzleRequester::HandleAllData(FCPMessage &message)
 	// parse file into xml and update the database
 	if(xml.ParseXML(std::string(data.begin(),data.end()))==true)
 	{
+
+		// check if last part of UUID matches first part of public key of identity who inserted it
+		st=m_db->Prepare("SELECT PublicKey FROM tblIdentity WHERE IdentityID=?;");
+		st.Bind(0,identityid);
+		st.Step();
+		if(st.RowReturned())
+		{
+			std::vector<std::string> uuidparts;
+			std::vector<std::string> keyparts;
+			std::string keypart="";
+			std::string publickey="";
+
+			st.ResultText(0,publickey);
+
+			StringFunctions::SplitMultiple(publickey,"@,",keyparts);
+			StringFunctions::SplitMultiple(xml.GetUUID(),"@",uuidparts);
+
+			if(uuidparts.size()>1 && keyparts.size()>1)
+			{
+				keypart=StringFunctions::Replace(StringFunctions::Replace(keyparts[1],"-",""),"~","");
+				if(keypart!=uuidparts[1])
+				{
+					m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"IntroductionPuzzleRequester::HandleAllData UUID in IntroductionPuzzle doesn't match public key of identity : "+message["Identifier"]);
+					validmessage=false;
+				}
+			}
+			else
+			{
+				m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"IntroductionPuzzleRequester::HandleAllData Error with identity's public key or UUID : "+message["Identifier"]);
+				validmessage=false;
+			}
+
+		}
+		else
+		{
+			m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"IntroductionPuzzleRequester::HandleAllData Error couldn't find identity : "+message["Identifier"]);
+			validmessage=false;
+		}
+
 		st=m_db->Prepare("INSERT INTO tblIntroductionPuzzleRequests(IdentityID,Day,RequestIndex,Found,UUID,Type,MimeType,PuzzleData) VALUES(?,?,?,?,?,?,?,?);");
 		st.Bind(0,identityid);
 		st.Bind(1,idparts[4]);
 		st.Bind(2,index);
-		st.Bind(3,"true");
-		st.Bind(4,xml.GetUUID());
-		st.Bind(5,xml.GetType());
-		st.Bind(6,xml.GetMimeType());
-		st.Bind(7,xml.GetPuzzleData());
+		if(validmessage)
+		{
+			st.Bind(3,"true");
+			st.Bind(4,xml.GetUUID());
+			st.Bind(5,xml.GetType());
+			st.Bind(6,xml.GetMimeType());
+			st.Bind(7,xml.GetPuzzleData());
+		}
+		else
+		{
+			st.Bind(3,"false");
+			st.Bind(4);
+			st.Bind(5);
+			st.Bind(6);
+			st.Bind(7);
+		}
 		st.Step();
 		st.Finalize();
 
@@ -169,7 +220,7 @@ const bool IntroductionPuzzleRequester::HandleMessage(FCPMessage &message)
 void IntroductionPuzzleRequester::Initialize()
 {
 	std::string tempval="";
-	Option::instance()->Get("MaxIntroductionPuzzleRequests",tempval);
+	Option::Instance()->Get("MaxIntroductionPuzzleRequests",tempval);
 	StringFunctions::Convert(tempval,m_maxrequests);
 	if(m_maxrequests<1)
 	{
@@ -180,7 +231,7 @@ void IntroductionPuzzleRequester::Initialize()
 	{
 		m_log->WriteLog(LogFile::LOGLEVEL_WARNING,"Option MaxIntroductionPuzzleRequests is currently set at "+tempval+".  This value might be incorrectly configured.");
 	}
-	Option::instance()->Get("MessageBase",m_messagebase);
+	Option::Instance()->Get("MessageBase",m_messagebase);
 	m_tempdate.SetToGMTime();
 }
 
@@ -188,11 +239,21 @@ void IntroductionPuzzleRequester::PopulateIDList()
 {
 	DateTime now;
 	int id;
+	std::string limitnum="30";
+
+	// if we don't have an identity that we haven't seen yet, then set limit to 5
+	SQLite3DB::Statement st=m_db->Prepare("SELECT tblLocalIdentity.LocalIdentityID FROM tblLocalIdentity LEFT JOIN tblIdentity ON tblLocalIdentity.PublicKey=tblIdentity.PublicKey WHERE tblIdentity.IdentityID IS NULL;");
+	st.Step();
+	if(!st.RowReturned())
+	{
+		limitnum="5";
+	}
+	st.Finalize();
 
 	now.SetToGMTime();
 
-	// select identities that aren't single use and have been seen today
-	SQLite3DB::Statement st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND SingleUse='false' AND LastSeen>='"+now.Format("%Y-%m-%d")+"';");
+	// select identities that aren't single use, are publishing a trust list, and have been seen today ( order by trust DESC and limit to limitnum )
+	st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublishTrustList='true' AND PublicKey IS NOT NULL AND PublicKey <> '' AND SingleUse='false' AND LastSeen>='"+now.Format("%Y-%m-%d")+"' ORDER BY LocalMessageTrust DESC LIMIT 0,"+limitnum+";");
 	st.Step();
 
 	m_ids.clear();
@@ -233,7 +294,7 @@ void IntroductionPuzzleRequester::Process()
 	// this will recheck for ids every minute
 	DateTime now;
 	now.SetToGMTime();
-	if(m_tempdate<(now-(1.0/1440.0)))
+	if(m_ids.size()==0 && m_tempdate<(now-(1.0/1440.0)))
 	{
 		PopulateIDList();
 		m_tempdate=now;