X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=src%2Ffreenet%2Fintroductionpuzzlerequester.cpp;h=70b3102fe01099469110c86b4880f5794cf0872e;hp=39ffb364b9d68935898a4905f4bea350a1be4781;hb=9b22dd53fe62e312c1647310b7ec43aa127090af;hpb=18b45335ba24f3b6b6d4f4acfe8c5a5ae845ce00

diff --git a/src/freenet/introductionpuzzlerequester.cpp b/src/freenet/introductionpuzzlerequester.cpp
index 39ffb36..70b3102 100644
--- a/src/freenet/introductionpuzzlerequester.cpp
+++ b/src/freenet/introductionpuzzlerequester.cpp
@@ -2,6 +2,8 @@
 #include "../../include/freenet/introductionpuzzlexml.h"
 #include "../../include/option.h"
 #include "../../include/stringfunctions.h"
+#include "../../include/bitmapvalidator.h"
+#include "../../include/base64.h"
 
 #ifdef XMEM
 	#include <xmem.h>
@@ -104,6 +106,16 @@ const bool IntroductionPuzzleRequester::HandleAllData(FCPMessage &message)
 			validmessage=false;
 		}
 
+		// we can only validate bitmaps for now
+		BitmapValidator val;
+		std::vector<unsigned char> puzzledata;
+		Base64::Decode(xml.GetPuzzleData(),puzzledata);
+		if(xml.GetMimeType()!="image/bmp" || val.Validate(puzzledata)==false)
+		{
+			m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"IntroductionPuzzleRequester::HandleAllData received bad mime type and/or data for "+message["Identifier"]);
+			validmessage=false;
+		}
+
 		st=m_db->Prepare("INSERT INTO tblIntroductionPuzzleRequests(IdentityID,Day,RequestIndex,Found,UUID,Type,MimeType,PuzzleData) VALUES(?,?,?,?,?,?,?,?);");
 		st.Bind(0,identityid);
 		st.Bind(1,idparts[4]);