X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Fintroductionpuzzleinserter.cpp;h=defa0cb392ba56ad0038a27ac432601fbe40f639;hb=c0ebc7b53a977885ebc2d3a679c586ae20c0bc4a;hp=1fa13c0f88e6e410e601e2d6e14f81df6dba3e90;hpb=07319f767b4c4f0e06e9957f217d5107b196617b;p=fms.git

diff --git a/src/freenet/introductionpuzzleinserter.cpp b/src/freenet/introductionpuzzleinserter.cpp
index 1fa13c0..defa0cb 100644
--- a/src/freenet/introductionpuzzleinserter.cpp
+++ b/src/freenet/introductionpuzzleinserter.cpp
@@ -3,6 +3,10 @@
 #include "../../include/stringfunctions.h"
 #include "../../include/option.h"
 #include "../../include/freenet/captcha/simplecaptcha.h"
+#ifdef ALTERNATE_CAPTCHA
+#include "../../include/freenet/captcha/alternatecaptcha1.h"
+#include "../../include/freenet/captcha/alternatecaptcha2.h"
+#endif
 #include "../../include/base64.h"
 
 #include <Poco/DateTimeFormatter.h>
@@ -33,8 +37,13 @@ void IntroductionPuzzleInserter::CheckForNeededInsert()
 		
 		while(!rs.AtEnd())
 		{
-			std::string localidentityidstr;
+			int localidentityid=0;
+			std::string localidentityidstr="";
 			Poco::DateTime now;
+			float minutesbetweeninserts=0;
+			minutesbetweeninserts=1440.0/(float)m_maxpuzzleinserts;
+			Poco::DateTime lastinsert=now;
+			lastinsert-=Poco::Timespan(0,0,minutesbetweeninserts,0,0);
 
 			if(rs.GetField(0))
 			{
@@ -47,7 +56,15 @@ void IntroductionPuzzleInserter::CheckForNeededInsert()
 			// identity doesn't have any non-solved puzzles for today - start a new insert
 			if(rs2.Empty()==true)
 			{
-				StartInsert(rs.GetInt(0));
+				// make sure we are on the next day or the appropriate amount of time has elapsed since the last insert
+				if(m_lastinserted.find(rs.GetInt(0))==m_lastinserted.end() || m_lastinserted[rs.GetInt(0)]<=lastinsert || m_lastinserted[rs.GetInt(0)].day()!=now.day())
+				{
+					m_lastinserted[rs.GetInt(0)]=now;
+				}
+				else
+				{
+					m_log->trace("IntroductionPuzzleInserter::CheckForNeededInsert waiting to insert puzzle for "+localidentityidstr);
+				}
 			}
 
 			rs.Next();
@@ -57,13 +74,26 @@ void IntroductionPuzzleInserter::CheckForNeededInsert()
 
 void IntroductionPuzzleInserter::GenerateCaptcha(std::string &encodeddata, std::string &solution)
 {
-	SimpleCaptcha captcha;
+	ICaptcha *cap=0;
+#ifdef ALTERNATE_CAPTCHA
+	if(rand()%2==0)
+	{
+		cap=new AlternateCaptcha1();
+	}
+	else
+	{
+		cap=new AlternateCaptcha2();
+	}
+	m_log->trace("IntroductionPuzzleInserter::GenerateCaptcha using alternate captcha generator");
+#else
+	cap=new SimpleCaptcha();
+#endif
 	std::vector<unsigned char> puzzle;
 	std::vector<unsigned char> puzzlesolution;
 
-	captcha.Generate();
-	captcha.GetPuzzle(puzzle);
-	captcha.GetSolution(puzzlesolution);
+	cap->Generate();
+	cap->GetPuzzle(puzzle);
+	cap->GetSolution(puzzlesolution);
 
 	encodeddata.clear();
 	solution.clear();
@@ -71,6 +101,8 @@ void IntroductionPuzzleInserter::GenerateCaptcha(std::string &encodeddata, std::
 	Base64::Encode(puzzle,encodeddata);
 	solution.insert(solution.begin(),puzzlesolution.begin(),puzzlesolution.end());
 
+	delete cap;
+
 }
 
 const bool IntroductionPuzzleInserter::HandlePutFailed(FCPMessage &message)
@@ -139,23 +171,24 @@ const bool IntroductionPuzzleInserter::HandlePutSuccessful(FCPMessage &message)
 void IntroductionPuzzleInserter::Initialize()
 {
 	m_fcpuniquename="IntroductionPuzzleInserter";
+	m_maxpuzzleinserts=50;
 }
 
 const bool IntroductionPuzzleInserter::StartInsert(const long &localidentityid)
 {
 	Poco::DateTime now;
-	std::string idstring;
+	std::string idstring="";
 	long index=0;
-	std::string indexstr;
+	std::string indexstr="";
 	Poco::UUIDGenerator uuidgen;
 	Poco::UUID uuid;
-	std::string messagebase;
+	std::string messagebase="";
 	IntroductionPuzzleXML xml;
-	std::string encodedpuzzle;
-	std::string solutionstring;
+	std::string encodedpuzzle="";
+	std::string solutionstring="";
 	FCPMessage message;
-	std::string xmldata;
-	std::string xmldatasizestr;
+	std::string xmldata="";
+	std::string xmldatasizestr="";
 	std::string privatekey="";
 	std::string publickey="";
 	std::string keypart="";
@@ -173,7 +206,7 @@ const bool IntroductionPuzzleInserter::StartInsert(const long &localidentityid)
 	}
 	StringFunctions::Convert(index,indexstr);
 
-	if(index<50)
+	if(index<m_maxpuzzleinserts)
 	{
 		SQLite3DB::Recordset rs2=m_db->Query("SELECT PrivateKey,PublicKey FROM tblLocalIdentity WHERE LocalIdentityID="+idstring+";");
 		if(rs2.Empty()==false && rs2.GetField(0)!=NULL)
@@ -193,6 +226,11 @@ const bool IntroductionPuzzleInserter::StartInsert(const long &localidentityid)
 		Option::Instance()->Get("MessageBase",messagebase);
 
 		GenerateCaptcha(encodedpuzzle,solutionstring);
+		if(encodedpuzzle.size()==0)
+		{
+			m_log->fatal("IntroductionPuzzleInserter::StartInsert could not create introduction puzzle");
+			return false;
+		}
 
 		try
 		{
@@ -241,7 +279,7 @@ const bool IntroductionPuzzleInserter::StartInsert(const long &localidentityid)
 	}
 	else
 	{
-		m_log->warning("IntroductionPuzzleInserter::StartInsert already inserted 50 puzzles for "+idstring);
+		m_log->warning("IntroductionPuzzleInserter::StartInsert already inserted max puzzles for "+idstring);
 	}
 
 	return true;