X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Fidentityrequester.cpp;h=af52a59d58675b5dcc3ae03ebca60f25692f18cd;hb=c0ebc7b53a977885ebc2d3a679c586ae20c0bc4a;hp=9dc58e17a94e0c0eac8c7b795cd62b55d52c1873;hpb=8adfd604a97d385869b0ce763b35d014d7aa2cca;p=fms.git diff --git a/src/freenet/identityrequester.cpp b/src/freenet/identityrequester.cpp index 9dc58e1..af52a59 100644 --- a/src/freenet/identityrequester.cpp +++ b/src/freenet/identityrequester.cpp @@ -2,7 +2,11 @@ #include "../../include/freenet/identityxml.h" #include "../../include/stringfunctions.h" #include "../../include/option.h" -#include "../../include/datetime.h" + +#include +#include +#include +#include #ifdef XMEM #include @@ -13,25 +17,14 @@ IdentityRequester::IdentityRequester() Initialize(); } -IdentityRequester::IdentityRequester(FCPv2 *fcp):IFCPConnected(fcp) +IdentityRequester::IdentityRequester(FCPv2 *fcp):IIndexRequester(fcp) { Initialize(); } -void IdentityRequester::FCPConnected() -{ - m_requesting.clear(); - PopulateIDList(); -} - -void IdentityRequester::FCPDisconnected() -{ - -} - const bool IdentityRequester::HandleAllData(FCPMessage &message) { - DateTime now; + Poco::DateTime now; SQLite3DB::Statement st; std::vector idparts; long datalength; @@ -39,8 +32,9 @@ const bool IdentityRequester::HandleAllData(FCPMessage &message) IdentityXML xml; long identityid; long index; + std::string name=""; - now.SetToGMTime(); + now=Poco::Timestamp(); StringFunctions::Split(message["Identifier"],"|",idparts); StringFunctions::Convert(message["DataLength"],datalength); StringFunctions::Convert(idparts[1],identityid); @@ -60,14 +54,22 @@ const bool IdentityRequester::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) { - st=m_db->Prepare("UPDATE tblIdentity SET Name=?, SingleUse=?, LastSeen=?, PublishTrustList=?, PublishBoardList=? WHERE IdentityID=?"); - st.Bind(0,xml.GetName()); + st=m_db->Prepare("UPDATE tblIdentity SET Name=?, SingleUse=?, LastSeen=?, PublishTrustList=?, PublishBoardList=?, FreesiteEdition=? WHERE IdentityID=?"); + name=xml.GetName(); + if(name.size()>40) + { + name.erase(40); + } + st.Bind(0,name); if(xml.GetSingleUse()==true) { st.Bind(1,"true"); @@ -76,7 +78,7 @@ const bool IdentityRequester::HandleAllData(FCPMessage &message) { st.Bind(1,"false"); } - st.Bind(2,now.Format("%Y-%m-%d %H:%M:%S")); + st.Bind(2,Poco::DateTimeFormatter::format(now,"%Y-%m-%d %H:%M:%S")); if(xml.GetPublishTrustList()==true) { st.Bind(3,"true"); @@ -93,7 +95,15 @@ const bool IdentityRequester::HandleAllData(FCPMessage &message) { st.Bind(4,"false"); } - st.Bind(5,identityid); + if(xml.GetFreesiteEdition()>=0) + { + st.Bind(5,xml.GetFreesiteEdition()); + } + else + { + st.Bind(5); + } + st.Bind(6,identityid); st.Step(); st.Finalize(); @@ -104,7 +114,7 @@ const bool IdentityRequester::HandleAllData(FCPMessage &message) st.Step(); st.Finalize(); - m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"IdentityRequester::HandleAllData parsed Identity XML file : "+message["Identifier"]); + m_log->debug("IdentityRequester::HandleAllData parsed Identity XML file : "+message["Identifier"]); } else { @@ -116,7 +126,7 @@ const bool IdentityRequester::HandleAllData(FCPMessage &message) st.Step(); st.Finalize(); - m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"IdentityRequester::HandleAllData error parsing Identity XML file : "+message["Identifier"]); + m_log->error("IdentityRequester::HandleAllData error parsing Identity XML file : "+message["Identifier"]); } // remove this identityid from request list @@ -128,13 +138,11 @@ const bool IdentityRequester::HandleAllData(FCPMessage &message) const bool IdentityRequester::HandleGetFailed(FCPMessage &message) { - DateTime now; SQLite3DB::Statement st; std::vector idparts; long identityid; long index; - now.SetToGMTime(); StringFunctions::Split(message["Identifier"],"|",idparts); StringFunctions::Convert(idparts[1],identityid); StringFunctions::Convert(idparts[2],index); @@ -149,7 +157,7 @@ const bool IdentityRequester::HandleGetFailed(FCPMessage &message) st.Step(); st.Finalize(); - m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"IdentityRequester::HandleGetFailed fatal error requesting "+message["Identifier"]); + m_log->error("IdentityRequester::HandleGetFailed fatal error requesting "+message["Identifier"]); } // remove this identityid from request list @@ -159,69 +167,30 @@ const bool IdentityRequester::HandleGetFailed(FCPMessage &message) } -const bool IdentityRequester::HandleMessage(FCPMessage &message) -{ - - if(message["Identifier"].find("IdentityRequester")==0) - { - if(message.GetName()=="DataFound") - { - return true; - } - - if(message.GetName()=="AllData") - { - return HandleAllData(message); - } - - if(message.GetName()=="GetFailed") - { - return HandleGetFailed(message); - } - - if(message.GetName()=="IdentifierCollision") - { - // remove one of the ids from the requesting list - long identityid=0; - std::vector idparts; - StringFunctions::Split(message["Identifier"],"|",idparts); - StringFunctions::Convert(idparts[1],identityid); - RemoveFromRequestList(identityid); - return true; - } - } - - return false; -} - void IdentityRequester::Initialize() { - std::string tempval=""; - Option::instance()->Get("MaxIdentityRequests",tempval); - StringFunctions::Convert(tempval,m_maxrequests); + m_fcpuniquename="IdentityRequester"; + Option::Instance()->GetInt("MaxIdentityRequests",m_maxrequests); if(m_maxrequests<1) { m_maxrequests=1; - m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"Option MaxIdentityRequests is currently set at "+tempval+". It must be 1 or greater."); + m_log->error("Option MaxIdentityRequests is currently set at less than 1. It must be 1 or greater."); } if(m_maxrequests>100) { - m_log->WriteLog(LogFile::LOGLEVEL_WARNING,"Option MaxIdentityRequests is currently set at "+tempval+". This value might be incorrectly configured."); + m_log->warning("Option MaxIdentityRequests is currently set at more than 100. This value might be incorrectly configured."); } - Option::instance()->Get("MessageBase",m_messagebase); - m_tempdate.SetToGMTime(); } void IdentityRequester::PopulateIDList() { - DateTime date; + Poco::DateTime date; int id; - date.SetToGMTime(); - date.Add(0,0,-1); + date.assign(date.year(),date.month(),date.day(),0,0,0); - // select identities we want to query (haven't seen in last hour) - 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 IS NULL OR LastSeen<='"+date.Format("%Y-%m-%d %H:%M:%S")+"') ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;"); + // select identities we want to query (haven't seen yet 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 IS NULL OR LastSeen<'"+Poco::DateTimeFormatter::format(date,"%Y-%m-%d %H:%M:%S")+"') ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;"); st.Step(); m_ids.clear(); @@ -234,65 +203,9 @@ void IdentityRequester::PopulateIDList() } } -void IdentityRequester::Process() -{ - // max is the smaller of the config value or the total number of identities we will request from - long max=m_maxrequests>m_ids.size() ? m_ids.size() : m_maxrequests; - - // try to keep up to max requests going - if(m_requesting.size()::iterator i=m_ids.begin(); - while(i!=m_ids.end() && (*i).second==true) - { - i++; - } - - if(i!=m_ids.end()) - { - StartRequest((*i).first); - } - else - { - // we requested from all ids in the list, repopulate the list - PopulateIDList(); - } - } - // special case - if there were 0 identities on the list when we started then we will never get a chance to repopulate the list - // this will recheck for ids every minute - DateTime now; - now.SetToGMTime(); - if(m_tempdate<(now-(1.0/1440.0))) - { - PopulateIDList(); - m_tempdate=now; - } - -} - -void IdentityRequester::RemoveFromRequestList(const long identityid) -{ - std::vector::iterator i=m_requesting.begin(); - while(i!=m_requesting.end() && (*i)!=identityid) - { - i++; - } - if(i!=m_requesting.end()) - { - m_requesting.erase(i); - } -} - -void IdentityRequester::RegisterWithThread(FreenetMasterThread *thread) -{ - thread->RegisterFCPConnected(this); - thread->RegisterFCPMessageHandler(this); - thread->RegisterPeriodicProcessor(this); -} - -void IdentityRequester::StartRequest(const long identityid) +void IdentityRequester::StartRequest(const long &identityid) { - DateTime now; + Poco::DateTime now; FCPMessage message; std::string publickey; int index; @@ -307,10 +220,10 @@ void IdentityRequester::StartRequest(const long identityid) { st.ResultText(0,publickey); - now.SetToGMTime(); + now=Poco::Timestamp(); SQLite3DB::Statement st2=m_db->Prepare("SELECT MAX(RequestIndex) FROM tblIdentityRequests WHERE Day=? AND IdentityID=?;"); - st2.Bind(0,now.Format("%Y-%m-%d")); + st2.Bind(0,Poco::DateTimeFormatter::format(now,"%Y-%m-%d")); st2.Bind(1,identityid); st2.Step(); @@ -329,8 +242,8 @@ void IdentityRequester::StartRequest(const long identityid) StringFunctions::Convert(identityid,identityidstr); message.SetName("ClientGet"); - message["URI"]=publickey+m_messagebase+"|"+now.Format("%Y-%m-%d")+"|Identity|"+indexstr+".xml"; - message["Identifier"]="IdentityRequester|"+identityidstr+"|"+indexstr+"|"+message["URI"]; + message["URI"]=publickey+m_messagebase+"|"+Poco::DateTimeFormatter::format(now,"%Y-%m-%d")+"|Identity|"+indexstr+".xml"; + message["Identifier"]=m_fcpuniquename+"|"+identityidstr+"|"+indexstr+"|"+message["URI"]; message["ReturnType"]="direct"; message["MaxSize"]="10000"; // 10 KB