{\r
\r
SQLite3DB::Statement st=m_db->Prepare("SELECT IdentityID FROM tblMessageRequests WHERE IdentityID=? AND Day=? AND RequestIndex=?;");\r
+ SQLite3DB::Statement spk=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey=?;");\r
SQLite3DB::Statement mst=m_db->Prepare("INSERT INTO tblMessageRequests(IdentityID,Day,RequestIndex,FromMessageList) VALUES(?,?,?,'true');");\r
for(long i=0; i<xml.MessageCount(); i++)\r
{\r
}\r
st.Reset();\r
}\r
- mst.Finalize();\r
- st.Finalize();\r
+\r
+ // insert external message indexes\r
+ for(long i=0; i<xml.ExternalMessageCount(); i++)\r
+ {\r
+ if(xml.GetExternalType(i)=="Keyed")\r
+ {\r
+ spk.Bind(0,xml.GetExternalIdentity(i));\r
+ spk.Step();\r
+ if(spk.RowReturned())\r
+ {\r
+ int thisidentityid=0;\r
+ spk.ResultInt(0,thisidentityid);\r
+ mst.Bind(0,thisidentityid);\r
+ mst.Bind(1,xml.GetExternalDate(i));\r
+ mst.Bind(2,xml.GetExternalIndex(i));\r
+ mst.Step();\r
+ mst.Reset();\r
+ }\r
+ spk.Reset();\r
+ }\r
+ }\r
\r
st=m_db->Prepare("INSERT INTO tblMessageListRequests(IdentityID,Day,RequestIndex,Found) VALUES(?,?,?,'true');");\r
st.Bind(0,identityid);\r
st.Step();\r
st.Finalize();\r
\r
- m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"MessageListRequester::HandleAllData parsed TrustList XML file : "+message["Identifier"]);\r
+ m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"MessageListRequester::HandleAllData parsed MessageList XML file : "+message["Identifier"]);\r
}\r
else\r
{\r
StringFunctions::Convert(idparts[1],identityid);\r
StringFunctions::Convert(idparts[2],index); \r
\r
+ // code 27 - permanent redirect\r
+ if(message["Code"]=="27")\r
+ {\r
+ StartRedirectRequest(message);\r
+ return true;\r
+ }\r
+\r
// if this is a fatal error - insert index into database so we won't try to download this index again\r
if(message["Fatal"]=="true")\r
{\r
st.Step();\r
st.Finalize();\r
\r
- m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"MessageListRequester::HandleGetFailed fatal error requesting "+message["Identifier"]);\r
+ m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"MessageListRequester::HandleGetFailed fatal error code="+message["Code"]+" requesting "+message["Identifier"]);\r
}\r
\r
// remove this identityid from request list\r
{\r
m_fcpuniquename="MessageListRequester";\r
std::string tempval;\r
- Option::instance()->Get("MaxMessageListRequests",tempval);\r
+ Option::Instance()->Get("MaxMessageListRequests",tempval);\r
StringFunctions::Convert(tempval,m_maxrequests);\r
if(m_maxrequests<1)\r
{\r
{\r
m_log->WriteLog(LogFile::LOGLEVEL_WARNING,"Option MaxMessageListRequests is currently set at "+tempval+". This value might be incorrectly configured.");\r
}\r
+\r
+ Option::Instance()->Get("LocalTrustOverridesPeerTrust",tempval);\r
+ if(tempval=="true")\r
+ {\r
+ m_localtrustoverrides=true;\r
+ }\r
+ else\r
+ {\r
+ m_localtrustoverrides=false;\r
+ }\r
+\r
}\r
\r
void MessageListRequester::PopulateIDList()\r
\r
date.SetToGMTime();\r
\r
+ SQLite3DB::Statement st;\r
+\r
// 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)\r
- 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;");\r
+ if(m_localtrustoverrides==false)\r
+ {\r
+ 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;");\r
+ }\r
+ else\r
+ {\r
+ 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;");\r
+ }\r
st.Step();\r
\r
m_ids.clear();\r
}\r
}\r
\r
+void MessageListRequester::StartRedirectRequest(FCPMessage &message)\r
+{\r
+ std::vector<std::string> parts;\r
+ std::string indexstr="";\r
+ std::string identityidstr="";\r
+ std::string datestr="";\r
+ FCPMessage newmessage;\r
+\r
+ // get the new edition #\r
+ StringFunctions::Split(message["RedirectURI"],"/",parts);\r
+ //edition # is 2nd to last part\r
+ if(parts.size()>2)\r
+ {\r
+ indexstr=parts[parts.size()-2];\r
+ }\r
+\r
+ // get identityid\r
+ parts.clear();\r
+ StringFunctions::Split(message["Identifier"],"|",parts);\r
+ if(parts.size()>1)\r
+ {\r
+ identityidstr=parts[1];\r
+ }\r
+ if(parts.size()>4)\r
+ {\r
+ datestr=parts[4];\r
+ }\r
+\r
+ newmessage.SetName("ClientGet");\r
+ newmessage["URI"]=StringFunctions::UriDecode(message["RedirectURI"]);\r
+ newmessage["Identifier"]=m_fcpuniquename+"|"+identityidstr+"|"+indexstr+"|_|"+datestr+"|"+newmessage["URI"];\r
+ newmessage["ReturnType"]="direct";\r
+ newmessage["MaxSize"]="1000000";\r
+\r
+ m_fcp->SendMessage(newmessage);\r
+\r
+}\r
+\r
void MessageListRequester::StartRequest(const long &id)\r
{\r
DateTime now;\r
FCPMessage message;\r
std::string publickey;\r
- int index;\r
+ int index=0;\r
std::string indexstr;\r
std::string identityidstr;\r
\r
if(st2.ResultNull(0)==false)\r
{\r
st2.ResultInt(0,index);\r
+ // don't increment index here - the node will let us know if there is a new edition\r
+ // 2008-05-31 - well actually the node isn't reliably retreiving the latest edition for USKs, so we DO need to increment the index\r
index++;\r
}\r
}\r
StringFunctions::Convert(id,identityidstr);\r
\r
message.SetName("ClientGet");\r
- message["URI"]=publickey+m_messagebase+"|"+now.Format("%Y-%m-%d")+"|MessageList|"+indexstr+".xml";\r
- message["Identifier"]=m_fcpuniquename+"|"+identityidstr+"|"+indexstr+"|"+message["URI"];\r
+ message["URI"]="USK"+publickey.substr(3)+m_messagebase+"|"+now.Format("%Y.%m.%d")+"|MessageList/"+indexstr+"/MessageList.xml";\r
+ message["Identifier"]=m_fcpuniquename+"|"+identityidstr+"|"+indexstr+"|_|"+now.Format("%Y-%m-%d")+"|"+message["URI"];\r
message["ReturnType"]="direct";\r
- message["MaxSize"]="1000000"; // 1 MB\r
+ message["MaxSize"]="1000000";\r
\r
m_fcp->SendMessage(message);\r
\r
projects / fms.git / blobdiff