Merge branch 'master' into extra_locators

libretroshare/src/gxs/rsdataservice.cc

@@ -39,6 +39,7 @@
 #endif
 
 #include "rsdataservice.h"
+#include "retroshare/rsgxsflags.h"
 #include "util/rsstring.h"
 
 #define MSG_TABLE_NAME std::string("MESSAGES")
@@ -572,6 +573,38 @@ RsGxsGrpMetaData* RsDataService::locked_getGrpMeta(RetroCursor &c, int colOffset
     c.getString(mColGrpMeta_ParentGrpId, tempId);
     grpMeta->mParentGrpId = RsGxsGroupId(tempId);
 
+	// make sure that flags and keys are actually consistent
+
+	bool have_private_admin_key = false ;
+	bool have_private_publish_key = false ;
+
+	for(auto mit = grpMeta->keys.private_keys.begin(); mit != grpMeta->keys.private_keys.end();++mit)
+	{
+		if(mit->second.keyFlags == (RSTLV_KEY_DISTRIB_PUBLISH | RSTLV_KEY_TYPE_FULL)) have_private_publish_key = true ;
+		if(mit->second.keyFlags == (RSTLV_KEY_DISTRIB_ADMIN   | RSTLV_KEY_TYPE_FULL)) have_private_admin_key = true ;
+	}
+
+	if(have_private_admin_key && !(grpMeta->mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_ADMIN))
+	{
+		std::cerr << "(WW) inconsistency in group " << grpMeta->mGroupId << ": group does not have flag ADMIN but an admin key was found. Updating the flags." << std::endl;
+		grpMeta->mSubscribeFlags |= GXS_SERV::GROUP_SUBSCRIBE_ADMIN;
+	}
+	if(!have_private_admin_key && (grpMeta->mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_ADMIN))
+	{
+		std::cerr << "(WW) inconsistency in group " << grpMeta->mGroupId << ": group has flag ADMIN but no admin key found. Updating the flags." << std::endl;
+		grpMeta->mSubscribeFlags &= ~GXS_SERV::GROUP_SUBSCRIBE_ADMIN;
+	}
+	if(have_private_publish_key && !(grpMeta->mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_PUBLISH))
+	{
+		std::cerr << "(WW) inconsistency in group " << grpMeta->mGroupId << ": group does not have flag PUBLISH but an admin key was found. Updating the flags." << std::endl;
+		grpMeta->mSubscribeFlags |= GXS_SERV::GROUP_SUBSCRIBE_PUBLISH;
+	}
+	if(!have_private_publish_key && (grpMeta->mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_PUBLISH))
+	{
+		std::cerr << "(WW) inconsistency in group " << grpMeta->mGroupId << ": group has flag PUBLISH but no admin key found. Updating the flags." << std::endl;
+		grpMeta->mSubscribeFlags &= ~GXS_SERV::GROUP_SUBSCRIBE_PUBLISH;
+	}
+
     if(ok)
         return grpMeta;
     else
@@ -933,7 +966,9 @@ void RsDataService::locked_clearGrpMetaCache(const RsGxsGroupId& gid)
 
 	if(it != mGrpMetaDataCache.end())
 	{
+#ifdef RS_DATA_SERVICE_DEBUG
 		std::cerr << "(II) moving database cache entry " << (void*)(*it).second << " to dead list." << std::endl;
+#endif
 
 		mOldCachedItems.push_back(std::make_pair(now,it->second)) ;
 
@@ -947,7 +982,9 @@ void RsDataService::locked_clearGrpMetaCache(const RsGxsGroupId& gid)
 
 	while(it2!=mOldCachedItems.end() && (*it2).first + CACHE_ENTRY_GRACE_PERIOD < now)
 	{
+#ifdef RS_DATA_SERVICE_DEBUG
 		std::cerr << "(II) deleting old GXS database cache entry " << (void*)(*it2).second << ", " << now - (*it2).first << " seconds old." << std::endl;
+#endif
 
 		delete (*it2).second ;
 		it2 = mOldCachedItems.erase(it2) ;

libretroshare/src/gxs/rsgenexchange.cc

@@ -1643,7 +1643,7 @@ void RsGenExchange::notifyReceivePublishKey(const RsGxsGroupId &grpId)
 {
 	RS_STACK_MUTEX(mGenMtx);
 
-	RsGxsGroupChange* gc = new RsGxsGroupChange(RsGxsNotify::TYPE_PUBLISHKEY, false);
+	RsGxsGroupChange* gc = new RsGxsGroupChange(RsGxsNotify::TYPE_PUBLISHKEY, true);
 	gc->mGrpIdList.push_back(grpId);
 	mNotifications.push_back(gc);
 }
@@ -2580,7 +2580,11 @@ void RsGenExchange::publishGrps()
 			    ggps.mKeys = fullKeySet;
 		    }
 		    else
+			{
+				// We should just merge the keys instead of overwriting them, because the update may not contain private parts.
+
 			    fullKeySet = ggps.mKeys;
+			}
 
 		    // find private admin key
 		    RsTlvPrivateRSAKey privAdminKey;
@@ -2756,7 +2760,7 @@ void RsGenExchange::publishGrps()
 
 	    if(!grpChanged.empty())
 	    {
-		    RsGxsGroupChange* gc = new RsGxsGroupChange(RsGxsNotify::TYPE_PUBLISH, false);
+		    RsGxsGroupChange* gc = new RsGxsGroupChange(RsGxsNotify::TYPE_RECEIVE, true);
 		    gc->mGrpIdList = grpChanged;
 		    mNotifications.push_back(gc);
 #ifdef GEN_EXCH_DEBUG
@@ -2770,8 +2774,8 @@ void RsGenExchange::publishGrps()
     // This is done off-mutex to avoid possible cross deadlocks with the net service.
     
     if(mNetService!=NULL)
-        for(std::list<RsGxsGroupId>::const_iterator it(groups_to_subscribe.begin());it!=groups_to_subscribe.end();++it)
-	    mNetService->subscribeStatusChanged((*it),true) ;
+		for(std::list<RsGxsGroupId>::const_iterator it(groups_to_subscribe.begin());it!=groups_to_subscribe.end();++it)
+			mNetService->subscribeStatusChanged((*it),true) ;
 }
 
 
@@ -2886,7 +2890,9 @@ void RsGenExchange::processRecvdMessages()
 
 		    if(!accept_new_msg || gpsi.mFirstTryTS + VALIDATE_MAX_WAITING_TIME < now)
 		    {
+#ifdef GEN_EXCH_DEBUG
 				std::cerr << "Pending validation grp=" << gpsi.mId.first << ", msg=" << gpsi.mId.second << ", has exceeded validation time limit. The author's key can probably not be obtained. This is unexpected." << std::endl;
+#endif
 
 			    delete gpsi.mItem;
 			    pend_it = mMsgPendingValidate.erase(pend_it);
@@ -3214,6 +3220,13 @@ void RsGenExchange::performUpdateValidation()
 
 			gu.newGrp->metaData->mSubscribeFlags = gu.oldGrpMeta->mSubscribeFlags ;
 
+			// Also keep private keys if present
+
+			if(!gu.newGrp->metaData->keys.private_keys.empty())
+				std::cerr << "(EE) performUpdateValidation() group " <<gu.newGrp->metaData->mGroupId << " has been received with private keys. This is very unexpected!" << std::endl;
+			else
+				gu.newGrp->metaData->keys.private_keys = gu.oldGrpMeta->keys.private_keys ;
+
 			grps.push_back(gu.newGrp);
 		}
 		else
@@ -3252,7 +3265,7 @@ void RsGenExchange::performUpdateValidation()
 	mGroupUpdates.clear();
 }
 
-bool RsGenExchange::updateValid(const RsGxsGrpMetaData& oldGrpMeta, RsNxsGrp& newGrp) const
+bool RsGenExchange::updateValid(const RsGxsGrpMetaData& oldGrpMeta, const RsNxsGrp& newGrp) const
 {
 	std::map<SignType, RsTlvKeySignature>& signSet = newGrp.metaData->signSet.keySignSet;
 	std::map<SignType, RsTlvKeySignature>::iterator mit = signSet.find(INDEX_AUTHEN_ADMIN);

libretroshare/src/gxs/rsgenexchange.h

@@ -835,7 +835,7 @@ private:
      * @param newGrp the new group that updates the old group (must have meta data member initialised)
      * @return
      */
-    bool updateValid(const RsGxsGrpMetaData& oldGrp, RsNxsGrp& newGrp) const;
+    bool updateValid(const RsGxsGrpMetaData& oldGrp, const RsNxsGrp& newGrp) const;
 
     /*!
      * convenience function for checking private publish and admin keys are present

libretroshare/src/gxs/rsgxsnetservice.cc

@@ -389,6 +389,8 @@ int RsGxsNetService::tick()
 
 	    should_notify = should_notify || !mNewGroupsToNotify.empty() ;
 	    should_notify = should_notify || !mNewMessagesToNotify.empty() ;
+	    should_notify = should_notify || !mNewPublishKeysToNotify.empty() ;
+	    should_notify = should_notify || !mNewStatsToNotify.empty() ;
     }
 
     if(should_notify)
@@ -451,8 +453,11 @@ void RsGxsNetService::processObserverNotifications()
     if(!grps_copy.empty()) mObserver->notifyNewGroups  (grps_copy);
     if(!msgs_copy.empty()) mObserver->notifyNewMessages(msgs_copy);
 
-    for(std::set<RsGxsGroupId>::const_iterator it(keys_copy.begin());it!=keys_copy.end();++it) mObserver->notifyReceivePublishKey(*it);
-    for(std::set<RsGxsGroupId>::const_iterator it(stat_copy.begin());it!=stat_copy.end();++it) mObserver->notifyChangedGroupStats(*it);
+    for(std::set<RsGxsGroupId>::const_iterator it(keys_copy.begin());it!=keys_copy.end();++it)
+		mObserver->notifyReceivePublishKey(*it);
+
+    for(std::set<RsGxsGroupId>::const_iterator it(stat_copy.begin());it!=stat_copy.end();++it)
+		mObserver->notifyChangedGroupStats(*it);
 }
 
 void RsGxsNetService::rejectMessage(const RsGxsMessageId& msg_id)
@@ -4756,6 +4761,7 @@ void RsGxsNetService::handleRecvPublishKeys(RsNxsGroupPublishKeyItem *item)
 #ifdef NXS_NET_DEBUG_3
 		GXSNETDEBUG_PG(item->PeerId(),item->grpId)<< "   (EE) Publish key already present in database. Discarding message." << std::endl;
 #endif
+        mNewPublishKeysToNotify.insert(item->grpId) ;
 		return ;
 	}
 

libretroshare/src/gxstunnel/p3gxstunnel.cc

@@ -143,7 +143,10 @@ void p3GxsTunnelService::flush()
 
 	    for(std::list<RsGxsTunnelDHPublicKeyItem*>::iterator it=pendingDHItems.begin();it!=pendingDHItems.end();)
 		    if(locked_sendClearTunnelData(*it) )
+			{
+				delete *it ;
 			    it = pendingDHItems.erase(it) ;
+			}
 		    else
 			    ++it ;
     }
@@ -155,7 +158,10 @@ void p3GxsTunnelService::flush()
 
 	    for(std::list<RsGxsTunnelItem*>::iterator it=pendingGxsTunnelItems.begin();it!=pendingGxsTunnelItems.end();)
 		    if(locked_sendEncryptedTunnelData(*it) )
+			{
+				delete *it ;
 			    it = pendingGxsTunnelItems.erase(it) ;
+			}
 		    else
 		    {
 			    ++it ;
@@ -744,6 +750,8 @@ void p3GxsTunnelService::receiveTurtleData(RsTurtleGenericTunnelItem *gitem,cons
         }
         else
             std::cerr << "(EE) Deserialiased item has unexpected type." << std::endl;
+
+		delete citem ;
     }
 }
 

libretroshare/src/pgp/rscertificate.cc

@@ -360,8 +360,9 @@ bool RsCertificate::initFromString(const std::string& instr,uint32_t& err_code)
 															  }
 															  break ;
 				default:
-															  err_code = CERTIFICATE_PARSING_ERROR_UNKNOWN_SECTION_PTAG ;
-															  return false ;
+															  std::cerr << "(WW) unknwown PTAG 0x" << std::hex << ptag << std::dec << " in certificate! Ignoring it." << std::endl;
+															  buf = &buf[s] ;
+															  break ;
 			}
 
 			total_s += s ;

libretroshare/src/retroshare/rsversion.h

@@ -1,6 +1,6 @@
 #define RS_MAJOR_VERSION     0
 #define RS_MINOR_VERSION     6
-#define RS_BUILD_NUMBER      3
+#define RS_BUILD_NUMBER      4
 #define RS_BUILD_NUMBER_ADD  "" // <-- do we need this?
 // The revision number should be the 4 first bytes of the git revision hash, which is obtained using:
 //    git log --pretty="%H" | head -1 | cut -c1-8

libretroshare/src/retroshare/rsversion.in

@@ -1,6 +1,6 @@
 #define RS_MAJOR_VERSION     0
 #define RS_MINOR_VERSION     6
-#define RS_BUILD_NUMBER      3
+#define RS_BUILD_NUMBER      4
 #define RS_BUILD_NUMBER_ADD  ""
 
 // The revision number should be the 4 first bytes of the git revision hash, which is obtained using:

libretroshare/src/util/rstime.cc

@@ -26,8 +26,8 @@
 #include <iostream>
 #include <thread>
 #include <sys/time.h>
-#include <sys/unistd.h>
 #include <unistd.h>
+
 #include "rstime.h"
 
 namespace rstime {