X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=src%2Ffreenet%2Fmessagelistrequester.cpp;h=a6d8ba9eadcb97e55bef5576623a7957db8c73a5;hp=2a13af702b54511eec5ddfcc55c7ee91e761f19d;hb=853f67b0b7b8121d572cff34d40f7b28cac8f65e;hpb=964f55fd550fc711c0320ce6a24ad713040695d0

diff --git a/src/freenet/messagelistrequester.cpp b/src/freenet/messagelistrequester.cpp
index 2a13af7..a6d8ba9 100644
--- a/src/freenet/messagelistrequester.cpp
+++ b/src/freenet/messagelistrequester.cpp
@@ -54,6 +54,7 @@ const bool MessageListRequester::HandleAllData(FCPMessage &message)
 	{
 
 		SQLite3DB::Statement st=m_db->Prepare("SELECT IdentityID FROM tblMessageRequests WHERE IdentityID=? AND Day=? AND RequestIndex=?;");
+		SQLite3DB::Statement spk=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey=?;");
 		SQLite3DB::Statement mst=m_db->Prepare("INSERT INTO tblMessageRequests(IdentityID,Day,RequestIndex,FromMessageList) VALUES(?,?,?,'true');");
 		for(long i=0; i<xml.MessageCount(); i++)
 		{
@@ -71,8 +72,27 @@ const bool MessageListRequester::HandleAllData(FCPMessage &message)
 			}
 			st.Reset();
 		}
-		mst.Finalize();
-		st.Finalize();
+
+		// insert external message indexes
+		for(long i=0; i<xml.ExternalMessageCount(); i++)
+		{
+			if(xml.GetExternalType(i)=="Keyed")
+			{
+				spk.Bind(0,xml.GetExternalIdentity(i));
+				spk.Step();
+				if(spk.RowReturned())
+				{
+					int thisidentityid=0;
+					spk.ResultInt(0,thisidentityid);
+					mst.Bind(0,thisidentityid);
+					mst.Bind(1,xml.GetExternalDate(i));
+					mst.Bind(2,xml.GetExternalIndex(i));
+					mst.Step();
+					mst.Reset();
+				}
+				spk.Reset();
+			}
+		}
 
 		st=m_db->Prepare("INSERT INTO tblMessageListRequests(IdentityID,Day,RequestIndex,Found) VALUES(?,?,?,'true');");
 		st.Bind(0,identityid);
@@ -116,6 +136,13 @@ const bool MessageListRequester::HandleGetFailed(FCPMessage &message)
 	StringFunctions::Convert(idparts[1],identityid);
 	StringFunctions::Convert(idparts[2],index);	
 
+	// code 27 - permanent redirect
+	if(message["Code"]=="27")
+	{
+		StartRedirectRequest(message);
+		return true;
+	}
+
 	// if this is a fatal error - insert index into database so we won't try to download this index again
 	if(message["Fatal"]=="true")
 	{
@@ -126,7 +153,7 @@ const bool MessageListRequester::HandleGetFailed(FCPMessage &message)
 		st.Step();
 		st.Finalize();
 
-		m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"MessageListRequester::HandleGetFailed fatal error requesting "+message["Identifier"]);
+		m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"MessageListRequester::HandleGetFailed fatal error code="+message["Code"]+" requesting "+message["Identifier"]);
 	}
 
 	// remove this identityid from request list
@@ -139,7 +166,7 @@ void MessageListRequester::Initialize()
 {
 	m_fcpuniquename="MessageListRequester";
 	std::string tempval;
-	Option::instance()->Get("MaxMessageListRequests",tempval);
+	Option::Instance()->Get("MaxMessageListRequests",tempval);
 	StringFunctions::Convert(tempval,m_maxrequests);
 	if(m_maxrequests<1)
 	{
@@ -150,6 +177,17 @@ void MessageListRequester::Initialize()
 	{
 		m_log->WriteLog(LogFile::LOGLEVEL_WARNING,"Option MaxMessageListRequests is currently set at "+tempval+".  This value might be incorrectly configured.");
 	}
+
+	Option::Instance()->Get("LocalTrustOverridesPeerTrust",tempval);
+	if(tempval=="true")
+	{
+		m_localtrustoverrides=true;
+	}
+	else
+	{
+		m_localtrustoverrides=false;
+	}
+
 }
 
 void MessageListRequester::PopulateIDList()
@@ -159,8 +197,17 @@ void MessageListRequester::PopulateIDList()
 
 	date.SetToGMTime();
 
+	SQLite3DB::Statement st;
+
 	// select identities we want to query (we've seen them today) - sort by their trust level (descending) with secondary sort on how long ago we saw them (ascending)
-	SQLite3DB::Statement st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+date.Format("%Y-%m-%d")+"' AND LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust') ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;");
+	if(m_localtrustoverrides==false)
+	{
+		st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+date.Format("%Y-%m-%d")+"' AND (LocalMessageTrust IS NULL OR LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust')) AND (PeerMessageTrust IS NULL OR PeerMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerMessageTrust')) ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;");
+	}
+	else
+	{
+		st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+date.Format("%Y-%m-%d")+"' AND (LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust') OR (LocalMessageTrust IS NULL AND (PeerMessageTrust IS NULL OR PeerMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerMessageTrust')))) ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;");
+	}
 	st.Step();
 
 	m_ids.clear();
@@ -173,12 +220,50 @@ void MessageListRequester::PopulateIDList()
 	}
 }
 
+void MessageListRequester::StartRedirectRequest(FCPMessage &message)
+{
+	std::vector<std::string> parts;
+	std::string indexstr="";
+	std::string identityidstr="";
+	std::string datestr="";
+	FCPMessage newmessage;
+
+	// get the new edition #
+	StringFunctions::Split(message["RedirectURI"],"/",parts);
+	//edition # is 2nd to last part
+	if(parts.size()>2)
+	{
+		indexstr=parts[parts.size()-2];
+	}
+
+	// get identityid
+	parts.clear();
+	StringFunctions::Split(message["Identifier"],"|",parts);
+	if(parts.size()>1)
+	{
+		identityidstr=parts[1];
+	}
+	if(parts.size()>4)
+	{
+		datestr=parts[4];
+	}
+
+	newmessage.SetName("ClientGet");
+	newmessage["URI"]=StringFunctions::UriDecode(message["RedirectURI"]);
+	newmessage["Identifier"]=m_fcpuniquename+"|"+identityidstr+"|"+indexstr+"|_|"+datestr+"|"+newmessage["URI"];
+	newmessage["ReturnType"]="direct";
+	newmessage["MaxSize"]="1000000";
+
+	m_fcp->SendMessage(newmessage);
+
+}
+
 void MessageListRequester::StartRequest(const long &id)
 {
 	DateTime now;
 	FCPMessage message;
 	std::string publickey;
-	int index;
+	int index=0;
 	std::string indexstr;
 	std::string identityidstr;
 
@@ -203,6 +288,8 @@ void MessageListRequester::StartRequest(const long &id)
 			if(st2.ResultNull(0)==false)
 			{
 				st2.ResultInt(0,index);
+				// don't increment index here - the node will let us know if there is a new edition
+				// 2008-05-31 - well actually the node isn't reliably retreiving the latest edition for USKs, so we DO need to increment the index
 				index++;
 			}
 		}
@@ -212,10 +299,10 @@ void MessageListRequester::StartRequest(const long &id)
 		StringFunctions::Convert(id,identityidstr);
 
 		message.SetName("ClientGet");
-		message["URI"]=publickey+m_messagebase+"|"+now.Format("%Y-%m-%d")+"|MessageList|"+indexstr+".xml";
-		message["Identifier"]=m_fcpuniquename+"|"+identityidstr+"|"+indexstr+"|"+message["URI"];
+		message["URI"]="USK"+publickey.substr(3)+m_messagebase+"|"+now.Format("%Y.%m.%d")+"|MessageList/"+indexstr+"/MessageList.xml";
+		message["Identifier"]=m_fcpuniquename+"|"+identityidstr+"|"+indexstr+"|_|"+now.Format("%Y-%m-%d")+"|"+message["URI"];
 		message["ReturnType"]="direct";
-		message["MaxSize"]="1000000";			// 1 MB
+		message["MaxSize"]="1000000";
 
 		m_fcp->SendMessage(message);