V0.6 short invites

libretroshare/src/gossipdiscovery/p3gossipdiscovery.cc

@@ -27,6 +27,7 @@
 #include "retroshare/rsiface.h"
 #include "rsserver/p3face.h"
 #include "util/rsdebug.h"
+#include "retroshare/rspeers.h"
 
 /****
  * #define P3DISC_DEBUG	1
@@ -99,7 +100,7 @@ void DiscPgpInfo::mergeFriendList(const std::set<PGPID> &friends)
 p3discovery2::p3discovery2(
         p3PeerMgr* peerMgr, p3LinkMgr* linkMgr, p3NetMgr* netMgr,
         p3ServiceControl* sc, RsGixs* gixs ) :
-    p3Service(), mPeerMgr(peerMgr), mLinkMgr(linkMgr), mNetMgr(netMgr),
+    p3Service(),  mRsEventsHandle(0), mPeerMgr(peerMgr), mLinkMgr(linkMgr), mNetMgr(netMgr),
     mServiceCtrl(sc), mGixs(gixs), mDiscMtx("p3discovery2"), mLastPgpUpdate(0)
 {
 	Dbg3() << __PRETTY_FUNCTION__ << std::endl;
@@ -1249,9 +1250,25 @@ void p3discovery2::recvInvite(
 
 void p3discovery2::rsEventsHandler(const RsEvent& event)
 {
+	Dbg3() << __PRETTY_FUNCTION__ << " " << static_cast<uint32_t>(event.mType)
+	       << std::endl;
+
 	switch(event.mType)
 	{
-	// TODO: When an SSL-only friend become online requestInvite(...)
+	case RsEventType::PEER_STATE_CHANGED:
+	{
+		const RsPeerId& sslId =
+		        static_cast<const RsPeerStateChangedEvent&>(event).mSslId;
+		if( rsPeers && rsPeers->isSslOnlyFriend(sslId) &&
+		        mServiceCtrl->isPeerConnected(
+		            getServiceInfo().mServiceType, sslId ) )
+		{
+			if(!requestInvite(sslId, sslId))
+				RsErr() << __PRETTY_FUNCTION__ << " requestInvite to peer "
+				        << sslId << " failed" << std::endl;
+		}
+		break;
+	}
 	default: break;
 	}
 }

libretroshare/src/pgp/pgphandler.cc

@@ -1571,6 +1571,11 @@ void PGPHandler::locked_updateOwnSignatureFlag(PGPCertificateInfo& cert,const Rs
 		cert._flags &= ~PGPCertificateInfo::PGP_CERTIFICATE_FLAG_HAS_SIGNED_ME ;
 }
 
+RsPgpId PGPHandler::pgpIdFromFingerprint(const PGPFingerprintType& f)
+{
+    return RsPgpId(f.toByteArray() + _RsIdSize::PGP_FINGERPRINT - _RsIdSize::PGP_ID);
+}
+
 bool PGPHandler::getKeyFingerprint(const RsPgpId& id,PGPFingerprintType& fp) const
 {
 	RsStackMutex mtx(pgphandlerMtx) ;				// lock access to PGP memory structures.

libretroshare/src/pgp/pgphandler.h

@@ -153,6 +153,7 @@ class PGPHandler
 
 		static void setPassphraseCallback(PassphraseCallback cb) ;
 		static PassphraseCallback passphraseCallback() { return _passphrase_callback ; }
+        static RsPgpId pgpIdFromFingerprint(const PGPFingerprintType& f) ;
 
 		// Gets info about the key. Who are the signers, what's the owner's name, etc.
 		//

libretroshare/src/pgp/rscertificate.cc

@@ -552,14 +552,22 @@ unsigned short RsCertificate::loc_port_us() const
 	return (int)ipv4_internal_ip_and_port[4]*256 + (int)ipv4_internal_ip_and_port[5] ;
 }
 
-bool RsCertificate::cleanCertificate(
-        const std::string& input, std::string& output, Format& format,
-        int& error_code, bool check_content )
+bool RsCertificate::cleanCertificate( const std::string& input, std::string& output, Format& format, int& error_code, bool check_content )
 {
-	if(cleanCertificate(input,output,error_code))
+	if(cleanRadix64(input,output,error_code))
 	{
+        RsPeerDetails details;
+
+        if(rsPeers->parseShortInvite(output,details))
+        {
+            format = RS_CERTIFICATE_SHORT_RADIX;
+            return true;
+        }
+
 		format = RS_CERTIFICATE_RADIX;
+
 		if(!check_content) return true;
+
 		uint32_t errCode;
 		auto crt = RsCertificate::fromString(input, errCode);
 		error_code = static_cast<int>(errCode);
@@ -576,7 +584,7 @@ std::string RsCertificate::armouredPGPKey() const
 
 // Yeah, this is simple, and that is what's good about the radix format. Can't be broken ;-)
 //
-bool RsCertificate::cleanCertificate(const std::string& instr,std::string& str,int& error_code)
+bool RsCertificate::cleanRadix64(const std::string& instr,std::string& str,int& error_code)
 {
 	error_code = RS_PEER_CERT_CLEANING_CODE_NO_ERROR ;
 

libretroshare/src/pgp/rscertificate.h

@@ -36,7 +36,7 @@ struct RsPeerDetails;
 class RsCertificate
 {
 public:
-	typedef enum { RS_CERTIFICATE_OLD_FORMAT, RS_CERTIFICATE_RADIX } Format;
+	typedef enum { RS_CERTIFICATE_OLD_FORMAT, RS_CERTIFICATE_RADIX, RS_CERTIFICATE_SHORT_RADIX } Format;
 
 	/**
 	 * @brief Create certificate object from certificate string
@@ -99,8 +99,7 @@ class RsCertificate
 
 private:
 	// new radix format
-	static bool cleanCertificate( const std::string& input,
-	                              std::string& output, int&);
+	static bool cleanRadix64( const std::string& input, std::string& output, int&);
 
 	static void scan_ip( const std::string& ip_string, unsigned short port,
 	                     unsigned char *destination_memory );

libretroshare/src/pqi/authssl.cc

@@ -1196,6 +1196,7 @@ int AuthSSLimpl::VerifyX509Callback(int /*preverify_ok*/, X509_STORE_CTX* ctx)
 	std::string sslCn = RsX509Cert::getCertIssuerString(*x509Cert);
 	RsPgpId pgpId(sslCn);
 
+
 	if(sslId.isNull())
 	{
 		std::string errMsg = "x509Cert has invalid sslId!";
@@ -1231,8 +1232,10 @@ int AuthSSLimpl::VerifyX509Callback(int /*preverify_ok*/, X509_STORE_CTX* ctx)
 		return verificationFailed;
 	}
 
+	bool isSslOnlyFriend = rsPeers->isSslOnlyFriend(sslId);
+
 	uint32_t auth_diagnostic;
-	if(!AuthX509WithGPG(x509Cert, auth_diagnostic))
+	if(!isSslOnlyFriend && !AuthX509WithGPG(x509Cert, auth_diagnostic))
 	{
 		std::string errMsg = "Certificate was rejected because PGP "
 		                     "signature verification failed with diagnostic: "
@@ -1255,7 +1258,7 @@ int AuthSSLimpl::VerifyX509Callback(int /*preverify_ok*/, X509_STORE_CTX* ctx)
 		return verificationFailed;
 	}
 
-	if ( pgpId != AuthGPG::getAuthGPG()->getGPGOwnId() &&
+	if ( !isSslOnlyFriend && pgpId != AuthGPG::getAuthGPG()->getGPGOwnId() &&
 	     !AuthGPG::getAuthGPG()->isGPGAccepted(pgpId) )
 	{
 		std::string errMsg = "Connection attempt signed by PGP key id: " +
@@ -1279,7 +1282,9 @@ int AuthSSLimpl::VerifyX509Callback(int /*preverify_ok*/, X509_STORE_CTX* ctx)
 	setCurrentConnectionAttemptInfo(pgpId, sslId, sslCn);
 	LocalStoreCert(x509Cert);
 
-	Dbg1() << __PRETTY_FUNCTION__ << " authentication successfull!" << std::endl;
+	RsInfo() << __PRETTY_FUNCTION__ << " authentication successfull for "
+	         << "sslId: " << sslId << " isSslOnlyFriend: " << isSslOnlyFriend
+	         << std::endl;
 
 	if(rsEvents)
 	{