Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-15 01:17:16 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

added parsing of short invites in connect friend wizard (not working yet)

Browse Source
This commit is contained in:
csoler 2019-06-09 15:03:48 +02:00
parent 3a799bae37
commit 4bd5aaa9b2
No known key found for this signature in database
GPG Key ID: 7BCA522266C0804C
6 changed files with 69 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libretroshare/src/pgp/rscertificate.cc
View File

@ -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] ; return (int)ipv4_internal_ip_and_port[4]*256 + (int)ipv4_internal_ip_and_port[5] ;
} }
bool RsCertificate::cleanCertificate( bool RsCertificate::cleanCertificate( const std::string& input, std::string& output, Format& format, int& error_code, bool check_content )
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; format = RS_CERTIFICATE_RADIX;
if(!check_content) return true; if(!check_content) return true;
uint32_t errCode; uint32_t errCode;
auto crt = RsCertificate::fromString(input, errCode); auto crt = RsCertificate::fromString(input, errCode);
error_code = static_cast<int>(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 ;-) // 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 ; error_code = RS_PEER_CERT_CLEANING_CODE_NO_ERROR ;

5
libretroshare/src/pgp/rscertificate.h
View File

@ -36,7 +36,7 @@ struct RsPeerDetails;
class RsCertificate class RsCertificate
{ {
public: 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 * @brief Create certificate object from certificate string
@ -99,8 +99,7 @@ public:
private: private:
// new radix format // new radix format
static bool cleanCertificate( const std::string& input, static bool cleanRadix64( const std::string& input, std::string& output, int&);
std::string& output, int&);
static void scan_ip( const std::string& ip_string, unsigned short port, static void scan_ip( const std::string& ip_string, unsigned short port,
unsigned char *destination_memory ); unsigned char *destination_memory );

2
libretroshare/src/retroshare/rspeers.h
View File

@ -717,7 +717,7 @@ public:
uint32_t& errorCode ) = 0; uint32_t& errorCode ) = 0;
// Certificate utils // Certificate utils
virtual bool cleanCertificate(const std::string &certstr, std::string &cleanCert,int& error_code) = 0; virtual bool cleanCertificate(const std::string &certstr, std::string &cleanCert,bool& is_short_format,int& error_code) = 0;
virtual bool saveCertificateToFile(const RsPeerId& id, const std::string &fname) = 0; virtual bool saveCertificateToFile(const RsPeerId& id, const std::string &fname) = 0;
virtual std::string saveCertificateToString(const RsPeerId &id) = 0; virtual std::string saveCertificateToString(const RsPeerId &id) = 0;

13
libretroshare/src/rsserver/p3peers.cc
View File

@ -1536,11 +1536,20 @@ bool p3Peers::loadDetailsFromStringCert( const std::string &certstr,
return true; return true;
} }
bool p3Peers::cleanCertificate(const std::string &certstr, std::string &cleanCert,int& error_code) bool p3Peers::cleanCertificate(const std::string &certstr, std::string &cleanCert,bool& is_short_format,int& error_code)
{ {
RsCertificate::Format format ; RsCertificate::Format format ;
return RsCertificate::cleanCertificate(certstr,cleanCert,format,error_code,true) ; bool res = RsCertificate::cleanCertificate(certstr,cleanCert,format,error_code,true) ;
if(format == RsCertificate::RS_CERTIFICATE_RADIX)
is_short_format = false;
else if(format == RsCertificate::RS_CERTIFICATE_SHORT_RADIX)
is_short_format = true;
else
return false ;
return res;
} }
bool p3Peers::saveCertificateToFile(const RsPeerId &id, const std::string &/*fname*/) bool p3Peers::saveCertificateToFile(const RsPeerId &id, const std::string &/*fname*/)

2
libretroshare/src/rsserver/p3peers.h
View File

@ -157,7 +157,7 @@ public:
virtual bool loadCertificateFromString(const std::string& cert, RsPeerId& ssl_id,RsPgpId& pgp_id, std::string& error_string); virtual bool loadCertificateFromString(const std::string& cert, RsPeerId& ssl_id,RsPgpId& pgp_id, std::string& error_string);
virtual bool loadDetailsFromStringCert(const std::string &cert, RsPeerDetails &pd, uint32_t& error_code); virtual bool loadDetailsFromStringCert(const std::string &cert, RsPeerDetails &pd, uint32_t& error_code);
virtual bool cleanCertificate(const std::string &certstr, std::string &cleanCert,int& error_code); virtual bool cleanCertificate(const std::string &certstr, std::string &cleanCert, bool &is_short_format, int& error_code) override;
virtual bool saveCertificateToFile(const RsPeerId &id, const std::string &fname); virtual bool saveCertificateToFile(const RsPeerId &id, const std::string &fname);
virtual std::string saveCertificateToString(const RsPeerId &id); virtual std::string saveCertificateToString(const RsPeerId &id);

53
retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
View File

@ -299,8 +299,6 @@ void ConnectFriendWizard::setCertificate(const QString &certificate, bool friend
{ {
mCertificate = certificate.toUtf8().constData(); mCertificate = certificate.toUtf8().constData();
// Cyril: I disabled this because it seems to be not used anymore.
//setStartId(friendRequest ? Page_FriendRequest : Page_Conclusion);
setStartId(Page_Conclusion); setStartId(Page_Conclusion);
if (friendRequest){ if (friendRequest){
ui->cp_Label->show(); ui->cp_Label->show();
@ -309,7 +307,31 @@ void ConnectFriendWizard::setCertificate(const QString &certificate, bool friend
ui->ConclusionPage->setSubTitle(tr("Details about the request")); ui->ConclusionPage->setSubTitle(tr("Details about the request"));
} }
} }
} else { }
else if(rsPeers->parseShortInvite(certificate.toUtf8().constData(),peerDetails))
{
if(peerDetails.id == rsPeers->getOwnId())
{
setField("errorMessage", tr("This is your own certificate! You would not want to make friend with yourself. Wouldn't you?") ) ;
error = false;
setStartId(Page_ErrorMessage);
}
else
{
mCertificate = certificate.toUtf8().constData();
setStartId(Page_Conclusion);
if (friendRequest){
ui->cp_Label->show();
ui->requestinfolabel->show();
setTitleText(ui->ConclusionPage, tr("Friend request"));
ui->ConclusionPage->setSubTitle(tr("Details about the request"));
}
}
}
else
{
// error message // error message
setField("errorMessage", tr("Certificate Load Failed") + ": \n\n" + getErrorString(cert_load_error_code)) ; setField("errorMessage", tr("Certificate Load Failed") + ": \n\n" + getErrorString(cert_load_error_code)) ;
setStartId(Page_ErrorMessage); setStartId(Page_ErrorMessage);
@ -702,7 +724,8 @@ bool ConnectFriendWizard::validateCurrentPage()
std::string certstr = ui->friendCertEdit->toPlainText().toUtf8().constData(); std::string certstr = ui->friendCertEdit->toPlainText().toUtf8().constData();
uint32_t cert_load_error_code; uint32_t cert_load_error_code;
if (rsPeers->loadDetailsFromStringCert(certstr, peerDetails, cert_load_error_code)) { if (rsPeers->loadDetailsFromStringCert(certstr, peerDetails, cert_load_error_code) || rsPeers->parseShortInvite(certstr,peerDetails))
{
mCertificate = certstr; mCertificate = certstr;
#ifdef FRIEND_WIZARD_DEBUG #ifdef FRIEND_WIZARD_DEBUG
std::cerr << "ConnectFriendWizard got id : " << peerDetails.id << "; gpg_id : " << peerDetails.gpg_id << std::endl; std::cerr << "ConnectFriendWizard got id : " << peerDetails.id << "; gpg_id : " << peerDetails.gpg_id << std::endl;
@ -742,7 +765,8 @@ bool ConnectFriendWizard::validateCurrentPage()
} }
uint32_t cert_error_code; uint32_t cert_error_code;
if (rsPeers->loadDetailsFromStringCert(certstr, peerDetails, cert_error_code)) { if (rsPeers->loadDetailsFromStringCert(certstr, peerDetails, cert_error_code) || rsPeers->parseShortInvite(certstr,peerDetails))
{
mCertificate = certstr; mCertificate = certstr;
#ifdef FRIEND_WIZARD_DEBUG #ifdef FRIEND_WIZARD_DEBUG
std::cerr << "ConnectFriendWizard got id : " << peerDetails.id << "; gpg_id : " << peerDetails.gpg_id << std::endl; std::cerr << "ConnectFriendWizard got id : " << peerDetails.id << "; gpg_id : " << peerDetails.gpg_id << std::endl;
@ -1058,18 +1082,23 @@ void ConnectFriendWizard::cleanFriendCert()
} else { } else {
std::string cleanCert; std::string cleanCert;
int error_code; int error_code;
bool is_short_format;
if (rsPeers->cleanCertificate(cert, cleanCert, error_code)) { if (rsPeers->cleanCertificate(cert, cleanCert, is_short_format, error_code))
{
certValid = true; certValid = true;
if (cert != cleanCert) {
disconnect(ui->friendCertEdit, SIGNAL(textChanged()), this, SLOT(friendCertChanged())); if (cert != cleanCert)
{
QTextCursor textCursor = ui->friendCertEdit->textCursor(); QTextCursor textCursor = ui->friendCertEdit->textCursor();
ui->friendCertEdit->setPlainText(QString::fromUtf8(cleanCert.c_str()));
ui->friendCertEdit->setTextCursor(textCursor); whileBlocking(ui->friendCertEdit)->setPlainText(QString::fromUtf8(cleanCert.c_str()));
whileBlocking(ui->friendCertEdit)->setTextCursor(textCursor);
ui->friendCertCleanLabel->setStyleSheet(""); ui->friendCertCleanLabel->setStyleSheet("");
connect(ui->friendCertEdit, SIGNAL(textChanged()), this, SLOT(friendCertChanged()));
} }
errorMsg = tr("Certificate appears to be valid"); errorMsg = tr("Valid certificate") + (is_short_format?" (Short format)":" (plain format with profile key)");
ui->friendCertCleanLabel->setPixmap(QPixmap(":/images/accepted16.png")); ui->friendCertCleanLabel->setPixmap(QPixmap(":/images/accepted16.png"));
} else { } else {
if (error_code > 0) { if (error_code > 0) {