mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-03 06:35:08 -04:00
implement the trust settings in the gui
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2012 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17
parent
dabe44356a
commit
1ae1c9a98b
10 changed files with 362 additions and 146 deletions
|
|
@ -29,6 +29,8 @@
|
|||
#include <iostream>
|
||||
#include <sstream>
|
||||
#include <algorithm>
|
||||
#include <boost/lexical_cast.hpp>
|
||||
|
||||
|
||||
// initialisation du pointeur de singleton à zéro
|
||||
AuthGPG *AuthGPG::instance_gpg = new AuthGPG();
|
||||
|
|
@ -60,7 +62,7 @@ gpgcert::~gpgcert()
|
|||
{
|
||||
if (key)
|
||||
{
|
||||
gpgme_key_unref(key);
|
||||
gpgme_key_unref(key);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -294,21 +296,6 @@ int AuthGPG::GPGInit(std::string ownId)
|
|||
{
|
||||
}
|
||||
|
||||
//int AuthGPG::LoadGPGPassword(std::string pwd)
|
||||
//{
|
||||
// RsStackMutex stack(pgpMtx); /******* LOCKED ******/
|
||||
//
|
||||
// if (!gpgmeInit) {
|
||||
// return 0;
|
||||
// }
|
||||
//
|
||||
// this->passphrase = pwd;
|
||||
// setPGPPassword_locked(pwd);
|
||||
//
|
||||
// return 1;
|
||||
//}
|
||||
|
||||
|
||||
|
||||
// store all keys in map mKeyList to avoid callin gpgme exe repeatedly
|
||||
bool AuthGPG::storeAllKeys_locked()
|
||||
|
|
@ -326,7 +313,7 @@ bool AuthGPG::storeAllKeys_locked()
|
|||
|
||||
std::cerr << "AuthGPG::storeAllKeys_locked() clearing existing ones";
|
||||
std::cerr << std::endl;
|
||||
mKeyList.clear();
|
||||
mKeyList.clear();
|
||||
|
||||
/* enable SIG mode */
|
||||
gpgme_keylist_mode_t origmode = gpgme_get_keylist_mode(CTX);
|
||||
|
|
@ -410,9 +397,7 @@ bool AuthGPG::storeAllKeys_locked()
|
|||
{
|
||||
nu.signers.push_back(keyid);
|
||||
}
|
||||
std::cerr << "keyid: " << keyid << std::endl;
|
||||
std::cerr << "mOwnGpgId: " << mOwnGpgId << std::endl;
|
||||
if (keyid == mOwnGpgId) {
|
||||
if (keyid == mOwnGpgId) {
|
||||
nu.ownsign = true;
|
||||
}
|
||||
}
|
||||
|
|
@ -614,7 +599,7 @@ bool AuthGPG::printOwnKeys_locked()
|
|||
|
||||
bool AuthGPG::printKeys()
|
||||
{
|
||||
//RsStackMutex stack(pgpMtx); /******* LOCKED ******/
|
||||
RsStackMutex stack(pgpMtx); /******* LOCKED ******/
|
||||
printAllKeys_locked();
|
||||
return printOwnKeys_locked();
|
||||
}
|
||||
|
|
@ -860,7 +845,7 @@ int AuthGPG::setConfigDirectories(std::string confFile, std::string neighDir
|
|||
/**** These Two are common */
|
||||
std::string AuthGPG::getPGPName(GPG_id id)
|
||||
{
|
||||
//RsStackMutex stack(pgpMtx); /******* LOCKED ******/
|
||||
RsStackMutex stack(pgpMtx); /******* LOCKED ******/
|
||||
|
||||
certmap::iterator it;
|
||||
if (mKeyList.end() != (it = mKeyList.find(id)))
|
||||
|
|
@ -872,7 +857,7 @@ std::string AuthGPG::getPGPName(GPG_id id)
|
|||
/**** These Two are common */
|
||||
std::string AuthGPG::getPGPEmail(GPG_id id)
|
||||
{
|
||||
//RsStackMutex stack(pgpMtx); /******* LOCKED ******/
|
||||
RsStackMutex stack(pgpMtx); /******* LOCKED ******/
|
||||
|
||||
certmap::iterator it;
|
||||
if (mKeyList.end() != (it = mKeyList.find(id)))
|
||||
|
|
@ -892,7 +877,7 @@ std::string AuthGPG::PGPOwnId()
|
|||
|
||||
bool AuthGPG::getPGPAllList(std::list<std::string> &ids)
|
||||
{
|
||||
//RsStackMutex stack(pgpMtx); /******* LOCKED ******/
|
||||
RsStackMutex stack(pgpMtx); /******* LOCKED ******/
|
||||
|
||||
/* add an id for each pgp certificate */
|
||||
certmap::iterator it;
|
||||
|
|
@ -903,9 +888,24 @@ bool AuthGPG::getPGPAllList(std::list<std::string> &ids)
|
|||
return true;
|
||||
}
|
||||
|
||||
bool AuthGPG::getPGPValidList(std::list<std::string> &ids)
|
||||
{
|
||||
RsStackMutex stack(pgpMtx); /******* LOCKED ******/
|
||||
|
||||
/* add an id for each pgp certificate */
|
||||
certmap::iterator it;
|
||||
for(it = mKeyList.begin(); it != mKeyList.end(); it++)
|
||||
{
|
||||
if (it->second.validLvl >= GPGME_VALIDITY_MARGINAL) {
|
||||
ids.push_back(it->first);
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool AuthGPG::getPGPDetails(std::string id, RsPeerDetails &d)
|
||||
{
|
||||
//RsStackMutex stack(pgpMtx); /******* LOCKED ******/
|
||||
RsStackMutex stack(pgpMtx); /******* LOCKED ******/
|
||||
|
||||
/* add an id for each pgp certificate */
|
||||
certmap::iterator it;
|
||||
|
|
@ -1193,8 +1193,6 @@ bool AuthGPG::RevokeCertificate(std::string id)
|
|||
|
||||
bool AuthGPG::TrustCertificateMarginally(std::string id)
|
||||
{
|
||||
RsStackMutex stack(pgpMtx); /******* LOCKED ******/
|
||||
|
||||
std::cerr << "AuthGPG::TrustCertificateMarginally(" << id << ")";
|
||||
std::cerr << std::endl;
|
||||
//TODO implement it
|
||||
|
|
@ -1202,6 +1200,12 @@ bool AuthGPG::TrustCertificateMarginally(std::string id)
|
|||
return false;
|
||||
}
|
||||
|
||||
bool AuthGPG::TrustCertificate(std::string id, int trustlvl)
|
||||
{
|
||||
std::cerr << "AuthGPG::TrustCertificate(" << id << ", " << trustlvl << ")" << std::endl;
|
||||
return this->privateTrustCertificate(id, trustlvl);
|
||||
}
|
||||
|
||||
bool AuthGPG::SignData(std::string input, std::string &sign)
|
||||
{
|
||||
return false;
|
||||
|
|
@ -1263,8 +1267,7 @@ int AuthGPG::privateSignCertificate(std::string id)
|
|||
}
|
||||
|
||||
|
||||
if(GPG_ERR_NO_ERROR != (ERR = gpgme_op_edit(CTX, signKey, keySignCallback, \
|
||||
¶ms, out))) {
|
||||
if(GPG_ERR_NO_ERROR != (ERR = gpgme_op_edit(CTX, signKey, keySignCallback, ¶ms, out))) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -1294,8 +1297,8 @@ int AuthGPG::privateTrustCertificate(std::string id, int trustlvl)
|
|||
|
||||
gpgcert trustCert = mKeyList.find(id)->second;
|
||||
gpgme_key_t trustKey = trustCert.key;
|
||||
const char *lvls[] = {"1", "2", "3", "4", "5"};
|
||||
class EditParams params(TRUST_START, (void *) *(lvls + trustlvl -1));
|
||||
class TrustParams sparams((boost::lexical_cast<std::string>(trustlvl)));
|
||||
class EditParams params(TRUST_START, &sparams);
|
||||
gpgme_data_t out;
|
||||
gpg_error_t ERR;
|
||||
|
||||
|
|
@ -1306,6 +1309,11 @@ int AuthGPG::privateTrustCertificate(std::string id, int trustlvl)
|
|||
|
||||
if(GPG_ERR_NO_ERROR != (ERR = gpgme_op_edit(CTX, trustKey, trustCallback, ¶ms, out)))
|
||||
return 0;
|
||||
|
||||
//the key ref has changed, we got to get rid of the old reference.
|
||||
trustCert.key = NULL;
|
||||
|
||||
storeAllKeys_locked();
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -1750,9 +1758,44 @@ static gpg_error_t keySignCallback(void *opaque, gpgme_status_code_t status, \
|
|||
static gpgme_error_t trustCallback(void *opaque, gpgme_status_code_t status, \
|
||||
const char *args, int fd) {
|
||||
|
||||
class EditParams *params = (class EditParams *)opaque;
|
||||
const char *result = NULL;
|
||||
char *trustLvl = (char *)params->oParams;
|
||||
class EditParams *params = (class EditParams *)opaque;
|
||||
class TrustParams *tparams = (class TrustParams *)params->oParams;
|
||||
const char *result = NULL;
|
||||
|
||||
/* printf stuff out */
|
||||
if (status == GPGME_STATUS_EOF)
|
||||
fprintf(stderr,"keySignCallback GPGME_STATUS_EOF\n");
|
||||
if (status == GPGME_STATUS_GOT_IT)
|
||||
fprintf(stderr,"keySignCallback GPGME_STATUS_GOT_IT\n");
|
||||
if (status == GPGME_STATUS_USERID_HINT)
|
||||
fprintf(stderr,"keySignCallback GPGME_STATUS_USERID_HINT\n");
|
||||
if (status == GPGME_STATUS_NEED_PASSPHRASE)
|
||||
fprintf(stderr,"keySignCallback GPGME_STATUS_NEED_PASSPHRASE\n");
|
||||
if (status == GPGME_STATUS_GOOD_PASSPHRASE)
|
||||
fprintf(stderr,"keySignCallback GPGME_STATUS_GOOD_PASSPHRASE\n");
|
||||
if (status == GPGME_STATUS_BAD_PASSPHRASE)
|
||||
fprintf(stderr,"keySignCallback GPGME_STATUS_BAD_PASSPHRASE\n");
|
||||
if (status == GPGME_STATUS_GET_LINE)
|
||||
fprintf(stderr,"keySignCallback GPGME_STATUS_GET_LINE\n");
|
||||
if (status == GPGME_STATUS_GET_BOOL)
|
||||
fprintf(stderr,"keySignCallback GPGME_STATUS_GET_BOOL \n");
|
||||
if (status == GPGME_STATUS_ALREADY_SIGNED)
|
||||
fprintf(stderr,"keySignCallback GPGME_STATUS_ALREADY_SIGNED\n");
|
||||
|
||||
/* printf stuff out */
|
||||
if (params->state == TRUST_START)
|
||||
fprintf(stderr,"keySignCallback params->state TRUST_START\n");
|
||||
if (params->state == TRUST_COMMAND)
|
||||
fprintf(stderr,"keySignCallback params->state TRUST_COMMAND\n");
|
||||
if (params->state == TRUST_VALUE)
|
||||
fprintf(stderr,"keySignCallback params->state TRUST_VALUE\n");
|
||||
if (params->state == TRUST_REALLY_ULTIMATE)
|
||||
fprintf(stderr,"keySignCallback params->state TRUST_REALLY_ULTIMATE\n");
|
||||
if (params->state == TRUST_QUIT)
|
||||
fprintf(stderr,"keySignCallback params->state TRUST_QUIT\n");
|
||||
if (params->state == TRUST_ERROR)
|
||||
fprintf(stderr,"keySignCallback params->state TRUST_ERROR\n");
|
||||
|
||||
|
||||
if(status == GPGME_STATUS_EOF ||
|
||||
status == GPGME_STATUS_GOT_IT) {
|
||||
|
|
@ -1777,7 +1820,7 @@ static gpgme_error_t trustCallback(void *opaque, gpgme_status_code_t status, \
|
|||
if (status == GPGME_STATUS_GET_LINE &&
|
||||
(!std::string("edit_ownertrust.value").compare(args))) {
|
||||
params->state = TRUST_VALUE;
|
||||
result = trustLvl;
|
||||
result = tparams->trustLvl.c_str();;
|
||||
} else {
|
||||
params->state = TRUST_ERROR;
|
||||
params->err = gpg_error (GPG_ERR_GENERAL);
|
||||
|
|
@ -1844,6 +1887,7 @@ static gpgme_error_t trustCallback(void *opaque, gpgme_status_code_t status, \
|
|||
WriteFile(winFd, result, strlen (result), &written, NULL);
|
||||
WriteFile(winFd, "\n", 1, &written, NULL);
|
||||
#endif
|
||||
std::cerr << "trustCallback() result : " << result << std::endl;
|
||||
}
|
||||
|
||||
return params->err;
|
||||
|
|
|
|||
|
|
@ -182,6 +182,7 @@ class AuthGPG
|
|||
bool TrustCertificateNone(std::string id);
|
||||
bool TrustCertificateMarginally(std::string id);
|
||||
bool TrustCertificateFully(std::string id);
|
||||
bool TrustCertificate(std::string id, int trustlvl); //trustlvl is 2 for none, 3 for marginal and 4 for full trust
|
||||
|
||||
/*********************************************************************************/
|
||||
/************************* STAGE 7 ***********************************************/
|
||||
|
|
@ -296,4 +297,16 @@ class SignParams
|
|||
}
|
||||
};
|
||||
|
||||
/* Data specific to key signing */
|
||||
class TrustParams
|
||||
{
|
||||
public:
|
||||
|
||||
std::string trustLvl;
|
||||
|
||||
TrustParams(std::string trustLvl) {
|
||||
this->trustLvl = trustLvl;
|
||||
}
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -76,6 +76,7 @@ class RsPeerDetails
|
|||
RsPeerDetails();
|
||||
|
||||
/* Auth details */
|
||||
bool isOnlyGPGdetail;
|
||||
std::string id;
|
||||
std::string name;
|
||||
std::string email;
|
||||
|
|
@ -137,22 +138,23 @@ virtual bool isOnline(std::string id) = 0;
|
|||
virtual bool isFriend(std::string id) = 0;
|
||||
virtual std::string getPeerName(std::string id) = 0;
|
||||
virtual std::string getPeerPGPName(std::string pgp_id) = 0;
|
||||
virtual bool getPeerDetails(std::string id, RsPeerDetails &d) = 0;
|
||||
virtual bool getPeerDetails(std::string id, RsPeerDetails &d) = 0; //get Peer detail accept SSL and PGP certs
|
||||
|
||||
/* Using PGP Ids */
|
||||
virtual std::string getPGPOwnId() = 0;
|
||||
virtual std::string getPGPId(std::string ssl_id) = 0;
|
||||
virtual bool getPGPFriendList(std::list<std::string> &ids) = 0;
|
||||
virtual bool getPGPAcceptedList(std::list<std::string> &ids) = 0;
|
||||
virtual bool getPGPSignedList(std::list<std::string> &ids) = 0;//friends that we accpet to connect with but we don't want to sign their gpg key
|
||||
virtual bool getPGPValidList(std::list<std::string> &ids) = 0;
|
||||
virtual bool getPGPAllList(std::list<std::string> &ids) = 0;
|
||||
virtual bool getPGPDetails(std::string id, RsPeerDetails &d) = 0;
|
||||
|
||||
virtual bool getPGPFriendList(std::list<std::string> &ids) = 0;
|
||||
|
||||
/* Add/Remove Friends */
|
||||
virtual bool addFriend(std::string id) = 0;
|
||||
virtual bool removeFriend(std::string id) = 0;
|
||||
|
||||
/* get/set third party info about who trusts me */
|
||||
virtual bool isTrustingMe(std::string id) const = 0 ;
|
||||
|
||||
/* Network Stuff */
|
||||
virtual bool connectAttempt(std::string id) = 0;
|
||||
virtual bool setLocalAddress(std::string id, std::string addr, uint16_t port) = 0;
|
||||
|
|
@ -175,7 +177,7 @@ virtual bool SaveCertificateToFile(std::string id, std::string fname) = 0;
|
|||
virtual std::string SaveCertificateToString(std::string id) = 0;
|
||||
|
||||
virtual bool SignGPGCertificate(std::string id) = 0;
|
||||
virtual bool TrustCertificate(std::string id, bool trust) = 0;
|
||||
virtual bool TrustGPGCertificate(std::string id, uint32_t trustlvl) = 0;
|
||||
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -259,11 +259,6 @@ bool p3Peers::isOnline(std::string id)
|
|||
return false;
|
||||
}
|
||||
|
||||
bool p3Peers::isTrustingMe(std::string id) const
|
||||
{
|
||||
return AuthSSL::getAuthSSL()->isTrustingMe(id) ;
|
||||
}
|
||||
|
||||
bool p3Peers::isFriend(std::string id)
|
||||
{
|
||||
#ifdef P3PEERS_DEBUG
|
||||
|
|
@ -300,9 +295,17 @@ bool p3Peers::getPeerDetails(std::string id, RsPeerDetails &d)
|
|||
std::cerr << "p3Peers::getPeerDetails() " << id;
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
//first, check if it's a gpg or a ssl id.
|
||||
if (AuthSSL::getAuthSSL()->getGPGId(id) == "") {
|
||||
//assume is not SSL, because every ssl_id has got a pgp_id
|
||||
d.isOnlyGPGdetail = true;
|
||||
return this->getPGPDetails(id, d);
|
||||
}
|
||||
|
||||
/* get from gpg (first), to fill in the sign and trust details */
|
||||
/* don't retrun now, we've got fill in the ssl and connection info */
|
||||
this->getPGPDetails(AuthSSL::getAuthSSL()->getGPGId(id), d);
|
||||
d.isOnlyGPGdetail = false;
|
||||
|
||||
//get the ssl details
|
||||
sslcert authDetail;
|
||||
|
|
@ -533,8 +536,6 @@ bool p3Peers::getPGPFriendList(std::list<std::string> &ids)
|
|||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
bool p3Peers::getPGPAllList(std::list<std::string> &ids)
|
||||
{
|
||||
#ifdef P3PEERS_DEBUG
|
||||
|
|
@ -547,6 +548,42 @@ bool p3Peers::getPGPAllList(std::list<std::string> &ids)
|
|||
return true;
|
||||
}
|
||||
|
||||
bool p3Peers::getPGPValidList(std::list<std::string> &ids)
|
||||
{
|
||||
#ifdef P3PEERS_DEBUG
|
||||
std::cerr << "p3Peers::getPGPOthersList()";
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
|
||||
/* get from mAuthMgr */
|
||||
AuthGPG::getAuthGPG()->getPGPValidList(ids);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool p3Peers::getPGPSignedList(std::list<std::string> &ids)
|
||||
{
|
||||
#ifdef P3PEERS_DEBUG
|
||||
std::cerr << "p3Peers::getPGPOthersList()";
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
|
||||
/* get from mAuthMgr */
|
||||
AuthGPG::getAuthGPG()->getPGPSignedList(ids);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool p3Peers::getPGPAcceptedList(std::list<std::string> &ids)
|
||||
{
|
||||
#ifdef P3PEERS_DEBUG
|
||||
std::cerr << "p3Peers::getPGPOthersList()";
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
|
||||
/* get from mAuthMgr */
|
||||
AuthGPG::getAuthGPG()->getPGPSignedList(ids);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool p3Peers::getPGPDetails(std::string id, RsPeerDetails &d)
|
||||
{
|
||||
#ifdef P3PEERS_DEBUG
|
||||
|
|
@ -903,18 +940,22 @@ bool p3Peers::SignGPGCertificate(std::string id)
|
|||
return AuthGPG::getAuthGPG()->SignCertificateLevel0(id);
|
||||
}
|
||||
|
||||
bool p3Peers::TrustCertificate(std::string id, bool trust)
|
||||
bool p3Peers::TrustGPGCertificate(std::string id, uint32_t trustlvl)
|
||||
{
|
||||
#ifdef P3PEERS_DEBUG
|
||||
std::cerr << "p3Peers::TrustCertificate() " << id;
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
|
||||
return AuthSSL::getAuthSSL()->TrustCertificate(id, trust);
|
||||
//check if we've got a ssl or gpg id
|
||||
if (AuthSSL::getAuthSSL()->getGPGId(id) == "") {
|
||||
//if no result then it must be a gpg id
|
||||
return AuthGPG::getAuthGPG()->TrustCertificate(id, trustlvl);
|
||||
} else {
|
||||
return AuthGPG::getAuthGPG()->TrustCertificate(AuthSSL::getAuthSSL()->getGPGId(id), trustlvl);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
int ensureExtension(std::string &name, std::string def_ext)
|
||||
{
|
||||
/* if it has an extension, don't change */
|
||||
|
|
|
|||
|
|
@ -56,18 +56,19 @@ virtual bool getPeerDetails(std::string id, RsPeerDetails &d);
|
|||
/* Using PGP Ids */
|
||||
virtual std::string getPGPOwnId();
|
||||
virtual std::string getPGPId(std::string ssl_id);
|
||||
virtual bool getPGPFriendList(std::list<std::string> &ids);
|
||||
virtual bool getPGPAcceptedList(std::list<std::string> &ids);
|
||||
virtual bool getPGPSignedList(std::list<std::string> &ids);
|
||||
virtual bool getPGPValidList(std::list<std::string> &ids);
|
||||
virtual bool getPGPAllList(std::list<std::string> &ids);
|
||||
virtual bool getPGPDetails(std::string id, RsPeerDetails &d);
|
||||
|
||||
virtual bool getPGPFriendList(std::list<std::string> &ids);
|
||||
|
||||
|
||||
/* Add/Remove Friends */
|
||||
virtual bool addFriend(std::string id);
|
||||
virtual bool removeFriend(std::string id);
|
||||
|
||||
/* get/set third party info about who trusts me */
|
||||
virtual bool isTrustingMe(std::string id) const ;
|
||||
|
||||
/* Network Stuff */
|
||||
virtual bool connectAttempt(std::string id);
|
||||
virtual bool setLocalAddress(std::string id, std::string addr, uint16_t port);
|
||||
|
|
@ -90,7 +91,7 @@ virtual bool SaveCertificateToFile(std::string id, std::string fname);
|
|||
virtual std::string SaveCertificateToString(std::string id);
|
||||
|
||||
virtual bool SignGPGCertificate(std::string id);
|
||||
virtual bool TrustCertificate(std::string id, bool trust);
|
||||
virtual bool TrustGPGCertificate(std::string id, uint32_t trustlvl);
|
||||
|
||||
private:
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue