Fix for msg validation (error in key generation, public keys were not

created)
, synchronisation was not broken incidentally.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_sync-validate-fix@6071 b45a01b8-16f6-495d-af2f-9b41ad6348cc

libretroshare/src/gxs/gxssecurity.cc

@@ -130,6 +130,10 @@ bool GxsSecurity::validateNxsMsg(RsNxsMsg& msg, RsTlvKeySignature& sign, RsTlvSe
             RsTlvKeySignatureSet signSet = msgMeta.signSet;
             msgMeta.signSet.TlvClear();
 
+            RsGxsMessageId msgId = msgMeta.mMsgId, origMsgId = msgMeta.mOrigMsgId;
+            msgMeta.mOrigMsgId.clear();
+            msgMeta.mMsgId.clear();
+
             uint32_t metaDataLen = msgMeta.serial_size();
             uint32_t allMsgDataLen = metaDataLen + msg.msg.bin_len;
             char* metaData = new char[metaDataLen];
@@ -156,6 +160,8 @@ bool GxsSecurity::validateNxsMsg(RsNxsMsg& msg, RsTlvKeySignature& sign, RsTlvSe
             EVP_PKEY_free(signKey);
             EVP_MD_CTX_destroy(mdctx);
 
+            msgMeta.mOrigMsgId = origMsgId;
+            msgMeta.mMsgId = msgId;
 
             if (signOk == 1)
             {

libretroshare/src/gxs/rsdataservice.cc

@@ -969,6 +969,7 @@ int RsDataService::resetDataStore()
         std::string msgFile = file + "-msgs";
         remove(file.c_str()); // remove group file
         remove(msgFile.c_str()); // and remove messages file
+        delete mit->second;
     }
     {
         RsStackMutex stack(mDbMutex);

libretroshare/src/gxs/rsgenexchange.cc

@@ -174,6 +174,8 @@ void RsGenExchange::generateGroupKeys(RsTlvSecurityKeySet& keySet, bool genPubli
     GxsSecurity::setRSAPublicKey(adminKey, rsa_admin_pub);
     GxsSecurity::setRSAPrivateKey(privAdminKey, rsa_admin);
 
+    adminKey.keyId = adminKey.keyId + "_public";
+
     adminKey.startTS = time(NULL);
     adminKey.endTS = 0; /* no end */
 
@@ -204,6 +206,7 @@ void RsGenExchange::generateGroupKeys(RsTlvSecurityKeySet& keySet, bool genPubli
         GxsSecurity::setRSAPrivateKey(privPubKey, rsa_publish);
 
         pubKey.startTS = adminKey.startTS;
+        pubKey.keyId = pubKey.keyId + "_public";
         pubKey.endTS = pubKey.startTS + 60 * 60 * 24 * 365 * 5; /* approx 5 years */
 
         privPubKey.startTS = adminKey.startTS;
@@ -219,7 +222,6 @@ void RsGenExchange::generateGroupKeys(RsTlvSecurityKeySet& keySet, bool genPubli
         RSA_free(rsa_publish);
         RSA_free(rsa_publish_pub);
     }
-
 }
 
 bool RsGenExchange::createGroup(RsNxsGrp *grp, RsTlvSecurityKeySet& keySet)
@@ -241,14 +243,14 @@ bool RsGenExchange::createGroup(RsNxsGrp *grp, RsTlvSecurityKeySet& keySet)
         RsTlvSecurityKey& key = mit->second;
 
         // add public admin key
-        if(key.keyFlags & (RSTLV_KEY_DISTRIB_ADMIN | RSTLV_KEY_TYPE_PUBLIC_ONLY))
+        if((key.keyFlags & RSTLV_KEY_DISTRIB_ADMIN) && (key.keyFlags & RSTLV_KEY_TYPE_PUBLIC_ONLY))
             meta->keys.keys.insert(std::make_pair(key.keyId, key));
 
         // add public publish key
-        if(key.keyFlags & (RSTLV_KEY_DISTRIB_PUBLIC | RSTLV_KEY_TYPE_PUBLIC_ONLY))
+        if((key.keyFlags & RSTLV_KEY_DISTRIB_PUBLIC) && (key.keyFlags & RSTLV_KEY_TYPE_PUBLIC_ONLY))
             meta->keys.keys.insert(std::make_pair(key.keyId, key));
 
-        if(key.keyFlags & (RSTLV_KEY_DISTRIB_ADMIN | RSTLV_KEY_TYPE_FULL))
+        if((key.keyFlags & RSTLV_KEY_DISTRIB_ADMIN) && (key.keyFlags & RSTLV_KEY_TYPE_FULL))
         {
             privAdminKey = key;
             privKeyFound = true;
@@ -606,10 +608,25 @@ bool RsGenExchange::validateMsg(RsNxsMsg *msg, const uint32_t& grpFlag, RsTlvSec
     {
         RsTlvKeySignature sign = metaData.signSet.keySignSet[GXS_SERV::FLAG_AUTHEN_PUBLISH];
 
-        if(grpKeySet.keys.find(sign.keyId) != grpKeySet.keys.end())
+        std::map<std::string, RsTlvSecurityKey>& keys = grpKeySet.keys;
+        std::map<std::string, RsTlvSecurityKey>::iterator mit = keys.begin();
+
+        std::string keyId;
+        for(; mit != keys.end() ; mit++)
         {
-            RsTlvSecurityKey publishKey = grpKeySet.keys[sign.keyId];
+            RsTlvSecurityKey& key = mit->second;
-            valid &= GxsSecurity::validateNxsMsg(*msg, sign, publishKey);
+
+            if((key.keyFlags & RSTLV_KEY_DISTRIB_PUBLIC) &&
+               (key.keyFlags & RSTLV_KEY_TYPE_PUBLIC_ONLY))
+            {
+                keyId = key.keyId;
+            }
+        }
+
+        if(!keyId.empty())
+        {
+            RsTlvSecurityKey& key = keys[keyId];
+            valid &= GxsSecurity::validateNxsMsg(*msg, sign, key);
         }
         else
         {
@@ -809,13 +826,13 @@ bool RsGenExchange::getGroupData(const uint32_t &token, std::vector<RsGxsGrpItem
 				RsGxsGrpItem* gItem = dynamic_cast<RsGxsGrpItem*>(item);
 				gItem->meta = *((*lit)->metaData);
                                 grpItem.push_back(gItem);
-				delete *lit;
 			}
 			else
 			{
 				std::cerr << "RsGenExchange::getGroupData() ERROR deserialising item";
 				std::cerr << std::endl;
 			}
+                        delete *lit;
 		}
 	}
     return ok;
@@ -935,6 +952,8 @@ bool RsGenExchange::setAuthenPolicyFlag(const uint8_t &msgFlag, uint32_t& authen
 
 void RsGenExchange::notifyNewGroups(std::vector<RsNxsGrp *> &groups)
 {
+    RsStackMutex stack(mGenMtx);
+
     std::vector<RsNxsGrp*>::iterator vit = groups.begin();
 
     // store these for tick() to pick them up
@@ -945,6 +964,8 @@ void RsGenExchange::notifyNewGroups(std::vector<RsNxsGrp *> &groups)
 
 void RsGenExchange::notifyNewMessages(std::vector<RsNxsMsg *>& messages)
 {
+    RsStackMutex stack(mGenMtx);
+
     std::vector<RsNxsMsg*>::iterator vit = messages.begin();
 
     // store these for tick() to pick them up
@@ -1584,9 +1605,9 @@ void RsGenExchange::processRecvdMessages()
             if(mit != grpMetas.end()){
                 RsGxsGrpMetaData* grpMeta = mit->second;
                 ok = true;
-//                msg->metaData = meta;
+                 msg->metaData = meta;
-  //             ok &= validateMsg(msg, grpMeta->mGroupFlags, grpMeta->keys);
+                 ok &= validateMsg(msg, grpMeta->mGroupFlags, grpMeta->keys);
-    //           msg->metaData = NULL;
+               msg->metaData = NULL;
             }
             else
                 ok = false;

libretroshare/src/gxs/rsgenexchange.h

@@ -254,7 +254,8 @@ protected:
                                     &msg->msg.bin_len);
                     GxsMsgType* mItem = dynamic_cast<GxsMsgType*>(item);
 
-                    if(mItem == NULL){
+                    if(mItem == NULL)
+                    {
                         delete msg;
                         continue;
                     }

libretroshare/src/gxs/rsgxsdata.cc

@@ -142,9 +142,17 @@ bool RsGxsGrpMetaData::deserialise(void *data, uint32_t &pktsize)
 
     return ok;
 }
+int RsGxsMsgMetaData::refcount = 0;
 
 RsGxsMsgMetaData::RsGxsMsgMetaData(){
 
+	//std::cout << "\nrefcount++ : " << ++refcount << std::endl;
+	return;
+}
+
+RsGxsMsgMetaData::~RsGxsMsgMetaData(){
+	//std::cout << "\nrefcount-- : " << --refcount << std::endl;
+	return;
 }
 
 uint32_t RsGxsMsgMetaData::serial_size()

libretroshare/src/gxs/rsgxsdata.h

@@ -87,7 +87,8 @@ class RsGxsMsgMetaData
 {
 public:
 
-    RsGxsMsgMetaData();
+    explicit RsGxsMsgMetaData();
+    ~RsGxsMsgMetaData();
     bool deserialise(void *data, uint32_t *size);
     bool serialise(void* data, uint32_t *size);
     uint32_t serial_size();
@@ -96,7 +97,7 @@ public:
 
     RsGxsGroupId mGroupId;
     RsGxsMessageId mMsgId;
-
+    static int refcount;
     RsGxsMessageId mThreadId;
     RsGxsMessageId mParentId;
     RsGxsMessageId mOrigMsgId;

libretroshare/src/gxs/rsgxsifaceimpl.cc

@@ -53,11 +53,18 @@ void RsGxsIfaceImpl::groupsChanged(std::list<RsGxsGroupId> &grpIds)
 }
 
 bool RsGxsIfaceImpl::updated()
+{
+	bool changed = false;
 	{
 		RsStackMutex stack(mGxsIfaceMutex);
 
-    bool changed =  (!mGroupChange.empty() || !mMsgChange.empty());
+		changed =  (!mGroupChange.empty() || !mMsgChange.empty());
+	}
 
+//    std::map<RsGxsGroupId, std::vector<RsGxsMessageId> > msgs;
+//    msgsChanged(msgs);
+//    std::list<RsGxsGroupId> grpIds;
+//    groupsChanged(grpIds);
     return changed;
 }
 

libretroshare/src/gxs/rsgxsnetservice.cc

@@ -186,7 +186,8 @@ void RsGxsNetService::recvNxsItemQueue(){
 }
 
 
-bool RsGxsNetService::handleTransaction(RsNxsItem* item){
+bool RsGxsNetService::handleTransaction(RsNxsItem* item)
+{
 
 	/*!
 	 * This attempts to handle a transaction
@@ -201,9 +202,9 @@ bool RsGxsNetService::handleTransaction(RsNxsItem* item){
 	RsNxsTransac* transItem = dynamic_cast<RsNxsTransac*>(item);
 
 	// if this is a RsNxsTransac item process
-	if(transItem){
+	if(transItem)
 		return locked_processTransac(transItem);
-	}
+
 
 	// then this must be transaction content to be consumed
 	// first check peer exist for transaction
@@ -221,7 +222,8 @@ bool RsGxsNetService::handleTransaction(RsNxsItem* item){
 
 		transExists = transMap.find(transN) != transMap.end();
 
-		if(transExists){
+		if(transExists)
+		{
 
 #ifdef NXS_NET_DEBUG
 			std::cerr << "handleTransaction() " << std::endl;
@@ -231,14 +233,13 @@ bool RsGxsNetService::handleTransaction(RsNxsItem* item){
 
 			tr = transMap[transN];
 			tr->mItems.push_back(item);
-		}
-
-	}else{
-		return false;
-	}
 
 			return true;
 		}
+	}
+
+	return false;
+}
 
 bool RsGxsNetService::locked_processTransac(RsNxsTransac* item)
 {
@@ -368,8 +369,8 @@ void RsGxsNetService::run(){
 
 bool RsGxsNetService::locked_checkTransacTimedOut(NxsTransaction* tr)
 {
-   return tr->mTimeOut < ((uint32_t) time(NULL));
+   //return tr->mTimeOut < ((uint32_t) time(NULL));
-    // return false;
+     return false;
 }
 
 void RsGxsNetService::processTransactions(){

libretroshare/src/gxs/rsgxsrequesttypes.h

@@ -58,6 +58,7 @@ class GroupIdReq : public GxsRequest
 {
 
 public:
+
 	std::list<std::string> mGroupIds;
 	std::list<std::string> mGroupIdResult;
 };