From 3e1f7fa4e31b776461b93bf26d36683ae43241d9 Mon Sep 17 00:00:00 2001
From: csoler <retroshare.project@gmail.com>
Date: Wed, 10 Dec 2014 21:59:28 +0000
Subject: [PATCH] remove GXS ids with faulty signature. This should not happen
 anyway.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7745 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 libretroshare/src/services/p3idservice.cc | 51 ++++++++++++++++-------
 libretroshare/src/services/p3idservice.h  |  2 +-
 2 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/libretroshare/src/services/p3idservice.cc b/libretroshare/src/services/p3idservice.cc
index e95430b7a..9c0261ef8 100644
--- a/libretroshare/src/services/p3idservice.cc
+++ b/libretroshare/src/services/p3idservice.cc
@@ -2244,7 +2244,9 @@ RsGenExchange::ServiceCreate_Return p3IdService::service_CreateGroup(RsGxsGrpIte
 #define MAX_SIGN_SIZE 2048
 		uint8_t signarray[MAX_SIGN_SIZE]; 
 		unsigned int sign_size = MAX_SIGN_SIZE;
-		int result ;
+        int result ;
+
+        memset(signarray,0,MAX_SIGN_SIZE) ;	// just in case.
 
 		if (!mPgpUtils->askForDeferredSelfSignature((void *) hash.toByteArray(), hash.SIZE_IN_BYTES, signarray, &sign_size,result))
 		{
@@ -2496,16 +2498,17 @@ bool p3IdService::pgphash_process()
 	SSGxsIdGroup ssdata;
 	ssdata.load(pg.mMeta.mServiceString); // attempt load - okay if fails.
 
-	RsPgpId pgpId;
+    RsPgpId pgpId;
+    bool error = false ;
 
-	if (checkId(pg, pgpId))	
+    if (checkId(pg, pgpId,error))
 	{
 		/* found a match - update everything */
 		/* Consistency issues here - what if Reputation was recently updated? */
 
 #ifdef DEBUG_IDS
 		std::cerr << "p3IdService::pgphash_process() CheckId Success for Group: " << pg.mMeta.mGroupId;
-		std::cerr << " PgpId: " << pgpId.toStdString();
+        std::cerr << " PgpId: " << pgpId;
 		std::cerr << std::endl;
 #endif // DEBUG_IDS
 
@@ -2514,7 +2517,14 @@ bool p3IdService::pgphash_process()
 		ssdata.pgp.pgpId = pgpId;
 
 	}
-	else
+    else if(error)
+    {
+            std::cerr << "Identity has an invalid signature. It will be deleted." << std::endl;
+
+            uint32_t token ;
+            deleteIdentity(token,pg) ;
+    }
+    else
 	{
 #ifdef DEBUG_IDS
 		std::cerr << "p3IdService::pgphash_process() No Match for Group: " << pg.mMeta.mGroupId;
@@ -2525,16 +2535,19 @@ bool p3IdService::pgphash_process()
 		ssdata.pgp.checkAttempts++;
 	}
 
-	// update IdScore too.
-	ssdata.score.rep.updateIdScore(true, ssdata.pgp.idKnown);
-	ssdata.score.rep.update();
+    if(!error)
+    {
+        // update IdScore too.
+        ssdata.score.rep.updateIdScore(true, ssdata.pgp.idKnown);
+        ssdata.score.rep.update();
 
-	/* set new Group ServiceString */
-	uint32_t dummyToken = 0;
-	std::string serviceString = ssdata.save();
-	setGroupServiceString(dummyToken, pg.mMeta.mGroupId, serviceString);
+        /* set new Group ServiceString */
+        uint32_t dummyToken = 0;
+        std::string serviceString = ssdata.save();
+        setGroupServiceString(dummyToken, pg.mMeta.mGroupId, serviceString);
 
-	cache_update_if_cached(RsGxsId(pg.mMeta.mGroupId.toStdString()), serviceString);
+        cache_update_if_cached(RsGxsId(pg.mMeta.mGroupId), serviceString);
+    }
 
 	// Schedule Next Processing.
 	RsTickEvent::schedule_in(GXSID_EVENT_PGPHASH_PROC, PGPHASH_PROC_PERIOD);
@@ -2543,7 +2556,7 @@ bool p3IdService::pgphash_process()
 
 
 
-bool p3IdService::checkId(const RsGxsIdGroup &grp, RsPgpId &pgpId)
+bool p3IdService::checkId(const RsGxsIdGroup &grp, RsPgpId &pgpId,bool& error)
 {
 #ifdef DEBUG_IDS
 	std::cerr << "p3IdService::checkId() Starting Match Check for RsGxsId: ";
@@ -2551,6 +2564,8 @@ bool p3IdService::checkId(const RsGxsIdGroup &grp, RsPgpId &pgpId)
 	std::cerr << std::endl;
 #endif // DEBUG_IDS
 
+    error = false ;
+
 	/* some sanity checking... make sure hash is the right size */
 
 #ifdef DEBUG_IDS
@@ -2572,7 +2587,8 @@ bool p3IdService::checkId(const RsGxsIdGroup &grp, RsPgpId &pgpId)
 	for(mit = mPgpFingerprintMap.begin(); mit != mPgpFingerprintMap.end(); ++mit)
 	{
 		Sha1CheckSum hash;
-		calcPGPHash(RsGxsId(grp.mMeta.mGroupId.toStdString()), mit->second, hash);
+        calcPGPHash(RsGxsId(grp.mMeta.mGroupId), mit->second, hash);
+
 		if (ans == hash)
 		{
 #ifdef DEBUG_IDS
@@ -2614,7 +2630,10 @@ bool p3IdService::checkId(const RsGxsIdGroup &grp, RsPgpId &pgpId)
 				rs_sprintf_append(strout, "%02x", (uint32_t) ((uint8_t) grp.mPgpIdSign[i]));
 			}
 			std::cerr << strout;
-			std::cerr << std::endl;
+            std::cerr << std::endl;
+
+            error = true ;
+            return false ;
 		}
 	}
 
diff --git a/libretroshare/src/services/p3idservice.h b/libretroshare/src/services/p3idservice.h
index ad2bd0e1e..5cd5be26f 100644
--- a/libretroshare/src/services/p3idservice.h
+++ b/libretroshare/src/services/p3idservice.h
@@ -376,7 +376,7 @@ virtual void handle_event(uint32_t event_type, const std::string &elabel);
 	bool pgphash_handlerequest(uint32_t token);
 	bool pgphash_process();
 
-	bool checkId(const RsGxsIdGroup &grp, RsPgpId &pgp_id);
+    bool checkId(const RsGxsIdGroup &grp, RsPgpId &pgp_id, bool &error);
 	void getPgpIdList();
 
 	/* MUTEX PROTECTED DATA (mIdMtx - maybe should use a 2nd?) */