X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Ftrustlistinserter.cpp;h=d3167905a28999a0a7897bf6afd7947c19b09b2b;hb=6836fbb5db8464f56e682989996b2210b14231d0;hp=bd8f87c9a89cd4c26cd2979fc06ec16a55d01e74;hpb=6b896a9e1dc143bba86795be1e9336549db9b85f;p=fms.git

diff --git a/src/freenet/trustlistinserter.cpp b/src/freenet/trustlistinserter.cpp
index bd8f87c..d316790 100644
--- a/src/freenet/trustlistinserter.cpp
+++ b/src/freenet/trustlistinserter.cpp
@@ -21,7 +21,13 @@ void TrustListInserter::CheckForNeededInsert()
 {
 	DateTime date;
 	date.SetToGMTime();
-	date.Add(0,0,-1);
+	int currentday=date.GetDay();
+	date.Add(0,0,-6);
+	// insert trust lists every 6 hours - if 6 hours ago was different day then set to midnight of current day to insert list today ASAP
+	if(currentday!=date.GetDay())
+	{
+		date.Set(date.GetYear(),date.GetMonth(),currentday);
+	}
 	SQLite3DB::Recordset rs=m_db->Query("SELECT LocalIdentityID, PrivateKey FROM tblLocalIdentity WHERE PrivateKey IS NOT NULL AND PrivateKey <> '' AND PublishTrustList='true' AND InsertingTrustList='false' AND (LastInsertedTrustList<='"+date.Format("%Y-%m-%d %H:%M:%S")+"' OR LastInsertedTrustList IS NULL);");
 
 	if(rs.Empty()==false)
@@ -66,23 +72,30 @@ const bool TrustListInserter::HandleMessage(FCPMessage &message)
 
 		if(message.GetName()=="PutSuccessful")
 		{
-			m_db->Execute("UPDATE tblLocalIdentity SET InsertingTrustList='false', LastInsertedTrustList='"+now.Format("%Y-%m-%d %H:%M:%S")+"' WHERE LocalIdentityID="+idparts[1]+";");
-			m_db->Execute("INSERT INTO tblTrustListInserts(LocalIdentityID,Day,InsertIndex) VALUES("+idparts[1]+",'"+idparts[4]+"',"+idparts[2]+");");
-			m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"TrustListInserter::HandleMessage inserted TrustList xml");
+			// non USK
+			if(idparts[0]=="TrustListInserter")
+			{
+				m_db->Execute("UPDATE tblLocalIdentity SET InsertingTrustList='false', LastInsertedTrustList='"+now.Format("%Y-%m-%d %H:%M:%S")+"' WHERE LocalIdentityID="+idparts[1]+";");
+				m_db->Execute("INSERT INTO tblTrustListInserts(LocalIdentityID,Day,InsertIndex) VALUES("+idparts[1]+",'"+idparts[4]+"',"+idparts[2]+");");
+				m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"TrustListInserter::HandleMessage inserted TrustList xml");
+			}
 			return true;
 		}
 
-		if(message.GetName()=="PutFailed")
+		if(message.GetName()=="PutFailed" && idparts[0]=="TrustListInserter")
 		{
-			m_db->Execute("UPDATE tblLocalIdentity SET InsertingTrustList='false' WHERE LocalIdentityID="+idparts[1]+";");
-			m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"TrustListInserter::HandleMessage failure inserting TrustList xml.  Code="+message["Code"]+" Description="+message["CodeDescription"]);
-			
-			// if code 9 (collision), then insert index into inserted table
-			if(message["Code"]=="9")
+			// non USK
+			if(idparts[0]=="TrustListInserter")
 			{
-				m_db->Execute("INSERT INTO tblTrustListInserts(LocalIdentityID,Day,InsertIndex) VALUES("+idparts[1]+",'"+idparts[4]+"',"+idparts[2]+");");
-			}
+				m_db->Execute("UPDATE tblLocalIdentity SET InsertingTrustList='false' WHERE LocalIdentityID="+idparts[1]+";");
+				m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"TrustListInserter::HandleMessage failure inserting TrustList xml.  Code="+message["Code"]+" Description="+message["CodeDescription"]);
 			
+				// if code 9 (collision), then insert index into inserted table
+				if(message["Code"]=="9")
+				{
+					m_db->Execute("INSERT INTO tblTrustListInserts(LocalIdentityID,Day,InsertIndex) VALUES("+idparts[1]+",'"+idparts[4]+"',"+idparts[2]+");");
+				}
+			}
 			return true;
 		}
 
@@ -93,7 +106,7 @@ const bool TrustListInserter::HandleMessage(FCPMessage &message)
 
 void TrustListInserter::Initialize()
 {
-	Option::instance()->Get("MessageBase",m_messagebase);
+	Option::Instance()->Get("MessageBase",m_messagebase);
 	m_lastchecked.SetToGMTime();
 }
 
@@ -126,22 +139,49 @@ void TrustListInserter::StartInsert(const long localidentityid, const std::strin
 	std::string publickey;
 	int messagetrust;
 	int trustlisttrust;
-	DateTime now;
+	DateTime now,date;
 	int index;
 	std::string indexstr;
 	std::string localidentityidstr;
+	std::string messagetrustcomment="";
+	std::string trustlisttrustcomment="";
 
 	now.SetToGMTime();
-	
-	// build the xml file
-	SQLite3DB::Statement st=m_db->Prepare("SELECT PublicKey, LocalMessageTrust, LocalTrustListTrust FROM tblIdentity WHERE PublicKey IS NOT NULL AND PublicKey<>'';");
+	date.SetToGMTime();
+
+	// insert all identities not in trust list already
+	m_db->Execute("INSERT INTO tblIdentityTrust(LocalIdentityID,IdentityID) SELECT LocalIdentityID,IdentityID FROM tblLocalIdentity,tblIdentity WHERE LocalIdentityID || '_' || IdentityID NOT IN (SELECT LocalIdentityID || '_' || IdentityID FROM tblIdentityTrust);");
+
+	// build the xml file - we only want to add identities that we recently saw, otherwise we could be inserting a ton of identities
+	date.Add(0,0,0,-20);	// identities seen in last 20 days
+	//SQLite3DB::Statement st=m_db->Prepare("SELECT PublicKey, LocalMessageTrust, LocalTrustListTrust, MessageTrustComment, TrustListTrustComment FROM tblIdentity WHERE PublicKey IS NOT NULL AND PublicKey<>'' AND LastSeen>=?;");
+	// we want to order by public key so we can't do identity correllation based on the sequence of identities in the list.
+	SQLite3DB::Statement st=m_db->Prepare("SELECT PublicKey, tblIdentityTrust.LocalMessageTrust, tblIdentityTrust.LocalTrustListTrust, tblIdentityTrust.MessageTrustComment, tblIdentityTrust.TrustListTrustComment FROM tblIdentity INNER JOIN tblIdentityTrust ON tblIdentity.IdentityID=tblIdentityTrust.IdentityID WHERE PublicKey IS NOT NULL AND PublicKey<>'' AND LastSeen>=? AND tblIdentityTrust.LocalIdentityID=? ORDER BY PublicKey;");
+	st.Bind(0,date.Format("%Y-%m-%d"));
+	st.Bind(1,localidentityid);
 	st.Step();
 	while(st.RowReturned())
 	{
 		st.ResultText(0,publickey);
-		st.ResultInt(1,messagetrust);
-		st.ResultInt(2,trustlisttrust);
-		xml.AddTrust(publickey,messagetrust,trustlisttrust);
+		if(st.ResultNull(1)==false)
+		{
+			st.ResultInt(1,messagetrust);
+		}
+		else
+		{
+			messagetrust=-1;
+		}
+		if(st.ResultNull(2)==false)
+		{
+			st.ResultInt(2,trustlisttrust);
+		}
+		else
+		{
+			trustlisttrust=-1;
+		}
+		st.ResultText(3,messagetrustcomment);
+		st.ResultText(4,trustlisttrustcomment);
+		xml.AddTrust(publickey,messagetrust,trustlisttrust,messagetrustcomment,trustlisttrustcomment);
 		st.Step();
 	}
 
@@ -172,6 +212,18 @@ void TrustListInserter::StartInsert(const long localidentityid, const std::strin
 	m_fcp->SendMessage(message);
 	m_fcp->SendRaw(data.c_str(),data.size());
 
+	// insert to USK
+	message.Reset();
+	message.SetName("ClientPutComplexDir");
+	message["URI"]="USK"+privatekey.substr(3)+m_messagebase+"|"+now.Format("%Y.%m.%d")+"|TrustList/0/";
+	message["Identifier"]="TrustListInserterUSK|"+message["URI"];
+	message["DefaultName"]="TrustList.xml";
+	message["Files.0.Name"]="TrustList.xml";
+	message["Files.0.UplaodFrom"]="direct";
+	message["Files.0.DataLength"]=datasizestr;
+	m_fcp->SendMessage(message);
+	m_fcp->SendRaw(data.c_str(),data.size());
+
 	m_db->Execute("UPDATE tblLocalIdentity SET InsertingTrustList='true' WHERE LocalIdentityID="+localidentityidstr+";");
 
 }