diff --git a/RetroShare.pro b/RetroShare.pro index d53d37a71..0b009cfd5 100644 --- a/RetroShare.pro +++ b/RetroShare.pro @@ -23,13 +23,9 @@ TEMPLATE = subdirs SUBDIRS += openpgpsdk openpgpsdk.file = openpgpsdk/src/openpgpsdk.pro -retrotor { - libretroshare.depends = openpgpsdk -} else { - SUBDIRS += libbitdht - libbitdht.file = libbitdht/src/libbitdht.pro - libretroshare.depends = openpgpsdk libbitdht -} +SUBDIRS += libbitdht +libbitdht.file = libbitdht/src/libbitdht.pro +libretroshare.depends = openpgpsdk libbitdht SUBDIRS += libretroshare libretroshare.file = libretroshare/src/libretroshare.pro @@ -45,15 +41,12 @@ retroshare_gui { retroshare_gui.target = retroshare_gui } -retrotor { -} else { retroshare_nogui { SUBDIRS += retroshare_nogui retroshare_nogui.file = retroshare-nogui/src/retroshare-nogui.pro retroshare_nogui.depends = libretroshare libresapi retroshare_nogui.target = retroshare_nogui } -} retroshare_android_service { SUBDIRS += retroshare_android_service diff --git a/libresapi/src/api/ApiServerMHD.cpp b/libresapi/src/api/ApiServerMHD.cpp index 83861fe6c..c14c4ea71 100644 --- a/libresapi/src/api/ApiServerMHD.cpp +++ b/libresapi/src/api/ApiServerMHD.cpp @@ -94,7 +94,7 @@ namespace resource_api{ std::string getDefaultDocroot() { - return RsAccounts::DataDirectory(false) + "/webui"; + return RsAccounts::systemDataDirectory(false) + "/webui"; } const char* API_ENTRY_PATH = "/api/v2"; diff --git a/libresapi/src/api/RsControlModule.cpp b/libresapi/src/api/RsControlModule.cpp index 1972cf4e1..5caca6b8b 100644 --- a/libresapi/src/api/RsControlModule.cpp +++ b/libresapi/src/api/RsControlModule.cpp @@ -467,6 +467,8 @@ void RsControlModule::handleCreateLocation(Request &req, Response &resp) req.mStream << makeKeyValueReference("hidden_adress", hidden_address) << makeKeyValueReference("hidden_port", hidden_port_str); uint16_t hidden_port = 0; + bool auto_tor = false ; // to be set by API, so disabled until then. + if(hidden_address.empty() != hidden_port_str.empty()) { resp.setFail("you must both specify string hidden_adress and string hidden_port to create a hidden node."); @@ -539,7 +541,7 @@ void RsControlModule::handleCreateLocation(Request &req, Response &resp) mPassword = pgp_password; mFixedPassword = pgp_password; } - bool ssl_ok = RsAccounts::GenerateSSLCertificate(pgp_id, "", ssl_name, "", hidden_port!=0, ssl_password, ssl_id, err_string); + bool ssl_ok = RsAccounts::createNewAccount(pgp_id, "", ssl_name, "", hidden_port!=0, auto_tor!=0, ssl_password, ssl_id, err_string); // clear fixed password to restore normal password operation // { diff --git a/libretroshare/src/file_sharing/hash_cache.cc b/libretroshare/src/file_sharing/hash_cache.cc index c67216e86..d40f49581 100644 --- a/libretroshare/src/file_sharing/hash_cache.cc +++ b/libretroshare/src/file_sharing/hash_cache.cc @@ -27,6 +27,7 @@ #include "hash_cache.h" #include "filelist_io.h" #include "file_sharing_defaults.h" +#include "retroshare/rsinit.h" //#define HASHSTORAGE_DEBUG 1 @@ -478,7 +479,7 @@ bool HashStorage::try_load_import_old_hash_cache() { // compute file name - std::string base_dir = rsAccounts->PathAccountDirectory(); + std::string base_dir = RsAccounts::AccountDirectory(); std::string old_cache_filename = base_dir + "/" + "file_cache.bin" ; // check for unencrypted diff --git a/libretroshare/src/file_sharing/p3filelists.cc b/libretroshare/src/file_sharing/p3filelists.cc index 9458643f1..7448ffd0d 100644 --- a/libretroshare/src/file_sharing/p3filelists.cc +++ b/libretroshare/src/file_sharing/p3filelists.cc @@ -29,7 +29,7 @@ #include "retroshare/rsids.h" #include "retroshare/rspeers.h" -#include "rsserver/rsaccounts.h" +#include "retroshare/rsinit.h" #include "rsserver/p3face.h" @@ -48,7 +48,7 @@ p3FileDatabase::p3FileDatabase(p3ServiceControl *mpeers) { // make sure the base directory exists - std::string base_dir = rsAccounts->PathAccountDirectory(); + std::string base_dir = RsAccounts::AccountDirectory(); if(base_dir.empty()) throw std::runtime_error("Cannot create base directory to store/access file sharing files.") ; diff --git a/libretroshare/src/ft/ftserver.cc b/libretroshare/src/ft/ftserver.cc index 6eccb6c2e..276446d1f 100644 --- a/libretroshare/src/ft/ftserver.cc +++ b/libretroshare/src/ft/ftserver.cc @@ -39,12 +39,12 @@ #include "retroshare/rstypes.h" #include "retroshare/rspeers.h" +#include "retroshare/rsinit.h" #include "rsitems/rsfiletransferitems.h" #include "rsitems/rsserviceids.h" #include "rsserver/p3face.h" -#include "rsserver/rsaccounts.h" #include "turtle/p3turtle.h" #include "util/rsdebug.h" @@ -148,8 +148,9 @@ void ftServer::SetupFtServer() mFtController = new ftController(mFtDataplex, mServiceCtrl, getServiceInfo().mServiceType); mFtController -> setFtSearchNExtra(mFtSearch, mFtExtra); - std::string emergencySaveDir = rsAccounts->PathAccountDirectory(); - std::string emergencyPartialsDir = rsAccounts->PathAccountDirectory(); + std::string emergencySaveDir = RsAccounts::AccountDirectory(); + std::string emergencyPartialsDir = RsAccounts::AccountDirectory(); + if (emergencySaveDir != "") { emergencySaveDir += "/"; diff --git a/libretroshare/src/pqi/pqisslpersongrp.cc b/libretroshare/src/pqi/pqisslpersongrp.cc index e907feb28..7016a2fa6 100644 --- a/libretroshare/src/pqi/pqisslpersongrp.cc +++ b/libretroshare/src/pqi/pqisslpersongrp.cc @@ -32,9 +32,6 @@ static struct RsLog::logInfo pqipersongrpzoneInfo = {RsLog::Default, "pqipersong /**** * #define PQI_DISABLE_UDP 1 ***/ -#ifdef RETROTOR -#define PQI_DISABLE_UDP 1 -#endif /********************************** SSL Specific features ***************************/ diff --git a/libretroshare/src/retroshare/rsinit.h b/libretroshare/src/retroshare/rsinit.h index aeb487fb2..db0e8fab8 100644 --- a/libretroshare/src/retroshare/rsinit.h +++ b/libretroshare/src/retroshare/rsinit.h @@ -121,51 +121,80 @@ class RsInit -/* Seperate Class for dealing with Accounts */ +/* Seperate static Class for dealing with Accounts */ -namespace RsAccounts +class RsAccountsDetail ; + +class RsAccounts { - /** - * @brief ConfigDirectory (normally ~/.retroshare) you can call this method - * even before initialisation (you can't with some other methods) - * @see RsAccountsDetail::PathBaseDirectory() - */ - std::string ConfigDirectory(); +public: + // Should be called once before everything else. + + static bool init(const std::string &opt_base_dir, int& error_code); /** - * @brief DataDirectory - * you can call this method even before initialisation (you can't with some other methods) - * @param check if set to true and directory does not exist, return empty string - * @return path where global platform independent files are stored, like bdboot.txt or webinterface files - */ - std::string DataDirectory(bool check = true); + * @brief ConfigDirectory (normally ~/.retroshare) you can call this method + * even before initialisation (you can't with some other methods) + * + * On linux: ~/.retroshare/ + * + * @see RsAccountsDetail::PathBaseDirectory() + */ + static std::string ConfigDirectory(); - std::string PGPDirectory(); - std::string AccountDirectory(); + /** + * @brief DataDirectory + * you can call this method even before initialisation (you can't with some other methods) + * @param check if set to true and directory does not exist, return empty string + * @return path where global platform independent files are stored, like bdboot.txt or webinterface files + */ + static std::string systemDataDirectory(bool check = true); + static std::string PGPDirectory(); // PGP Accounts. - int GetPGPLogins(std::list &pgpIds); - int GetPGPLoginDetails(const RsPgpId& id, std::string &name, std::string &email); - bool GeneratePGPCertificate(const std::string&, const std::string& email, const std::string& passwd, RsPgpId &pgpId, const int keynumbits, std::string &errString); + static int GetPGPLogins(std::list &pgpIds); + static int GetPGPLoginDetails(const RsPgpId& id, std::string &name, std::string &email); + static bool GeneratePGPCertificate(const std::string&, const std::string& email, const std::string& passwd, RsPgpId &pgpId, const int keynumbits, std::string &errString); // PGP Support Functions. - bool ExportIdentity(const std::string& fname,const RsPgpId& pgp_id) ; - bool ImportIdentity(const std::string& fname,RsPgpId& imported_pgp_id,std::string& import_error) ; - bool ImportIdentityFromString(const std::string& data,RsPgpId& imported_pgp_id,std::string& import_error) ; - void GetUnsupportedKeys(std::map > &unsupported_keys); - bool CopyGnuPGKeyrings() ; + static bool ExportIdentity(const std::string& fname,const RsPgpId& pgp_id) ; + static bool ImportIdentity(const std::string& fname,RsPgpId& imported_pgp_id,std::string& import_error) ; + static bool ImportIdentityFromString(const std::string& data,RsPgpId& imported_pgp_id,std::string& import_error) ; + static void GetUnsupportedKeys(std::map > &unsupported_keys); + static bool CopyGnuPGKeyrings() ; // Rs Accounts - bool SelectAccount(const RsPeerId& id); + static bool SelectAccount(const RsPeerId& id); + static bool GetPreferredAccountId(RsPeerId &id); + static bool GetAccountIds(std::list &ids); - bool GetPreferredAccountId(RsPeerId &id); - bool GetAccountIds(std::list &ids); - bool GetAccountDetails(const RsPeerId &id, - RsPgpId &gpgId, std::string &gpgName, - std::string &gpgEmail, std::string &location); + static bool GetAccountDetails(const RsPeerId &id, RsPgpId &gpgId, std::string &gpgName, std::string &gpgEmail, std::string &location); - bool GenerateSSLCertificate(const RsPgpId& pgp_id, const std::string& org, const std::string& loc, const std::string& country, const bool ishiddenloc, const std::string& passwd, RsPeerId &sslId, std::string &errString); + static bool createNewAccount(const RsPgpId& pgp_id, const std::string& org, const std::string& loc, const std::string& country, bool ishiddenloc,bool is_auto_tor, const std::string& passwd, RsPeerId &sslId, std::string &errString); + static void storeSelectedAccount() ; + + ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + // All methods bellow can only be called ones SelectAccount() as been called. // + ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + + static bool getCurrentAccountOptions(bool& is_hidden,bool& is_tor_auto,bool& is_first_time) ; + + static bool checkCreateAccountDirectory(); // Generate the hierarchy of directories below ~/.retroshare/[SSL dir]/ + static bool isHiddenNode() ; // true if the running node is a hidden node. Used to choose which services to start. + static bool isTorAuto() ; // true if the running node is a hidden node using automated Tor management + + static std::string AccountDirectory(); // linux: ~/.retroshare/[SSL dir]/ + static std::string AccountKeysDirectory(); // linux: ~/.retroshare/[SSL dir]/keys/ + static std::string AccountPathCertFile(); // linux: ~/.retroshare/[SSL dir]/keys/user_cert.pem + static std::string AccountPathKeyFile(); // linux: ~/.retroshare/[SSL dir]/keys/user_pk.pem + static std::string AccountLocationName(); + + static bool lockPreferredAccount() ; // are these methods any useful?? + static void unlockPreferredAccount() ; + +private: + static RsAccountsDetail *rsAccounts ; }; diff --git a/libretroshare/src/rsserver/rsaccounts.cc b/libretroshare/src/rsserver/rsaccounts.cc index f9965cee4..f6120e788 100644 --- a/libretroshare/src/rsserver/rsaccounts.cc +++ b/libretroshare/src/rsserver/rsaccounts.cc @@ -49,7 +49,7 @@ #include // Global singleton declaration of data. -RsAccountsDetail *rsAccounts; +RsAccountsDetail *RsAccounts::rsAccounts; /* Uses private class - so must be hidden */ static bool checkAccount(const std::string &accountdir, AccountDetails &account,std::map >& unsupported_keys); @@ -67,11 +67,8 @@ RsAccountsDetail::RsAccountsDetail() : mAccountsLocked(false), mPreferredId("") bool RsAccountsDetail::loadAccounts() { int failing_accounts ; -#ifdef RETROTOR - getAvailableAccounts(mAccounts,failing_accounts,mUnsupportedKeys,true); -#else +#warning we might need some switch here for hidden nodes only getAvailableAccounts(mAccounts,failing_accounts,mUnsupportedKeys,false); -#endif loadPreferredAccount(); checkPreferredId(); @@ -105,7 +102,7 @@ bool RsAccountsDetail::checkAccountDirectory() return false; } - return setupAccount(PathAccountDirectory()); + return setupAccount(getCurrentAccountPathAccountDirectory()); } #warning we need to clean that up. Login should only ask for a SSL id, instead of a std::string. @@ -219,7 +216,7 @@ std::string RsAccountsDetail::PathBaseDirectory() } -std::string RsAccountsDetail::PathAccountDirectory() +std::string RsAccountsDetail::getCurrentAccountPathAccountDirectory() { std::string path; @@ -235,9 +232,9 @@ std::string RsAccountsDetail::PathAccountDirectory() return path; } -std::string RsAccountsDetail::PathAccountKeysDirectory() +std::string RsAccountsDetail::getCurrentAccountPathAccountKeysDirectory() { - std::string path = PathAccountDirectory(); + std::string path = getCurrentAccountPathAccountDirectory(); if (path.empty()) { return path; @@ -247,9 +244,9 @@ std::string RsAccountsDetail::PathAccountKeysDirectory() return path; } -std::string RsAccountsDetail::PathKeyFile() +std::string RsAccountsDetail::getCurrentAccountPathKeyFile() { - std::string path = PathAccountKeysDirectory(); + std::string path = getCurrentAccountPathAccountKeysDirectory(); if (path.empty()) { return path; @@ -259,9 +256,9 @@ std::string RsAccountsDetail::PathKeyFile() return path; } -std::string RsAccountsDetail::PathCertFile() +std::string RsAccountsDetail::getCurrentAccountPathCertFile() { - std::string path = PathAccountKeysDirectory(); + std::string path = getCurrentAccountPathAccountKeysDirectory(); if (path.empty()) { return path; @@ -270,7 +267,7 @@ std::string RsAccountsDetail::PathCertFile() return path; } -std::string RsAccountsDetail::LocationName() +std::string RsAccountsDetail::getCurrentAccountLocationName() { std::map::const_iterator it; it = mAccounts.find(mPreferredId); @@ -450,7 +447,7 @@ bool RsAccountsDetail::storePreferredAccount() * */ -bool RsAccountsDetail::getPreferredAccountId(RsPeerId &id) +bool RsAccountsDetail::getCurrentAccountId(RsPeerId &id) { id = mPreferredId; return (!mPreferredId.isNull()); @@ -479,7 +476,7 @@ bool RsAccountsDetail::getAccountIds(std::list &ids) } -bool RsAccountsDetail::getAccountDetails(const RsPeerId &id, +bool RsAccountsDetail::getCurrentAccountDetails(const RsPeerId &id, RsPgpId &gpgId, std::string &gpgName, std::string &gpgEmail, std::string &location) { @@ -496,14 +493,16 @@ bool RsAccountsDetail::getAccountDetails(const RsPeerId &id, return false; } -bool RsAccountsDetail::getAccountOptions(bool &ishidden, bool &isFirstTimeRun) +bool RsAccountsDetail::getCurrentAccountOptions(bool &ishidden,bool& isautotor, bool &isFirstTimeRun) { std::map::iterator it; it = mAccounts.find(mPreferredId); if (it != mAccounts.end()) { - ishidden = it->second.mIsHiddenLoc; + ishidden = it->second.mIsHiddenLoc; isFirstTimeRun = it->second.mFirstRun; + isautotor = it->second.mIsAutoTor; + return true; } return false; @@ -598,7 +597,9 @@ bool RsAccountsDetail::getAvailableAccounts(std::map & std::string lochex = (*it).substr(6); // rest of string. bool hidden_location = false; + bool auto_tor = false; bool valid_prefix = false; + if (prefix == "LOC06_") { valid_prefix = true; @@ -607,6 +608,8 @@ bool RsAccountsDetail::getAvailableAccounts(std::map & { valid_prefix = true; hidden_location = true; + + auto_tor = RsDirUtil::checkDirectory(mBaseDirectory+"/"+*it+"/hidden_service"); } else { @@ -626,7 +629,9 @@ bool RsAccountsDetail::getAvailableAccounts(std::map & AccountDetails tmpId; tmpId.mIsHiddenLoc = hidden_location; + tmpId.mIsAutoTor = auto_tor; tmpId.mAccountDir = *it; + if (checkAccount(accountdir, tmpId,unsupported_keys)) { #ifdef GPG_DEBUG @@ -692,7 +697,7 @@ static bool checkAccount(const std::string &accountdir, AccountDetails &account, std::cerr << "issuerName: " << account.mPgpId << " id: " << account.mSslId << std::endl; #endif - if(! rsAccounts->GetPGPLoginDetails(account.mPgpId, account.mPgpName, account.mPgpEmail)) + if(! RsAccounts::GetPGPLoginDetails(account.mPgpId, account.mPgpName, account.mPgpEmail)) return false ; if(!AuthGPG::getAuthGPG()->haveSecretKey(account.mPgpId)) @@ -983,7 +988,7 @@ bool RsAccountsDetail::copyGnuPGKeyrings() /* Create SSL Certificates */ -bool RsAccountsDetail::GenerateSSLCertificate(const RsPgpId& pgp_id, const std::string& org, const std::string& loc, const std::string& country, const bool ishiddenloc, const std::string& passwd, RsPeerId &sslId, std::string &errString) +bool RsAccountsDetail::GenerateSSLCertificate(const RsPgpId& pgp_id, const std::string& org, const std::string& loc, const std::string& country, bool ishiddenloc,bool isautotor, const std::string& passwd, RsPeerId &sslId, std::string &errString) { /* select the PGP Identity first */ if (!SelectPGPAccount(pgp_id)) @@ -1136,6 +1141,7 @@ bool RsAccountsDetail::GenerateSSLCertificate(const RsPgpId& pgp_id, const s newAccount.mLocation = loc; newAccount.mIsHiddenLoc = ishiddenloc; + newAccount.mIsAutoTor = isautotor; newAccount.mFirstRun = true; @@ -1259,11 +1265,51 @@ bool RsInit::LoadPassword(const std::string& id, const std::string& inPwd) * PUBLIC INTERFACE FUNCTIONS ********************************************************************************/ +bool RsAccounts::init(const std::string& opt_base_dir,int& error_code) +{ + rsAccounts = new RsAccountsDetail ; + + // first check config directories, and set bootstrap values. + if(!rsAccounts->setupBaseDirectory(opt_base_dir)) + { + error_code = RS_INIT_BASE_DIR_ERROR ; + return false ; + } + + // Setup PGP stuff. + std::string pgp_dir = rsAccounts->PathPGPDirectory(); + + if(!RsDirUtil::checkCreateDirectory(pgp_dir)) + throw std::runtime_error("Cannot create pgp directory " + pgp_dir) ; + + AuthGPG::init( pgp_dir + "/retroshare_public_keyring.gpg", + pgp_dir + "/retroshare_secret_keyring.gpg", + pgp_dir + "/retroshare_trustdb.gpg", + pgp_dir + "/lock"); + + // load Accounts. + if (!rsAccounts->loadAccounts()) + { + error_code = RS_INIT_NO_KEYRING ; + return false ; + } + return true; +} + // Directories. std::string RsAccounts::ConfigDirectory() { return RsAccountsDetail::PathBaseDirectory(); } -std::string RsAccounts::DataDirectory(bool check) { return RsAccountsDetail::PathDataDirectory(check); } +std::string RsAccounts::systemDataDirectory(bool check) { return RsAccountsDetail::PathDataDirectory(check); } std::string RsAccounts::PGPDirectory() { return rsAccounts->PathPGPDirectory(); } -std::string RsAccounts::AccountDirectory() { return rsAccounts->PathAccountDirectory(); } +std::string RsAccounts::AccountDirectory() { return rsAccounts->getCurrentAccountPathAccountDirectory(); } +std::string RsAccounts::AccountKeysDirectory() { return rsAccounts->getCurrentAccountPathAccountKeysDirectory(); } +std::string RsAccounts::AccountPathCertFile() { return rsAccounts->getCurrentAccountPathCertFile(); } +std::string RsAccounts::AccountPathKeyFile() { return rsAccounts->getCurrentAccountPathKeyFile(); } +std::string RsAccounts::AccountLocationName() { return rsAccounts->getCurrentAccountLocationName(); } + +bool RsAccounts::lockPreferredAccount() { return rsAccounts->lockPreferredAccount();} // are these methods any useful?? +void RsAccounts::unlockPreferredAccount() { rsAccounts->unlockPreferredAccount(); } + +bool RsAccounts::checkCreateAccountDirectory() { return rsAccounts->checkAccountDirectory(); } // PGP Accounts. int RsAccounts::GetPGPLogins(std::list &pgpIds) @@ -1307,6 +1353,7 @@ bool RsAccounts::CopyGnuPGKeyrings() return rsAccounts->copyGnuPGKeyrings(); } +void RsAccounts::storeSelectedAccount() { rsAccounts->storePreferredAccount() ;} // Rs Accounts bool RsAccounts::SelectAccount(const RsPeerId &id) { @@ -1315,7 +1362,40 @@ bool RsAccounts::SelectAccount(const RsPeerId &id) bool RsAccounts::GetPreferredAccountId(RsPeerId &id) { - return rsAccounts->getPreferredAccountId(id); + return rsAccounts->getCurrentAccountId(id); +} + +bool RsAccounts::getCurrentAccountOptions(bool& is_hidden,bool& is_tor_auto,bool& is_first_time) +{ + return rsAccounts->getCurrentAccountOptions(is_hidden,is_tor_auto,is_first_time); +} +bool RsAccounts::isHiddenNode() +{ + bool hidden = false ; + bool is_tor_only = false ; + bool is_first_time = false ; + + if(!getCurrentAccountOptions(hidden,is_tor_only,is_first_time)) + { + std::cerr << "(EE) Critical problem: RsAccounts::getCurrentAccountOptions() called but no account chosen!" << std::endl; + throw std::runtime_error("inconsistent configuration") ; + } + + return hidden ; +} +bool RsAccounts::isTorAuto() +{ + bool hidden = false ; + bool is_tor_only = false ; + bool is_first_time = false ; + + if(!getCurrentAccountOptions(hidden,is_tor_only,is_first_time)) + { + std::cerr << "(EE) Critical problem: RsAccounts::getCurrentAccountOptions() called but no account chosen!" << std::endl; + throw std::runtime_error("inconsistent configuration") ; + } + + return is_tor_only ; } bool RsAccounts::GetAccountIds(std::list &ids) @@ -1327,12 +1407,12 @@ bool RsAccounts::GetAccountDetails(const RsPeerId &id, RsPgpId &pgpId, std::string &pgpName, std::string &pgpEmail, std::string &location) { - return rsAccounts->getAccountDetails(id, pgpId, pgpName, pgpEmail, location); + return rsAccounts->getCurrentAccountDetails(id, pgpId, pgpName, pgpEmail, location); } -bool RsAccounts::GenerateSSLCertificate(const RsPgpId& pgp_id, const std::string& org, const std::string& loc, const std::string& country, const bool ishiddenloc, const std::string& passwd, RsPeerId &sslId, std::string &errString) +bool RsAccounts::createNewAccount(const RsPgpId& pgp_id, const std::string& org, const std::string& loc, const std::string& country, bool ishiddenloc, bool isautotor, const std::string& passwd, RsPeerId &sslId, std::string &errString) { - return rsAccounts->GenerateSSLCertificate(pgp_id, org, loc, country, ishiddenloc, passwd, sslId, errString); + return rsAccounts->GenerateSSLCertificate(pgp_id, org, loc, country, ishiddenloc, isautotor, passwd, sslId, errString); } /********************************************************************************* diff --git a/libretroshare/src/rsserver/rsaccounts.h b/libretroshare/src/rsserver/rsaccounts.h index 2ec87b3e6..518885a47 100644 --- a/libretroshare/src/rsserver/rsaccounts.h +++ b/libretroshare/src/rsserver/rsaccounts.h @@ -49,6 +49,7 @@ class AccountDetails std::string mLocation; bool mIsHiddenLoc; bool mFirstRun; + bool mIsAutoTor; }; @@ -58,9 +59,6 @@ class RsAccountsDetail RsAccountsDetail(); // These functions are externally accessible via RsAccounts namespace. - - - // These functions are accessible from inside libretroshare. bool setupBaseDirectory(std::string alt_basedir); @@ -87,52 +85,43 @@ class RsAccountsDetail // PGP Path is only dependent on BaseDirectory. std::string PathPGPDirectory(); - // Below are dependent on mPreferredId. - std::string PathAccountDirectory(); - std::string PathAccountKeysDirectory(); - std::string PathKeyFile(); - std::string PathCertFile(); - std::string LocationName(); + // Generate a new account based on a given PGP key returns its SSL id and sets it to be the preferred account. + + bool GenerateSSLCertificate(const RsPgpId& gpg_id, const std::string& org, const std::string& loc, const std::string& country, bool ishiddenloc, bool is_auto_tor,const std::string& passwd, RsPeerId &sslId, std::string &errString); // PGP Accounts. int GetPGPLogins(std::list &pgpIds); - int GetPGPLoginDetails(const RsPgpId& id, std::string &name, std::string &email); + int GetPGPLoginDetails(const RsPgpId& id, std::string &name, std::string &email); bool GeneratePGPCertificate(const std::string&, const std::string& email, const std::string& passwd, RsPgpId &pgpId, const int keynumbits, std::string &errString); - - bool SelectPGPAccount(const RsPgpId& pgpId); + bool SelectPGPAccount(const RsPgpId& pgpId); // PGP Support Functions. bool exportIdentity(const std::string& fname,const RsPgpId& pgp_id) ; bool importIdentity(const std::string& fname,RsPgpId& imported_pgp_id,std::string& import_error) ; bool importIdentityFromString(const std::string& data,RsPgpId& imported_pgp_id,std::string& import_error) ; - void getUnsupportedKeys(std::map > &unsupported_keys); + void getUnsupportedKeys(std::map > &unsupported_keys); bool copyGnuPGKeyrings() ; - // Selecting Rs Account. + bool getAccountIds(std::list &ids); bool selectAccountByString(const std::string &prefUserString); bool selectId(const RsPeerId& preferredId); - - // Details of Rs Account. - bool getPreferredAccountId(RsPeerId &id); - bool getAccountDetails(const RsPeerId &id, RsPgpId& gpgId, std::string &gpgName, std::string &gpgEmail, std::string &location); - - bool getAccountOptions(bool &ishidden, bool &isFirstTimeRun); - - - bool getAccountIds(std::list &ids); - - bool GenerateSSLCertificate(const RsPgpId& gpg_id, - const std::string& org, const std::string& loc, - const std::string& country, const bool ishiddenloc, - const std::string& passwd, RsPeerId &sslId, - std::string &errString); - - // From init file. bool storePreferredAccount(); bool loadPreferredAccount(); + // Details of current Rs Account. + bool getCurrentAccountId(RsPeerId &id); + bool getCurrentAccountDetails(const RsPeerId &id, RsPgpId& gpgId, std::string &gpgName, std::string &gpgEmail, std::string &location); + bool getCurrentAccountOptions(bool &ishidden, bool &isautotor, bool &isFirstTimeRun); + + std::string getCurrentAccountPathAccountDirectory(); + std::string getCurrentAccountPathAccountKeysDirectory(); + std::string getCurrentAccountPathKeyFile(); + std::string getCurrentAccountPathCertFile(); + std::string getCurrentAccountLocationName(); + + private: bool checkPreferredId(); @@ -155,6 +144,4 @@ class RsAccountsDetail std::map > mUnsupportedKeys ; }; -// Global singleton declaration of data. -extern RsAccountsDetail *rsAccounts; diff --git a/libretroshare/src/rsserver/rsinit.cc b/libretroshare/src/rsserver/rsinit.cc index 29dcaba79..2c63704b4 100644 --- a/libretroshare/src/rsserver/rsinit.cc +++ b/libretroshare/src/rsserver/rsinit.cc @@ -431,26 +431,10 @@ int RsInit::InitRetroShare(int argc, char **argv, bool /* strictCheck */) AuthSSL::AuthSSLInit(); AuthSSL::getAuthSSL() -> InitAuth(NULL, NULL, NULL, ""); - rsAccounts = new RsAccountsDetail(); + int error_code ; - // first check config directories, and set bootstrap values. - if(!rsAccounts->setupBaseDirectory(opt_base_dir)) - return RS_INIT_BASE_DIR_ERROR ; - - // Setup PGP stuff. - std::string pgp_dir = rsAccounts->PathPGPDirectory(); - - if(!RsDirUtil::checkCreateDirectory(pgp_dir)) - throw std::runtime_error("Cannot create pgp directory " + pgp_dir) ; - - AuthGPG::init( pgp_dir + "/retroshare_public_keyring.gpg", - pgp_dir + "/retroshare_secret_keyring.gpg", - pgp_dir + "/retroshare_trustdb.gpg", - pgp_dir + "/lock"); - - // load Accounts. - if (!rsAccounts->loadAccounts()) - return RS_INIT_NO_KEYRING ; + if(!RsAccounts::init(opt_base_dir,error_code)) + return error_code ; // choose alternative account. if(prefUserString != "") @@ -464,7 +448,7 @@ int RsInit::InitRetroShare(int argc, char **argv, bool /* strictCheck */) return RS_INIT_AUTH_FAILED ; } - if(rsAccounts->selectId(ssl_id)) + if(RsAccounts::SelectAccount(ssl_id)) { std::cerr << "Auto-selectng account ID " << ssl_id << std::endl; return RS_INIT_HAVE_ACCOUNT; @@ -474,7 +458,7 @@ int RsInit::InitRetroShare(int argc, char **argv, bool /* strictCheck */) #ifdef RS_AUTOLOGIN /* check that we have selected someone */ RsPeerId preferredId; - bool existingUser = rsAccounts->getPreferredAccountId(preferredId); + bool existingUser = RsAccounts::GetPreferredAccountId(preferredId); if (existingUser) { @@ -550,44 +534,43 @@ bool RsInit::LoadPassword(const std::string& inPwd) */ int RsInit::LockAndLoadCertificates(bool autoLoginNT, std::string& lockFilePath) { - if (!rsAccounts->lockPreferredAccount()) + try { - return 3; // invalid PreferredAccount. + if (!RsAccounts::lockPreferredAccount()) + throw 3; // invalid PreferredAccount. + + // Logic that used to be external to RsInit... + RsPeerId accountId; + if (!RsAccounts::GetPreferredAccountId(accountId)) + throw 3; // invalid PreferredAccount; + + RsPgpId pgpId; + std::string pgpName, pgpEmail, location; + + if(!RsAccounts::GetAccountDetails(accountId, pgpId, pgpName, pgpEmail, location)) + throw 3; // invalid PreferredAccount; + + if(0 == AuthGPG::getAuthGPG() -> GPGInit(pgpId)) + throw 3; // PGP Error. + + int retVal = LockConfigDirectory(RsAccounts::AccountDirectory(), lockFilePath); + + if(retVal > 0) + throw retVal ; + + if(LoadCertificates(autoLoginNT) != 1) + { + UnlockConfigDirectory(); + throw 3; + } + + return 0; } - - int retVal = 0; - - // Logic that used to be external to RsInit... - RsPeerId accountId; - if (!rsAccounts->getPreferredAccountId(accountId)) - { - retVal = 3; // invalid PreferredAccount; - } - - RsPgpId pgpId; - std::string pgpName, pgpEmail, location; - - if (retVal == 0 && !rsAccounts->getAccountDetails(accountId, pgpId, pgpName, pgpEmail, location)) - retVal = 3; // invalid PreferredAccount; - - if (retVal == 0 && !rsAccounts->SelectPGPAccount(pgpId)) - retVal = 3; // PGP Error. - - if(retVal == 0) - retVal = LockConfigDirectory(rsAccounts->PathAccountDirectory(), lockFilePath); - - if(retVal == 0 && LoadCertificates(autoLoginNT) != 1) - { - UnlockConfigDirectory(); - retVal = 3; - } - - if(retVal != 0) - { - rsAccounts->unlockPreferredAccount(); - } - - return retVal; + catch(int retVal) + { + RsAccounts::unlockPreferredAccount(); + return retVal ; + } } @@ -603,20 +586,20 @@ int RsInit::LockAndLoadCertificates(bool autoLoginNT, std::string& lockFilePath int RsInit::LoadCertificates(bool autoLoginNT) { RsPeerId preferredId; - if (!rsAccounts->getPreferredAccountId(preferredId)) + if (!RsAccounts::GetPreferredAccountId(preferredId)) { std::cerr << "No Account Selected" << std::endl; return 0; } - if (rsAccounts->PathCertFile() == "") + if (RsAccounts::AccountPathCertFile() == "") { std::cerr << "RetroShare needs a certificate" << std::endl; return 0; } - if (rsAccounts->PathKeyFile() == "") + if (RsAccounts::AccountPathKeyFile() == "") { std::cerr << "RetroShare needs a key" << std::endl; return 0; @@ -638,9 +621,10 @@ int RsInit::LoadCertificates(bool autoLoginNT) } } - std::cerr << "rsAccounts->PathKeyFile() : " << rsAccounts->PathKeyFile() << std::endl; + std::cerr << "rsAccounts->PathKeyFile() : " << RsAccounts::AccountPathKeyFile() << std::endl; - if(0 == AuthSSL::getAuthSSL() -> InitAuth(rsAccounts->PathCertFile().c_str(), rsAccounts->PathKeyFile().c_str(), rsInitConfig->passwd.c_str(), rsAccounts->LocationName())) + if(0 == AuthSSL::getAuthSSL() -> InitAuth(RsAccounts::AccountPathCertFile().c_str(), RsAccounts::AccountPathKeyFile().c_str(), rsInitConfig->passwd.c_str(), + RsAccounts::AccountLocationName())) { std::cerr << "SSL Auth Failed!"; return 0 ; @@ -665,7 +649,7 @@ int RsInit::LoadCertificates(bool autoLoginNT) rsInitConfig->gxs_passwd = rsInitConfig->passwd; rsInitConfig->passwd = ""; - rsAccounts->storePreferredAccount(); + RsAccounts::storeSelectedAccount(); return 1; } @@ -673,7 +657,7 @@ int RsInit::LoadCertificates(bool autoLoginNT) bool RsInit::RsClearAutoLogin() { RsPeerId preferredId; - if (!rsAccounts->getPreferredAccountId(preferredId)) + if (!RsAccounts::getSelectedAccountId(preferredId)) { std::cerr << "RsInit::RsClearAutoLogin() No Account Selected" << std::endl; return 0; @@ -833,11 +817,8 @@ RsGRouter *rsGRouter = NULL ; #include "pqi/p3linkmgr.h" #include "pqi/p3netmgr.h" -#ifndef RETROTOR #include "tcponudp/tou.h" #include "tcponudp/rsudpstack.h" -#endif - #ifdef RS_USE_BITDHT #include "dht/p3bitdht.h" @@ -884,6 +865,17 @@ RsControl *RsControl::instance() int RsServer::StartupRetroShare() { + RsPeerId ownId = AuthSSL::getAuthSSL()->OwnId(); + + std::cerr << "========================================================================" << std::endl; + std::cerr << "== RsInit:: starting up Retroshare core ==" << std::endl; + std::cerr << "== ==" << std::endl; + std::cerr << "== Account/SSL ID : " << ownId << " ==" << std::endl; + std::cerr << "== Node type : " << (RsAccounts::isHiddenNode()?"Hidden":"Normal") << " ==" << std::endl; + if(RsAccounts::isHiddenNode()) + std::cerr << "== Tor/I2P configuration : " << (RsAccounts::isTorAuto()?"Tor Auto":"Manual ") << " ==" << std::endl; + std::cerr << "========================================================================" << std::endl; + /**************************************************************************/ /* STARTUP procedure */ /**************************************************************************/ @@ -899,8 +891,6 @@ int RsServer::StartupRetroShare() return false ; } - RsPeerId ownId = AuthSSL::getAuthSSL()->OwnId(); - /**************************************************************************/ /* Any Initial Configuration (Commandline Options) */ /**************************************************************************/ @@ -909,7 +899,7 @@ int RsServer::StartupRetroShare() std::cerr << "set the debugging to crashMode." << std::endl; if ((!rsInitConfig->haveLogFile) && (!rsInitConfig->outStderr)) { - std::string crashfile = rsAccounts->PathAccountDirectory(); + std::string crashfile = RsAccounts::AccountDirectory(); crashfile += "/" + configLogFileName; setDebugCrashMode(crashfile.c_str()); } @@ -921,7 +911,7 @@ int RsServer::StartupRetroShare() } /* check account directory */ - if (!rsAccounts->checkAccountDirectory()) + if (!RsAccounts::checkCreateAccountDirectory()) { std::cerr << "RsServer::StartupRetroShare() - Fatal Error....." << std::endl; std::cerr << "checkAccount failed!" << std::endl; @@ -933,8 +923,8 @@ int RsServer::StartupRetroShare() // Load up Certificates, and Old Configuration (if present) std::cerr << "Load up Certificates, and Old Configuration (if present)." << std::endl; - std::string emergencySaveDir = rsAccounts->PathAccountDirectory(); - std::string emergencyPartialsDir = rsAccounts->PathAccountDirectory(); + std::string emergencySaveDir = RsAccounts::AccountDirectory(); + std::string emergencyPartialsDir = RsAccounts::AccountDirectory(); if (emergencySaveDir != "") { emergencySaveDir += "/"; @@ -948,13 +938,15 @@ int RsServer::StartupRetroShare() /**************************************************************************/ std::cerr << "Load Configuration" << std::endl; - mConfigMgr = new p3ConfigMgr(rsAccounts->PathAccountDirectory()); + mConfigMgr = new p3ConfigMgr(RsAccounts::AccountDirectory()); mGeneralConfig = new p3GeneralConfig(); // Get configuration options from rsAccounts. bool isHiddenNode = false; bool isFirstTimeRun = false; - rsAccounts->getAccountOptions(isHiddenNode, isFirstTimeRun); + bool isTorAuto = false; + + RsAccounts::getCurrentAccountOptions(isHiddenNode,isTorAuto, isFirstTimeRun); /**************************************************************************/ /* setup classes / structures */ @@ -995,36 +987,40 @@ int RsServer::StartupRetroShare() sockaddr_clear(&tmpladdr); tmpladdr.sin_port = htons(rsInitConfig->port); + rsUdpStack *mDhtStack = NULL ; + if(!RsAccounts::isHiddenNode()) + { #ifdef LOCALNET_TESTING - rsUdpStack *mDhtStack = new rsUdpStack(UDP_TEST_RESTRICTED_LAYER, tmpladdr); + mDhtStack = new rsUdpStack(UDP_TEST_RESTRICTED_LAYER, tmpladdr); - /* parse portRestrictions */ - unsigned int lport, uport; + /* parse portRestrictions */ + unsigned int lport, uport; - if (doPortRestrictions) - { - if (2 == sscanf(portRestrictions.c_str(), "%u-%u", &lport, &uport)) + if (doPortRestrictions) { - std::cerr << "Adding Port Restriction (" << lport << "-" << uport << ")"; - std::cerr << std::endl; - } - else - { - std::cerr << "Failed to parse Port Restrictions ... exiting"; - std::cerr << std::endl; - exit(1); - } + if (2 == sscanf(portRestrictions.c_str(), "%u-%u", &lport, &uport)) + { + std::cerr << "Adding Port Restriction (" << lport << "-" << uport << ")"; + std::cerr << std::endl; + } + else + { + std::cerr << "Failed to parse Port Restrictions ... exiting"; + std::cerr << std::endl; + exit(1); + } - RestrictedUdpLayer *url = (RestrictedUdpLayer *) mDhtStack->getUdpLayer(); - url->addRestrictedPortRange(lport, uport); - } + RestrictedUdpLayer *url = (RestrictedUdpLayer *) mDhtStack->getUdpLayer(); + url->addRestrictedPortRange(lport, uport); + } #else //LOCALNET_TESTING #ifdef RS_USE_BITDHT - rsUdpStack *mDhtStack = new rsUdpStack(tmpladdr); + mDhtStack = new rsUdpStack(tmpladdr); #endif #endif //LOCALNET_TESTING + } #ifdef RS_USE_BITDHT @@ -1032,12 +1028,12 @@ int RsServer::StartupRetroShare() #define BITDHT_FILTERED_IP_FILENAME "bdfilter.txt" - std::string bootstrapfile = rsAccounts->PathAccountDirectory(); + std::string bootstrapfile = RsAccounts::AccountDirectory(); if (bootstrapfile != "") bootstrapfile += "/"; bootstrapfile += BITDHT_BOOTSTRAP_FILENAME; - std::string filteredipfile = rsAccounts->PathAccountDirectory(); + std::string filteredipfile = RsAccounts::AccountDirectory(); if (filteredipfile != "") filteredipfile += "/"; filteredipfile += BITDHT_FILTERED_IP_FILENAME; @@ -1077,7 +1073,7 @@ int RsServer::StartupRetroShare() bdbootRF.close(); } #else - std::string installfile = rsAccounts->PathDataDirectory(); + std::string installfile = RsAccounts::systemDataDirectory(); installfile += "/"; installfile += BITDHT_BOOTSTRAP_FILENAME; @@ -1104,96 +1100,105 @@ int RsServer::StartupRetroShare() /* construct the rest of the stack, important to build them in the correct order! */ /* MOST OF THIS IS COMMENTED OUT UNTIL THE REST OF libretroshare IS READY FOR IT! */ - UdpSubReceiver *udpReceivers[RSUDP_NUM_TOU_RECVERS]; - int udpTypes[RSUDP_NUM_TOU_RECVERS]; + p3BitDht *mBitDht = NULL ; + rsDht = NULL ; + rsFixedUdpStack *mProxyStack = NULL ; -#ifdef RS_USE_DHT_STUNNER - // FIRST DHT STUNNER. - UdpStunner *mDhtStunner = new UdpStunner(mDhtStack); - mDhtStunner->setTargetStunPeriod(300); /* slow (5mins) */ - mDhtStack->addReceiver(mDhtStunner); - -#ifdef LOCALNET_TESTING - mDhtStunner->SetAcceptLocalNet(); -#endif -#endif // RS_USE_DHT_STUNNER - - - // NEXT BITDHT. - p3BitDht *mBitDht = new p3BitDht(ownId, mLinkMgr, mNetMgr, mDhtStack, bootstrapfile, filteredipfile); - - /* install external Pointer for Interface */ - rsDht = mBitDht; - - // NEXT THE RELAY (NEED to keep a reference for installing RELAYS) - UdpRelayReceiver *mRelay = new UdpRelayReceiver(mDhtStack); - udpReceivers[RSUDP_TOU_RECVER_RELAY_IDX] = mRelay; /* RELAY Connections (DHT Port) */ - udpTypes[RSUDP_TOU_RECVER_RELAY_IDX] = TOU_RECEIVER_TYPE_UDPRELAY; - mDhtStack->addReceiver(udpReceivers[RSUDP_TOU_RECVER_RELAY_IDX]); - - // LAST ON THIS STACK IS STANDARD DIRECT TOU - udpReceivers[RSUDP_TOU_RECVER_DIRECT_IDX] = new UdpPeerReceiver(mDhtStack); /* standard DIRECT Connections (DHT Port) */ - udpTypes[RSUDP_TOU_RECVER_DIRECT_IDX] = TOU_RECEIVER_TYPE_UDPPEER; - mDhtStack->addReceiver(udpReceivers[RSUDP_TOU_RECVER_DIRECT_IDX]); - - // NOW WE BUILD THE SECOND STACK. - // Create the Second UdpStack... Port should be random (but openable!). - // We do this by binding to xx.xx.xx.xx:0 which which gives us a random port. - - struct sockaddr_in sndladdr; - sockaddr_clear(&sndladdr); - -#ifdef LOCALNET_TESTING - - // // HACK Proxy Port near Dht Port - For Relay Testing. - // uint16_t rndport = rsInitConfig->port + 3; - // sndladdr.sin_port = htons(rndport); - - rsFixedUdpStack *mProxyStack = new rsFixedUdpStack(UDP_TEST_RESTRICTED_LAYER, sndladdr); - - /* portRestrictions already parsed */ - if (doPortRestrictions) + if(!RsAccounts::isHiddenNode()) { - RestrictedUdpLayer *url = (RestrictedUdpLayer *) mProxyStack->getUdpLayer(); - url->addRestrictedPortRange(lport, uport); - } -#else - rsFixedUdpStack *mProxyStack = new rsFixedUdpStack(sndladdr); -#endif + UdpSubReceiver *udpReceivers[RSUDP_NUM_TOU_RECVERS]; + int udpTypes[RSUDP_NUM_TOU_RECVERS]; #ifdef RS_USE_DHT_STUNNER - // FIRSTLY THE PROXY STUNNER. - UdpStunner *mProxyStunner = new UdpStunner(mProxyStack); - mProxyStunner->setTargetStunPeriod(300); /* slow (5mins) */ - mProxyStack->addReceiver(mProxyStunner); + // FIRST DHT STUNNER. + UdpStunner *mDhtStunner = new UdpStunner(mDhtStack); + mDhtStunner->setTargetStunPeriod(300); /* slow (5mins) */ + mDhtStack->addReceiver(mDhtStunner); #ifdef LOCALNET_TESTING - mProxyStunner->SetAcceptLocalNet(); + mDhtStunner->SetAcceptLocalNet(); #endif #endif // RS_USE_DHT_STUNNER - // FINALLY THE PROXY UDP CONNECTIONS - udpReceivers[RSUDP_TOU_RECVER_PROXY_IDX] = new UdpPeerReceiver(mProxyStack); /* PROXY Connections (Alt UDP Port) */ - udpTypes[RSUDP_TOU_RECVER_PROXY_IDX] = TOU_RECEIVER_TYPE_UDPPEER; - mProxyStack->addReceiver(udpReceivers[RSUDP_TOU_RECVER_PROXY_IDX]); + // NEXT BITDHT. - // REAL INITIALISATION - WITH THREE MODES - tou_init((void **) udpReceivers, udpTypes, RSUDP_NUM_TOU_RECVERS); + + mBitDht = new p3BitDht(ownId, mLinkMgr, mNetMgr, mDhtStack, bootstrapfile, filteredipfile); + + // NEXT THE RELAY (NEED to keep a reference for installing RELAYS) + UdpRelayReceiver *mRelay = new UdpRelayReceiver(mDhtStack); + udpReceivers[RSUDP_TOU_RECVER_RELAY_IDX] = mRelay; /* RELAY Connections (DHT Port) */ + udpTypes[RSUDP_TOU_RECVER_RELAY_IDX] = TOU_RECEIVER_TYPE_UDPRELAY; + mDhtStack->addReceiver(udpReceivers[RSUDP_TOU_RECVER_RELAY_IDX]); + + // LAST ON THIS STACK IS STANDARD DIRECT TOU + udpReceivers[RSUDP_TOU_RECVER_DIRECT_IDX] = new UdpPeerReceiver(mDhtStack); /* standard DIRECT Connections (DHT Port) */ + udpTypes[RSUDP_TOU_RECVER_DIRECT_IDX] = TOU_RECEIVER_TYPE_UDPPEER; + mDhtStack->addReceiver(udpReceivers[RSUDP_TOU_RECVER_DIRECT_IDX]); + + /* install external Pointer for Interface */ + rsDht = mBitDht; + + // NOW WE BUILD THE SECOND STACK. + // Create the Second UdpStack... Port should be random (but openable!). + // We do this by binding to xx.xx.xx.xx:0 which which gives us a random port. + + struct sockaddr_in sndladdr; + sockaddr_clear(&sndladdr); + +#ifdef LOCALNET_TESTING + + // // HACK Proxy Port near Dht Port - For Relay Testing. + // uint16_t rndport = rsInitConfig->port + 3; + // sndladdr.sin_port = htons(rndport); + + mProxyStack = new rsFixedUdpStack(UDP_TEST_RESTRICTED_LAYER, sndladdr); + + /* portRestrictions already parsed */ + if (doPortRestrictions) + { + RestrictedUdpLayer *url = (RestrictedUdpLayer *) mProxyStack->getUdpLayer(); + url->addRestrictedPortRange(lport, uport); + } +#else + mProxyStack = new rsFixedUdpStack(sndladdr); +#endif #ifdef RS_USE_DHT_STUNNER - mBitDht->setupConnectBits(mDhtStunner, mProxyStunner, mRelay); + // FIRSTLY THE PROXY STUNNER. + UdpStunner *mProxyStunner = new UdpStunner(mProxyStack); + mProxyStunner->setTargetStunPeriod(300); /* slow (5mins) */ + mProxyStack->addReceiver(mProxyStunner); + +#ifdef LOCALNET_TESTING + mProxyStunner->SetAcceptLocalNet(); +#endif +#endif // RS_USE_DHT_STUNNER + + + // FINALLY THE PROXY UDP CONNECTIONS + udpReceivers[RSUDP_TOU_RECVER_PROXY_IDX] = new UdpPeerReceiver(mProxyStack); /* PROXY Connections (Alt UDP Port) */ + udpTypes[RSUDP_TOU_RECVER_PROXY_IDX] = TOU_RECEIVER_TYPE_UDPPEER; + mProxyStack->addReceiver(udpReceivers[RSUDP_TOU_RECVER_PROXY_IDX]); + + // REAL INITIALISATION - WITH THREE MODES + tou_init((void **) udpReceivers, udpTypes, RSUDP_NUM_TOU_RECVERS); + +#ifdef RS_USE_DHT_STUNNER + mBitDht->setupConnectBits(mDhtStunner, mProxyStunner, mRelay); #else // RS_USE_DHT_STUNNER - mBitDht->setupConnectBits(mRelay); + mBitDht->setupConnectBits(mRelay); #endif // RS_USE_DHT_STUNNER #ifdef RS_USE_DHT_STUNNER - mNetMgr->setAddrAssist(new stunAddrAssist(mDhtStunner), new stunAddrAssist(mProxyStunner)); + mNetMgr->setAddrAssist(new stunAddrAssist(mDhtStunner), new stunAddrAssist(mProxyStunner)); #endif // RS_USE_DHT_STUNNER -// #else //RS_USE_BITDHT -// /* install NULL Pointer for rsDht Interface */ -// rsDht = NULL; + // #else //RS_USE_BITDHT + // /* install NULL Pointer for rsDht Interface */ + // rsDht = NULL; #endif //RS_USE_BITDHT + } /**************************** BITDHT ***********************************/ @@ -1208,7 +1213,7 @@ int RsServer::StartupRetroShare() /****** New Ft Server **** !!! */ ftServer *ftserver = new ftServer(mPeerMgr, serviceCtrl); - ftserver->setConfigDirectory(rsAccounts->PathAccountDirectory()); + ftserver->setConfigDirectory(RsAccounts::AccountDirectory()); ftserver->SetupFtServer() ; @@ -1224,12 +1229,12 @@ int RsServer::StartupRetroShare() std::vector plugins_directories ; #ifdef __APPLE__ - plugins_directories.push_back(rsAccounts->PathDataDirectory()) ; + plugins_directories.push_back(RsAccounts::systemDataDirectory()) ; #endif #if !defined(WINDOWS_SYS) && defined(PLUGIN_DIR) plugins_directories.push_back(std::string(PLUGIN_DIR)) ; #endif - std::string extensions_dir = rsAccounts->PathBaseDirectory() + "/extensions6/" ; + std::string extensions_dir = RsAccounts::ConfigDirectory() + "/extensions6/" ; plugins_directories.push_back(extensions_dir) ; if(!RsDirUtil::checkCreateDirectory(extensions_dir)) @@ -1272,7 +1277,7 @@ int RsServer::StartupRetroShare() #ifdef RS_ENABLE_GXS - std::string currGxsDir = rsAccounts->PathAccountDirectory() + "/gxs"; + std::string currGxsDir = RsAccounts::AccountDirectory() + "/gxs"; RsDirUtil::checkCreateDirectory(currGxsDir); RsNxsNetMgr* nxsMgr = new RsNxsNetMgrImpl(serviceCtrl); @@ -1557,17 +1562,17 @@ int RsServer::StartupRetroShare() #endif // new services to test. -#ifndef RETROTOR - p3BanList *mBanList = new p3BanList(serviceCtrl, mNetMgr); - rsBanList = mBanList ; - pqih -> addService(mBanList, true); -#else - rsBanList = NULL ; -#endif -#ifdef RS_USE_BITDHT - mBitDht->setupPeerSharer(mBanList); -#endif + p3BanList *mBanList = NULL; + + if(!RsAccounts::isHiddenNode()) + { + mBanList = new p3BanList(serviceCtrl, mNetMgr); + rsBanList = mBanList ; + pqih -> addService(mBanList, true); + } + else + rsBanList = NULL ; p3BandwidthControl *mBwCtrl = new p3BandwidthControl(pqih); pqih -> addService(mBwCtrl, true); @@ -1581,30 +1586,34 @@ int RsServer::StartupRetroShare() /**************************************************************************/ + if(!RsAccounts::isHiddenNode()) + { #ifdef RS_USE_BITDHT - mNetMgr->addNetAssistConnect(1, mBitDht); - mNetMgr->addNetListener(mDhtStack); - mNetMgr->addNetListener(mProxyStack); + mBitDht->setupPeerSharer(mBanList); + mNetMgr->addNetAssistConnect(1, mBitDht); + mNetMgr->addNetListener(mDhtStack); + mNetMgr->addNetListener(mProxyStack); #endif #ifdef RS_ENABLE_ZEROCONF - p3ZeroConf *mZeroConf = new p3ZeroConf( - AuthGPG::getAuthGPG()->getGPGOwnId(), ownId, - mLinkMgr, mNetMgr, mPeerMgr); - mNetMgr->addNetAssistConnect(2, mZeroConf); - mNetMgr->addNetListener(mZeroConf); + p3ZeroConf *mZeroConf = new p3ZeroConf( + AuthGPG::getAuthGPG()->getGPGOwnId(), ownId, + mLinkMgr, mNetMgr, mPeerMgr); + mNetMgr->addNetAssistConnect(2, mZeroConf); + mNetMgr->addNetListener(mZeroConf); #endif #ifdef RS_ENABLE_ZCNATASSIST - // Apple's UPnP & NAT-PMP assistance. - p3zcNatAssist *mZcNatAssist = new p3zcNatAssist(); - mNetMgr->addNetAssistFirewall(1, mZcNatAssist); + // Apple's UPnP & NAT-PMP assistance. + p3zcNatAssist *mZcNatAssist = new p3zcNatAssist(); + mNetMgr->addNetAssistFirewall(1, mZcNatAssist); #else - // Original UPnP Interface. - pqiNetAssistFirewall *mUpnpMgr = new upnphandler(); - mNetMgr->addNetAssistFirewall(1, mUpnpMgr); + // Original UPnP Interface. + pqiNetAssistFirewall *mUpnpMgr = new upnphandler(); + mNetMgr->addNetAssistFirewall(1, mUpnpMgr); #endif + } /**************************************************************************/ /* need to Monitor too! */ @@ -1637,9 +1646,10 @@ int RsServer::StartupRetroShare() mConfigMgr->addConfiguration("p3History.cfg" , mHistoryMgr); mConfigMgr->addConfiguration("p3Status.cfg" , mStatusSrv); mConfigMgr->addConfiguration("turtle.cfg" , tr); -#ifndef RETROTOR - mConfigMgr->addConfiguration("banlist.cfg" , mBanList); -#endif + + if(mBanList != NULL) + mConfigMgr->addConfiguration("banlist.cfg" , mBanList); + mConfigMgr->addConfiguration("servicecontrol.cfg", serviceCtrl); mConfigMgr->addConfiguration("reputations.cfg" , mReputations); #ifdef ENABLE_GROUTER @@ -1647,7 +1657,8 @@ int RsServer::StartupRetroShare() #endif #ifdef RS_USE_BITDHT - mConfigMgr->addConfiguration("bitdht.cfg" , mBitDht); + if(mBitDht != NULL) + mConfigMgr->addConfiguration("bitdht.cfg" , mBitDht); #endif #ifdef RS_ENABLE_GXS @@ -1874,7 +1885,8 @@ int RsServer::StartupRetroShare() //mDhtMgr->start(); #ifdef RS_USE_BITDHT - mBitDht->start(); + if(mBitDht != NULL) + mBitDht->start(); #endif /**************************************************************************/ @@ -1910,6 +1922,10 @@ int RsServer::StartupRetroShare() /* Startup this thread! */ start("rs main") ; + std::cerr << "========================================================================" << std::endl; + std::cerr << "== RsInit:: Retroshare core started ==" << std::endl; + std::cerr << "========================================================================" << std::endl; + return 1; } diff --git a/libretroshare/src/rsserver/rsloginhandler.cc b/libretroshare/src/rsserver/rsloginhandler.cc index ed952791f..f94c7115b 100644 --- a/libretroshare/src/rsserver/rsloginhandler.cc +++ b/libretroshare/src/rsserver/rsloginhandler.cc @@ -3,7 +3,7 @@ #include #include "rsloginhandler.h" #include "util/rsdir.h" -#include "rsaccounts.h" +#include "retroshare/rsinit.h" //#define DEBUG_RSLOGINHANDLER 1 @@ -91,7 +91,7 @@ bool RsLoginHandler::getSSLPasswdFromGPGFile(const RsPeerId& ssl_id,std::string& std::string RsLoginHandler::getSSLPasswdFileName(const RsPeerId& /*ssl_id*/) { - return rsAccounts->PathAccountKeysDirectory() + "/" + "ssl_passphrase.pgp"; + return RsAccounts::AccountKeysDirectory() + "/" + "ssl_passphrase.pgp"; } #ifdef RS_AUTOLOGIN @@ -755,7 +755,7 @@ bool RsLoginHandler::clearAutoLogin(const RsPeerId& ssl_id) std::string RsLoginHandler::getAutologinFileName(const RsPeerId& /*ssl_id*/) { - return rsAccounts->PathAccountKeysDirectory() + "/" + "help.dta" ; + return RsAccounts::AccountKeysDirectory() + "/" + "help.dta" ; } #endif // RS_AUTOLOGIN diff --git a/libretroshare/src/util/rsdiscspace.cc b/libretroshare/src/util/rsdiscspace.cc index 9e325ea7b..bf89d30bb 100644 --- a/libretroshare/src/util/rsdiscspace.cc +++ b/libretroshare/src/util/rsdiscspace.cc @@ -25,7 +25,7 @@ #include "rsserver/p3face.h" #include "retroshare/rsfiles.h" #include "retroshare/rsiface.h" -#include "rsserver/rsaccounts.h" +#include "retroshare/rsinit.h" #include "rsdiscspace.h" #include @@ -166,13 +166,13 @@ bool RsDiscSpace::checkForDiscSpace(RsDiscSpace::DiscLocation loc) #endif break ; - case RS_CONFIG_DIRECTORY: rs = crossSystemDiskStats(rsAccounts->PathAccountDirectory().c_str(),free_blocks,block_size) ; + case RS_CONFIG_DIRECTORY: rs = crossSystemDiskStats(RsAccounts::AccountDirectory().c_str(),free_blocks,block_size) ; #ifdef DEBUG_RSDISCSPACE std::cerr << " path = " << RsInit::RsConfigDirectory() << std::endl ; #endif break ; - case RS_PGP_DIRECTORY: rs = crossSystemDiskStats(rsAccounts->PathPGPDirectory().c_str(),free_blocks,block_size) ; + case RS_PGP_DIRECTORY: rs = crossSystemDiskStats(RsAccounts::PGPDirectory().c_str(),free_blocks,block_size) ; #ifdef DEBUG_RSDISCSPACE std::cerr << " path = " << RsInit::RsPGPDirectory() << std::endl ; #endif diff --git a/plugins/VOIP/VOIPPlugin.cpp b/plugins/VOIP/VOIPPlugin.cpp index bc4129e7f..96be0d3ac 100644 --- a/plugins/VOIP/VOIPPlugin.cpp +++ b/plugins/VOIP/VOIPPlugin.cpp @@ -216,7 +216,7 @@ QTranslator* VOIPPlugin::qt_translator(QApplication */*app*/, const QString& lan void VOIPPlugin::qt_sound_events(SoundEvents &events) const { - QDir baseDir = QDir(QString::fromUtf8(RsAccounts::DataDirectory().c_str()) + "/sounds"); + QDir baseDir = QDir(QString::fromUtf8(RsAccounts::systemDataDirectory().c_str()) + "/sounds"); events.addEvent(QApplication::translate("VOIP", "VOIP") , QApplication::translate("VOIP", "Incoming audio call") diff --git a/retroshare-gui/src/TorControl/TorControl.h b/retroshare-gui/src/TorControl/TorControl.h index 4a47384fa..5d208656e 100644 --- a/retroshare-gui/src/TorControl/TorControl.h +++ b/retroshare-gui/src/TorControl/TorControl.h @@ -67,17 +67,17 @@ public: enum Status { Error = -1, - NotConnected, - Connecting, - Authenticating, - Connected + NotConnected = 0x00, + Connecting = 0x01, + Authenticating = 0x02, + Connected = 0x03 }; enum TorStatus { - TorUnknown, - TorOffline, - TorReady + TorUnknown = 0x00, + TorOffline = 0x01, + TorReady = 0x02 }; diff --git a/retroshare-gui/src/TorControl/TorManager.cpp b/retroshare-gui/src/TorControl/TorManager.cpp index 96c45b88b..b538964e9 100644 --- a/retroshare-gui/src/TorControl/TorManager.cpp +++ b/retroshare-gui/src/TorControl/TorManager.cpp @@ -118,12 +118,17 @@ TorProcess *TorManager::process() return d->process; } -QString TorManager::dataDirectory() const +bool TorManager::isTorAvailable() +{ + return !instance()->d->torExecutablePath().isNull(); +} + +QString TorManager::torDataDirectory() const { return d->dataDir; } -void TorManager::setDataDirectory(const QString &path) +void TorManager::setTorDataDirectory(const QString &path) { d->dataDir = QDir::fromNativeSeparators(path); diff --git a/retroshare-gui/src/TorControl/TorManager.h b/retroshare-gui/src/TorControl/TorManager.h index d81d60d57..3db1036d3 100644 --- a/retroshare-gui/src/TorControl/TorManager.h +++ b/retroshare-gui/src/TorControl/TorManager.h @@ -58,18 +58,18 @@ class TorManager : public QObject Q_PROPERTY(Tor::TorControl* control READ control CONSTANT) Q_PROPERTY(bool hasError READ hasError NOTIFY errorChanged) Q_PROPERTY(QString errorMessage READ errorMessage NOTIFY errorChanged) - Q_PROPERTY(QString dataDirectory READ dataDirectory WRITE setDataDirectory) + Q_PROPERTY(QString torDataDirectory READ torDataDirectory WRITE setTorDataDirectory) public: - - explicit TorManager(QObject *parent = 0); + static bool isTorAvailable() ; static TorManager *instance(); TorProcess *process(); TorControl *control(); - QString dataDirectory() const; - void setDataDirectory(const QString &path); + + QString torDataDirectory() const; + void setTorDataDirectory(const QString &path); QString hiddenServiceDirectory() const; void setHiddenServiceDirectory(const QString &path); @@ -100,6 +100,7 @@ signals: void errorChanged(); private: + explicit TorManager(QObject *parent = 0); TorManagerPrivate *d; }; diff --git a/retroshare-gui/src/gui/GenCertDialog.cpp b/retroshare-gui/src/gui/GenCertDialog.cpp index 133bfbc4a..24a1c746e 100644 --- a/retroshare-gui/src/gui/GenCertDialog.cpp +++ b/retroshare-gui/src/gui/GenCertDialog.cpp @@ -34,6 +34,7 @@ #include #include "gui/settings/rsharesettings.h" +#include "TorControl/TorManager.h" #include "util/misc.h" #include @@ -136,7 +137,7 @@ GenCertDialog::GenCertDialog(bool onlyGenerateIdentity, QWidget *parent) //ui.headerFrame->setHeaderText(tr("Create a new profile")); connect(ui.reuse_existing_node_CB, SIGNAL(triggered()), this, SLOT(switchReuseExistingNode())); - connect(ui.adv_checkbox, SIGNAL(triggered()), this, SLOT(setupState())); + connect(ui.adv_checkbox, SIGNAL(toggled(bool)), this, SLOT(setupState())); connect(ui.nodeType_CB, SIGNAL(currentIndexChanged(int)), this, SLOT(setupState())); connect(ui.genButton, SIGNAL(clicked()), this, SLOT(genPerson())); @@ -181,10 +182,10 @@ GenCertDialog::GenCertDialog(bool onlyGenerateIdentity, QWidget *parent) * mark last one as default. */ - QMenu *menu = new QMenu(tr("Advanced options")); - menu->addAction(ui.adv_checkbox); - menu->addAction(ui.reuse_existing_node_CB); - ui.optionsButton->setMenu(menu); + //QMenu *menu = new QMenu(tr("Advanced options")); + //menu->addAction(ui.adv_checkbox); + //menu->addAction(ui.reuse_existing_node_CB); + // ui.optionsButton->setMenu(menu); mAllFieldsOk = false ; mEntropyOk = false ; @@ -195,10 +196,10 @@ GenCertDialog::GenCertDialog(bool onlyGenerateIdentity, QWidget *parent) ui.nodeType_CB->setCurrentIndex(1); ui.nodeType_CB->setEnabled(false); #endif -#ifdef RETROTOR - ui.adv_checkbox->setChecked(false); - ui.adv_checkbox->setVisible(true); -#endif +//#ifdef RETROTOR +// ui.adv_checkbox->setChecked(false); +// ui.adv_checkbox->setVisible(true); +//#endif initKeyList(); setupState(); @@ -259,30 +260,39 @@ void GenCertDialog::setupState() { bool adv_state = ui.adv_checkbox->isChecked(); -#ifdef RETROTOR - bool retrotor = true ; -#else - bool retrotor = false ; -#endif - if(!adv_state) { ui.reuse_existing_node_CB->setChecked(false) ; - ui.nodeType_CB->setCurrentIndex(retrotor?1:0) ; ui.keylength_comboBox->setCurrentIndex(0) ; +// ui.nodeType_CB->setCurrentIndex(0); } - bool hidden_state = ui.nodeType_CB->currentIndex()==1; + ui.reuse_existing_node_CB->setVisible(adv_state) ; + +// ui.nodeType_CB->setVisible(adv_state) ; +// ui.nodeType_LB->setVisible(adv_state) ; +// ui.nodeTypeExplanation_TE->setVisible(adv_state) ; + + bool hidden_state = ui.nodeType_CB->currentIndex()==1 || ui.nodeType_CB->currentIndex()==2; bool generate_new = !ui.reuse_existing_node_CB->isChecked(); + bool tor_auto = ui.nodeType_CB->currentIndex()==1; genNewGPGKey = generate_new; + switch(ui.nodeType_CB->currentIndex()) + { + case 0: ui.nodeTypeExplanation_TE->setText(tr("Your IP is visible to trusted nodes only. You can also connect to hidden nodes if running Tor on your machine. Best choice for sharing with trusted friends.")); + break; + case 1: ui.nodeTypeExplanation_TE->setText(tr("Your IP is hidden. All traffic happens over the Tor network. Best choice if you cannot trust friend nodes with your own IP.")); + break; + case 2: ui.nodeTypeExplanation_TE->setText(tr("Hidden node for advanced users only. Allows to use other proxy solutions such as I2P.")); + break; + } + //ui.no_node_label->setVisible(false); setWindowTitle(generate_new?tr("Create new profile and new Retroshare node"):tr("Create new Retroshare node")); //ui.headerFrame->setHeaderText(generate_new?tr("Create a new profile and node"):tr("Create a new node")); - ui.label_nodeType->setVisible(adv_state && !retrotor) ; - ui.nodeType_CB->setVisible(adv_state && !retrotor) ; ui.reuse_existing_node_CB->setEnabled(adv_state) ; ui.importIdentity_PB->setVisible(adv_state && !generate_new) ; ui.exportIdentity_PB->setVisible(adv_state && !generate_new) ; @@ -318,13 +328,13 @@ void GenCertDialog::setupState() ui.entropy_bar->setVisible(true); ui.genButton->setVisible(true); - ui.hiddenaddr_input->setVisible(hidden_state && !retrotor); - ui.hiddenaddr_label->setVisible(hidden_state && !retrotor); + ui.hiddenaddr_input->setVisible(hidden_state && !tor_auto); + ui.hiddenaddr_label->setVisible(hidden_state && !tor_auto); - ui.hiddenport_label->setVisible(hidden_state && !retrotor); - ui.hiddenport_spinBox->setVisible(hidden_state && !retrotor); + ui.hiddenport_label->setVisible(hidden_state && !tor_auto); + ui.hiddenport_spinBox->setVisible(hidden_state && !tor_auto); - ui.cbUseBob->setVisible(hidden_state && !retrotor); + ui.cbUseBob->setVisible(hidden_state && !tor_auto); if(!mAllFieldsOk) { @@ -470,7 +480,6 @@ void GenCertDialog::genPerson() /* Check the data from the GUI. */ std::string genLoc = ui.node_input->text().toUtf8().constData(); RsPgpId PGPId; - bool isHiddenLoc = false; if(ui.nickname_input->isVisible()) { @@ -503,18 +512,26 @@ void GenCertDialog::genPerson() } } - if (ui.nodeType_CB->currentIndex()==1) + bool isHiddenLoc = (ui.nodeType_CB->currentIndex()>0); + bool isAutoTor = (ui.nodeType_CB->currentIndex()==1); + + if(isAutoTor && !Tor::TorManager::isTorAvailable()) + { + QMessageBox::critical(this,tr("Tor is not available"),tr("No Tor executable has been found on your system. You need to install Tor before creating a hidden identity.")) ; + return ; + } + + if(isHiddenLoc) { std::string hl = ui.hiddenaddr_input->text().toStdString(); uint16_t port = ui.hiddenport_spinBox->value(); + bool useBob = ui.cbUseBob->isChecked(); if (useBob && hl.empty()) hl = "127.0.0.1"; RsInit::SetHiddenLocation(hl, port, useBob); /* parses it */ - - isHiddenLoc = true; } @@ -620,7 +637,7 @@ void GenCertDialog::genPerson() std::string err; this->hide();//To show dialog asking password PGP Key. std::cout << "RsAccounts::GenerateSSLCertificate" << std::endl; - bool okGen = RsAccounts::GenerateSSLCertificate(PGPId, "", genLoc, "", isHiddenLoc, sslPasswd, sslId, err); + bool okGen = RsAccounts::createNewAccount(PGPId, "", genLoc, "", isHiddenLoc, isAutoTor, sslPasswd, sslId, err); if (okGen) { diff --git a/retroshare-gui/src/gui/GenCertDialog.ui b/retroshare-gui/src/gui/GenCertDialog.ui index 28ce3bd88..6c030db02 100644 --- a/retroshare-gui/src/gui/GenCertDialog.ui +++ b/retroshare-gui/src/gui/GenCertDialog.ui @@ -6,8 +6,8 @@ 0 0 - 569 - 426 + 978 + 826 @@ -50,10 +50,7 @@ QFrame::Raised - - - 9 - + @@ -71,7 +68,45 @@ - + + + + + + 75 + true + + + + Node type: + + + + + + + + 0 + 0 + + + + + Standard node + + + + + Hidden node (over Tor) + + + + + Hidden node (Tor/I2P - Manually configured) + + + + @@ -86,13 +121,9 @@ - + - Options - - - - :/icons/svg/options.svg:/icons/svg/options.svg + advanced options @@ -100,16 +131,23 @@ 24 - - false - - - true - + + + + TextLabel + + + Qt::RichText + + + true + + + @@ -233,26 +271,6 @@ - - - - - 0 - 0 - - - - - Standard node - - - - - TOR/I2P Hidden node - - - - @@ -357,6 +375,13 @@ + + + + Use existing profile... + + + @@ -675,28 +700,6 @@ - - - - - 24 - 24 - - - - - - - :/icons/svg/netgraph.svg - - - true - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - @@ -729,22 +732,6 @@ - - - true - - - Advanced options - - - - - true - - - Use existing profile - - name_input diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index ffa7a49fd..07d0b01a5 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -84,12 +84,13 @@ #include "statusbar/ToasterDisable.h" #include "statusbar/SysTrayStatus.h" #include "statusbar/torstatus.h" -#include -#include -#include -#include -#include +#include "retroshare/rsstatus.h" +#include "retroshare/rsiface.h" +#include "retroshare/rspeers.h" +#include "retroshare/rsfiles.h" +#include "retroshare/rsnotify.h" +#include "retroshare/rsinit.h" #include "gui/gxschannels/GxsChannelDialog.h" #include "gui/gxsforums/GxsForumsDialog.h" @@ -250,14 +251,15 @@ MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags flags) if(hiddenmode) { -#ifdef RETROTOR - torstatus = new TorStatus(); - torstatus->setVisible(Settings->valueFromGroup("StatusBar", "ShowTor", QVariant(true)).toBool()); - statusBar()->addWidget(torstatus); - torstatus->getTorStatus(); -#else - torstatus = NULL ; -#endif + if(RsAccounts::isHiddenNode()) + { + torstatus = new TorStatus(); + torstatus->setVisible(Settings->valueFromGroup("StatusBar", "ShowTor", QVariant(true)).toBool()); + statusBar()->addWidget(torstatus); + torstatus->getTorStatus(); + } + else + torstatus = NULL ; natstatus = NULL ; dhtstatus = NULL ; diff --git a/retroshare-gui/src/gui/SoundManager.cpp b/retroshare-gui/src/gui/SoundManager.cpp index 79a2056af..5c538c4c4 100644 --- a/retroshare-gui/src/gui/SoundManager.cpp +++ b/retroshare-gui/src/gui/SoundManager.cpp @@ -76,7 +76,7 @@ SoundManager::SoundManager() : QObject() void SoundManager::soundEvents(SoundEvents &events) { - QDir baseDir = QDir(QString::fromUtf8(RsAccounts::DataDirectory().c_str()) + "/sounds"); + QDir baseDir = QDir(QString::fromUtf8(RsAccounts::systemDataDirectory().c_str()) + "/sounds"); events.mDefaultPath = baseDir.absolutePath(); diff --git a/retroshare-gui/src/gui/chat/ChatStyle.cpp b/retroshare-gui/src/gui/chat/ChatStyle.cpp index 46db56f36..3cda190be 100644 --- a/retroshare-gui/src/gui/chat/ChatStyle.cpp +++ b/retroshare-gui/src/gui/chat/ChatStyle.cpp @@ -149,7 +149,7 @@ static QStringList getBaseDirList() // Search chat styles in config dir and data dir (is application dir for portable) QStringList baseDirs; baseDirs.append(QString::fromUtf8(RsAccounts::ConfigDirectory().c_str())); - baseDirs.append(QString::fromUtf8(RsAccounts::DataDirectory().c_str())); + baseDirs.append(QString::fromUtf8(RsAccounts::systemDataDirectory().c_str())); return baseDirs; } diff --git a/retroshare-gui/src/gui/common/RSTextBrowser.cpp b/retroshare-gui/src/gui/common/RSTextBrowser.cpp index 8c59c815c..5e1a80740 100644 --- a/retroshare-gui/src/gui/common/RSTextBrowser.cpp +++ b/retroshare-gui/src/gui/common/RSTextBrowser.cpp @@ -107,7 +107,7 @@ QVariant RSTextBrowser::loadResource(int type, const QUrl &name) if(fi.exists() && fi.isFile()) { QString cpath = fi.canonicalFilePath(); if (cpath.startsWith(QDir(QString::fromUtf8(RsAccounts::ConfigDirectory().c_str())).canonicalPath(),Qt::CaseInsensitive) - || cpath.startsWith(QDir(QString::fromUtf8(RsAccounts::DataDirectory().c_str())).canonicalPath(),Qt::CaseInsensitive)) + || cpath.startsWith(QDir(QString::fromUtf8(RsAccounts::systemDataDirectory().c_str())).canonicalPath(),Qt::CaseInsensitive)) return QTextBrowser::loadResource(type, name); }} diff --git a/retroshare-gui/src/gui/settings/ServerPage.cpp b/retroshare-gui/src/gui/settings/ServerPage.cpp index dcfe29426..a7885922c 100755 --- a/retroshare-gui/src/gui/settings/ServerPage.cpp +++ b/retroshare-gui/src/gui/settings/ServerPage.cpp @@ -29,11 +29,12 @@ #include -#include -#include -#include -#include -#include +#include "retroshare/rsbanlist.h" +#include "retroshare/rsconfig.h" +#include "retroshare/rsdht.h" +#include "retroshare/rspeers.h" +#include "retroshare/rsturtle.h" +#include "retroshare/rsinit.h" #include #include @@ -62,23 +63,14 @@ /// // Tabs numbers *after* non relevant tabs are removed. So do not use them to add/remove tabs!! -#ifdef RETROTOR -static const uint32_t TAB_HIDDEN_SERVICE_OUTGOING = 0; -static const uint32_t TAB_HIDDEN_SERVICE_INCOMING = 1; - -static const uint32_t TAB_NETWORK = 0; -static const uint32_t TAB_HIDDEN_SERVICE = 1; -static const uint32_t TAB_IP_FILTERS = 99; // This is a trick: these tabs do not exist, so enabling/disabling them has no effect -static const uint32_t TAB_RELAYS = 99; -#else const static uint32_t TAB_HIDDEN_SERVICE_OUTGOING = 0; -const static uint32_t TAB_HIDDEN_SERVICE_INCOMING = 2; +const static uint32_t TAB_HIDDEN_SERVICE_INCOMING = 1; +const static uint32_t TAB_HIDDEN_SERVICE_I2P_BOB = 2; const static uint32_t TAB_NETWORK = 0; -const static uint32_t TAB_IP_FILTERS = 1; -const static uint32_t TAB_HIDDEN_SERVICE = 2; +const static uint32_t TAB_HIDDEN_SERVICE = 1; +const static uint32_t TAB_IP_FILTERS = 2; const static uint32_t TAB_RELAYS = 3; -#endif //#define SERVER_DEBUG 1 @@ -90,13 +82,15 @@ ServerPage::ServerPage(QWidget * parent, Qt::WindowFlags flags) manager = NULL ; -#ifdef RETROTOR + if(RsAccounts::isTorAuto()) + { // Here we use absolute numbers instead of consts defined above, because the consts correspond to the tab number *after* this tab removal. - ui.tabWidget->removeTab(3) ; // remove relays. Not useful in Tor mode. - ui.tabWidget->removeTab(1) ; // remove IP filters. Not useful in Tor mode. + ui.tabWidget->removeTab(TAB_RELAYS) ; // remove relays. Not useful in Tor mode. + ui.tabWidget->removeTab(TAB_IP_FILTERS) ; // remove IP filters. Not useful in Tor mode. + + ui.hiddenServiceTab->removeTab(TAB_HIDDEN_SERVICE_I2P_BOB) ; // remove the Automatic I2P/BOB tab - ui.hiddenServiceTab->removeTab(1) ; // remove the Automatic I2P/BOB tab ui.hiddenpage_proxyAddress_i2p->hide() ; ui.hiddenpage_proxyLabel_i2p->hide() ; ui.hiddenpage_proxyPort_i2p->hide() ; @@ -109,7 +103,8 @@ ServerPage::ServerPage(QWidget * parent, Qt::WindowFlags flags) ui.hiddenpage_outHeader->setText(tr("Tor has been automatically configured by Retroshare. You shouldn't need to change anything here.")) ; ui.hiddenpage_inHeader->setText(tr("Tor has been automatically configured by Retroshare. You shouldn't need to change anything here.")) ; -#endif + } + ui.filteredIpsTable->setHorizontalHeaderItem(COLUMN_RANGE,new QTableWidgetItem(tr("IP Range"))) ; ui.filteredIpsTable->setHorizontalHeaderItem(COLUMN_STATUS,new QTableWidgetItem(tr("Status"))) ; ui.filteredIpsTable->setHorizontalHeaderItem(COLUMN_ORIGIN,new QTableWidgetItem(tr("Origin"))) ; @@ -137,7 +132,6 @@ ServerPage::ServerPage(QWidget * parent, Qt::WindowFlags flags) for(std::list::const_iterator it(ip_servers.begin());it!=ip_servers.end();++it) ui.IPServersLV->addItem(QString::fromStdString(*it)) ; - ui.hiddenServiceTab->setTabEnabled(TAB_HIDDEN_SERVICE_INCOMING, false); ui.gbBob->setEnabled(false); ui.swBobAdvanced->setCurrentIndex(0); @@ -340,8 +334,8 @@ void ServerPage::load() if (mIsHiddenNode) { mHiddenType = detail.hiddenType; - ui.tabWidget->setTabEnabled(TAB_IP_FILTERS,false) ; // ip filter - ui.tabWidget->setTabEnabled(TAB_RELAYS,false) ; // relay + //ui.tabWidget->setTabEnabled(TAB_IP_FILTERS,false) ; // ip filter + //ui.tabWidget->setTabEnabled(TAB_RELAYS,false) ; // relay loadHiddenNode(); return; } diff --git a/retroshare-gui/src/gui/settings/ServerPage.ui b/retroshare-gui/src/gui/settings/ServerPage.ui index f8f55423f..b4315a704 100755 --- a/retroshare-gui/src/gui/settings/ServerPage.ui +++ b/retroshare-gui/src/gui/settings/ServerPage.ui @@ -26,7 +26,7 @@ - 0 + 1 @@ -525,277 +525,6 @@ behind a firewall or a VPN. IPServersLV ipAddressList - - - IP Filters - - - - - - Activate IP filtering - - - - - - - 0 - - - - IP blacklist - - - - - - Qt::CustomContextMenu - - - <html><head/><body><p>This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.</p><p>Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.</p></body></html> - - - true - - - QAbstractItemView::SingleSelection - - - false - - - true - - - - IP range - - - - - Status - - - - - Origin - - - - - Reason - - - - - Comment - - - - - - - - <html><head/><body><p>This is very drastic, be careful. Since masquerading IPs might be actual real IPs, this option might cause disconnection, and will probably force you to add your friends' IPs into the whitelist.</p></body></html> - - - Ban every IP reported by your friends - - - - - - - <html><head/><body><p>Another drastic option. If you use it, be prepared to add your friends' IPs into the whitelist when needed.</p></body></html> - - - Ban every masquerading IP reported by your DHT - - - - - - - - - <html><head/><body><p>If used alone, this option protects you quite well from large scale IP masquerading.</p></body></html> - - - Automatically ban ranges of DHT masquerading IPs starting at - - - - - - - IPs - - - 2 - - - 255 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - IP whitelist - - - - - - Qt::CustomContextMenu - - - <html><head/><body><p>White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.</p><p>The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be in the whitelist. You can change this behavior for each peer in the &quot;Details&quot; window of each Retroshare node. </p></body></html> - - - true - - - QAbstractItemView::SingleSelection - - - false - - - true - - - - IP range - - - - - Status - - - - - Origin - - - - - Reason - - - - - Comment - - - - - - - - - - - - Manual input - - - - - - - - - 0 - 0 - - - - <html><head/><body><p>Enter an IP range. Accepted formats:</p><p>193.190.209.15</p><p>193.190.209.15/24</p><p>193.190.209.15/16</p></body></html> - - - - - - - 16 - - - 32 - - - 8 - - - 24 - - - - - - - - 0 - 0 - - - - <html><head/><body><p>Enter any comment you'd like</p></body></html> - - - - - - - Add to blacklist - - - - - - - Add to whitelist - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - Hidden Service Configuration @@ -810,7 +539,7 @@ behind a firewall or a VPN. - 0 + 1 @@ -981,6 +710,204 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why + + + Incoming + + + + + + <html><head/><body><p>Setup your hidden address (and port if needed)</p></body></html> + + + + + + + + + 10 + + + 65535 + + + + + + + + + <html><head/><body><p>This button simulates a SSL connection to your hidden address using the corresponding proxy. If your hidden node is reachable, it should cause a SSL handshake error, which RS will interpret as a valid connection state. This operation might also cause several &quot;security warning&quot; about connections from your local host IP (127.0.0.1) in the News Feed if you enabled it, which you should interpret as a sign of good communication.</p></body></html> + + + Test + + + + + + + + + 10 + + + 65535 + + + + + + + Service Address + + + + + + + Local Address + + + + + + + <html><head/><body><p>This is your hidden address. It should look like <span style=" font-weight:600;">[something].onion</span> or <span style=" font-weight:600;">[something].b32.i2p. </span>If you configured a hidden service with Tor, the onion address is generated automatically by Tor. You can get it in e.g. <span style=" font-weight:600;">/var/lib/tor/[service name]/hostname</span>. For I2P: Setup a server tunnel ( http://127.0.0.1:7657/i2ptunnelmgr ) and copy it's base32 address when it is started (should end with .b32.i2p)</p></body></html> + + + + + + + <html><head/><body><p>This is the local address to which the hidden service points at your localhost. Most of the time, <span style=" font-weight:600;">127.0.0.1</span> is the right answer.</p></body></html> + + + + + + + + + + 16 + 16 + + + + + + + :/images/ledoff1.png + + + + + + + <html><head/><body><p>This led turns green only if you launch an active test using the above button. </p><p>When it does, it means that your hidden node can be reached from anywhere, using the Tor (resp. I2P) </p><p>network. Congratulations!</p></body></html> + + + incoming ok + + + + + + + + + + + + + Expected Configuration: + + + + + + + + 0 + 0 + + + + + 0 + 10 + + + + + 16777215 + 50 + + + + Qt::ScrollBarAlwaysOff + + + true + + + Please fill in a service address + + + + + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + true + + + To Receive Connections, you must first setup a Tor/I2P Hidden Service. + +For Tor: See torrc and documentation for HOWTO details. + +For I2P: See http://127.0.0.1:7657/i2ptunnelmgr for setting up a server tunnel: +Tunnel Wizard -> Server Tunnel -> Standard -> enter a name -> enter the address and port your RS is using (see Local Address above) -> check 'Auto Start' -> finish! + +Once this is done, paste the Onion/I2P (Base32) Address in the box above. +This is your external address on the Tor/I2P network. +Finally make sure that the Ports match the configuration. + +If you have issues connecting over Tor check the Tor logs too. + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + Automatic I2P/BOB @@ -1456,204 +1383,277 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why - + + + + + + + IP Filters + + + + + + Activate IP filtering + + + + + + + 0 + + - Incoming + IP blacklist - + - - - <html><head/><body><p>Setup your hidden address (and port if needed)</p></body></html> + + + Qt::CustomContextMenu - - - - - - - - 10 - - - 65535 - - - - - - - - - <html><head/><body><p>This button simulates a SSL connection to your hidden address using the corresponding proxy. If your hidden node is reachable, it should cause a SSL handshake error, which RS will interpret as a valid connection state. This operation might also cause several &quot;security warning&quot; about connections from your local host IP (127.0.0.1) in the News Feed if you enabled it, which you should interpret as a sign of good communication.</p></body></html> - - - Test - - - - - - - - - 10 - - - 65535 - - - - - - - Service Address - - - - - - - Local Address - - - - - - - <html><head/><body><p>This is your hidden address. It should look like <span style=" font-weight:600;">[something].onion</span> or <span style=" font-weight:600;">[something].b32.i2p. </span>If you configured a hidden service with Tor, the onion address is generated automatically by Tor. You can get it in e.g. <span style=" font-weight:600;">/var/lib/tor/[service name]/hostname</span>. For I2P: Setup a server tunnel ( http://127.0.0.1:7657/i2ptunnelmgr ) and copy it's base32 address when it is started (should end with .b32.i2p)</p></body></html> - - - - - - - <html><head/><body><p>This is the local address to which the hidden service points at your localhost. Most of the time, <span style=" font-weight:600;">127.0.0.1</span> is the right answer.</p></body></html> - - - - - - - - - - 16 - 16 - - - - - - - :/images/ledoff1.png - - - - - - - <html><head/><body><p>This led turns green only if you launch an active test using the above button. </p><p>When it does, it means that your hidden node can be reached from anywhere, using the Tor (resp. I2P) </p><p>network. Congratulations!</p></body></html> - - - incoming ok - - - - - - - - - - - - - Expected Configuration: - - - - - - - - 0 - 0 - - - - - 0 - 10 - - - - - 16777215 - 50 - - - - Qt::ScrollBarAlwaysOff - - - true - - - Please fill in a service address - - - - - - - - - - 0 - 0 - + + <html><head/><body><p>This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.</p><p>Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.</p></body></html> - - - 16777215 - 16777215 - - - + true - - To Receive Connections, you must first setup a Tor/I2P Hidden Service. - -For Tor: See torrc and documentation for HOWTO details. - -For I2P: See http://127.0.0.1:7657/i2ptunnelmgr for setting up a server tunnel: -Tunnel Wizard -> Server Tunnel -> Standard -> enter a name -> enter the address and port your RS is using (see Local Address above) -> check 'Auto Start' -> finish! - -Once this is done, paste the Onion/I2P (Base32) Address in the box above. -This is your external address on the Tor/I2P network. -Finally make sure that the Ports match the configuration. - -If you have issues connecting over Tor check the Tor logs too. + + QAbstractItemView::SingleSelection + + + false + + + true + + + + IP range + + + + + Status + + + + + Origin + + + + + Reason + + + + + Comment + + + + + + + + <html><head/><body><p>This is very drastic, be careful. Since masquerading IPs might be actual real IPs, this option might cause disconnection, and will probably force you to add your friends' IPs into the whitelist.</p></body></html> + + + Ban every IP reported by your friends - - - Qt::Vertical + + + <html><head/><body><p>Another drastic option. If you use it, be prepared to add your friends' IPs into the whitelist when needed.</p></body></html> - - - 20 - 40 - + + Ban every masquerading IP reported by your DHT - + + + + + + + + <html><head/><body><p>If used alone, this option protects you quite well from large scale IP masquerading.</p></body></html> + + + Automatically ban ranges of DHT masquerading IPs starting at + + + + + + + IPs + + + 2 + + + 255 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + IP whitelist + + + + + + Qt::CustomContextMenu + + + <html><head/><body><p>White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.</p><p>The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be in the whitelist. You can change this behavior for each peer in the &quot;Details&quot; window of each Retroshare node. </p></body></html> + + + true + + + QAbstractItemView::SingleSelection + + + false + + + true + + + + IP range + + + + + Status + + + + + Origin + + + + + Reason + + + + + Comment + + + + + + + + + + + + Manual input + + + + + + + + + 0 + 0 + + + + <html><head/><body><p>Enter an IP range. Accepted formats:</p><p>193.190.209.15</p><p>193.190.209.15/24</p><p>193.190.209.15/16</p></body></html> + + + + + + + 16 + + + 32 + + + 8 + + + 24 + + + + + + + + 0 + 0 + + + + <html><head/><body><p>Enter any comment you'd like</p></body></html> + + + + + + + Add to blacklist + + + + + + + Add to whitelist + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + diff --git a/retroshare-gui/src/gui/settings/rsharesettings.h b/retroshare-gui/src/gui/settings/rsharesettings.h index 99e33b5f2..0dfd3dc7f 100644 --- a/retroshare-gui/src/gui/settings/rsharesettings.h +++ b/retroshare-gui/src/gui/settings/rsharesettings.h @@ -187,9 +187,7 @@ public: /** Sets whether the bandwidth graph is always on top. */ void setBWGraphAlwaysOnTop(bool alwaysOnTop); -#ifdef RETROTOR void setHiddenServiceKey() ; -#endif uint getNewsFeedFlags(); void setNewsFeedFlags(uint flags); diff --git a/retroshare-gui/src/gui/statusbar/torstatus.cpp b/retroshare-gui/src/gui/statusbar/torstatus.cpp index 399243ac4..26c9a896a 100644 --- a/retroshare-gui/src/gui/statusbar/torstatus.cpp +++ b/retroshare-gui/src/gui/statusbar/torstatus.cpp @@ -26,12 +26,11 @@ #include #include "retroshare/rsconfig.h" +#include "retroshare/rsinit.h" #include "util/misc.h" -#ifdef RETROTOR #include "TorControl/TorManager.h" #include "TorControl/TorControl.h" -#endif #include @@ -86,53 +85,56 @@ void TorStatus::getTorStatus() int S = QFontMetricsF(torstatusLabel->font()).height(); -#ifdef RETROTOR - // get Tor status - int tor_control_status = Tor::TorManager::instance()->control()->status(); - int torstatus = Tor::TorManager::instance()->control()->torStatus(); - - QString tor_control_status_str,torstatus_str ; - bool tor_control_ok ; - - switch(tor_control_status) + if(RsAccounts::isTorAuto()) { - default: - case Tor::TorControl::Error : tor_control_ok = false ; tor_control_status_str = "Error" ; break ; - case Tor::TorControl::NotConnected: tor_control_ok = false ; tor_control_status_str = "Not connected" ; break ; - case Tor::TorControl::Connecting: tor_control_ok = false ; tor_control_status_str = "Connecting" ; break ; - case Tor::TorControl::Authenticating: tor_control_ok = false ; tor_control_status_str = "Authenticating" ; break ; - case Tor::TorControl::Connected: tor_control_ok = true ; tor_control_status_str = "Connected" ; break ; - } + // get Tor status + int tor_control_status = Tor::TorManager::instance()->control()->status(); + int torstatus = Tor::TorManager::instance()->control()->torStatus(); - switch(torstatus) - { - default: - case Tor::TorControl::TorUnknown: torstatus_str = "Unknown" ; break ; - case Tor::TorControl::TorOffline: torstatus_str = "Tor offline" ; break ; - case Tor::TorControl::TorReady: torstatus_str = "Tor ready" ; break ; - } + QString tor_control_status_str,torstatus_str ; + bool tor_control_ok ; + + switch(tor_control_status) + { + default: + case Tor::TorControl::Error : tor_control_ok = false ; tor_control_status_str = "Error" ; break ; + case Tor::TorControl::NotConnected: tor_control_ok = false ; tor_control_status_str = "Not connected" ; break ; + case Tor::TorControl::Connecting: tor_control_ok = false ; tor_control_status_str = "Connecting" ; break ; + case Tor::TorControl::Authenticating: tor_control_ok = false ; tor_control_status_str = "Authenticating" ; break ; + case Tor::TorControl::Connected: tor_control_ok = true ; tor_control_status_str = "Connected" ; break ; + } + + switch(torstatus) + { + default: + case Tor::TorControl::TorUnknown: torstatus_str = "Unknown" ; break ; + case Tor::TorControl::TorOffline: torstatus_str = "Tor offline" ; break ; + case Tor::TorControl::TorReady: torstatus_str = "Tor ready" ; break ; + } #define MIN_RS_NET_SIZE 10 - if(torstatus == Tor::TorControl::TorOffline || !online || !tor_control_ok) + if(torstatus == Tor::TorControl::TorOffline || !online || !tor_control_ok) + { + // RED - some issue. + torstatusLabel->setPixmap(QPixmap(":/icons/tor-stopping.png").scaledToHeight(1.5*S,Qt::SmoothTransformation)); + torstatusLabel->setToolTip( text + tr("Tor is currently offline")); + } + else if(torstatus == Tor::TorControl::TorReady && online && tor_control_ok) + { + torstatusLabel->setPixmap(QPixmap(":/icons/tor-on.png").scaledToHeight(1.5*S,Qt::SmoothTransformation)); + torstatusLabel->setToolTip( text + tr("Tor is OK")); + } + else // torstatus == Tor::TorControl::TorUnknown + { + // GRAY. + torstatusLabel->setPixmap(QPixmap(":/icons/no-tor.png").scaledToHeight(1.5*S,Qt::SmoothTransformation)); + torstatusLabel->setToolTip( text + tr("No tor configuration")); + } + } + else { - // RED - some issue. - torstatusLabel->setPixmap(QPixmap(":/icons/tor-stopping.png").scaledToHeight(1.5*S,Qt::SmoothTransformation)); + torstatusLabel->setPixmap(QPixmap(":/icons/tor-stopping.png").scaledToHeight(S,Qt::SmoothTransformation)); torstatusLabel->setToolTip( text + tr("Tor is currently offline")); } - else if(torstatus == Tor::TorControl::TorReady && online && tor_control_ok) - { - torstatusLabel->setPixmap(QPixmap(":/icons/tor-on.png").scaledToHeight(1.5*S,Qt::SmoothTransformation)); - torstatusLabel->setToolTip( text + tr("Tor is OK")); - } - else // torstatus == Tor::TorControl::TorUnknown - { - // GRAY. - torstatusLabel->setPixmap(QPixmap(":/icons/no-tor.png").scaledToHeight(1.5*S,Qt::SmoothTransformation)); - torstatusLabel->setToolTip( text + tr("No tor configuration")); - } -#else - torstatusLabel->setPixmap(QPixmap(":/icons/tor-stopping.png").scaledToHeight(S,Qt::SmoothTransformation)); - torstatusLabel->setToolTip( text + tr("Tor is currently offline")); -#endif } diff --git a/retroshare-gui/src/lang/languagesupport.cpp b/retroshare-gui/src/lang/languagesupport.cpp index 27f720050..a2f6b9ed8 100644 --- a/retroshare-gui/src/lang/languagesupport.cpp +++ b/retroshare-gui/src/lang/languagesupport.cpp @@ -31,7 +31,7 @@ static QMap translatorPlugins; -#define EXTERNAL_TRANSLATION_DIR QString::fromUtf8(RsAccounts::DataDirectory().c_str()) +#define EXTERNAL_TRANSLATION_DIR QString::fromUtf8(RsAccounts::systemDataDirectory().c_str()) /** Initializes the list of available languages. */ QMap diff --git a/retroshare-gui/src/main.cpp b/retroshare-gui/src/main.cpp index acd56d9ef..17c8ee507 100644 --- a/retroshare-gui/src/main.cpp +++ b/retroshare-gui/src/main.cpp @@ -51,10 +51,8 @@ # include "gui/settings/WebuiPage.h" #endif -#ifdef RETROTOR -# include "TorControl/TorManager.h" -# include "TorControl/TorControlWindow.h" -#endif +#include "TorControl/TorManager.h" +#include "TorControl/TorControlWindow.h" #include "retroshare/rsidentity.h" #include "retroshare/rspeers.h" @@ -349,51 +347,58 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO); SoundManager::create(); -#ifdef RETROTOR - // Now that we know the Tor service running, and we know the SSL id, we can make sure it provides a viable hidden service + bool is_hidden_node = false; + bool is_auto_tor = false ; + bool is_first_time = false ; - QString tor_hidden_service_dir = QString::fromStdString(RsAccounts::AccountDirectory()) + QString("/hidden_service/") ; + RsAccounts::getCurrentAccountOptions(is_hidden_node,is_auto_tor,is_first_time); - Tor::TorManager *torManager = Tor::TorManager::instance(); - torManager->setDataDirectory(Rshare::dataDirectory() + QString("/tor/")); - torManager->setHiddenServiceDirectory(tor_hidden_service_dir); // re-set it, because now it's changed to the specific location that is run - - RsDirUtil::checkCreateDirectory(std::string(tor_hidden_service_dir.toUtf8())) ; - - torManager->setupHiddenService(); - - if(! torManager->start() || torManager->hasError()) + if(is_auto_tor) { - QMessageBox::critical(NULL,QObject::tr("Cannot start Tor Manager!"),QObject::tr("Tor cannot be started on your system: \n\n")+torManager->errorMessage()) ; - return 1 ; - } + // Now that we know the Tor service running, and we know the SSL id, we can make sure it provides a viable hidden service - { - TorControlDialog tcd(torManager) ; - QString error_msg ; - tcd.show(); + QString tor_hidden_service_dir = QString::fromStdString(RsAccounts::AccountDirectory()) + QString("/hidden_service/") ; - while(tcd.checkForTor(error_msg) != TorControlDialog::TOR_STATUS_OK || tcd.checkForHiddenService() != TorControlDialog::HIDDEN_SERVICE_STATUS_OK) // runs until some status is reached: either tor works, or it fails. + Tor::TorManager *torManager = Tor::TorManager::instance(); + torManager->setTorDataDirectory(Rshare::dataDirectory() + QString("/tor/")); + torManager->setHiddenServiceDirectory(tor_hidden_service_dir); // re-set it, because now it's changed to the specific location that is run + + RsDirUtil::checkCreateDirectory(std::string(tor_hidden_service_dir.toUtf8())) ; + + torManager->setupHiddenService(); + + if(! torManager->start() || torManager->hasError()) { - QCoreApplication::processEvents(); - rstime::rs_usleep(0.2*1000*1000) ; - - if(!error_msg.isNull()) - { - QMessageBox::critical(NULL,QObject::tr("Cannot start Tor"),QObject::tr("Sorry but Tor cannot be started on your system!\n\nThe error reported is:\"")+error_msg+"\"") ; - return 1; - } - } - - tcd.hide(); - - if(tcd.checkForHiddenService() != TorControlDialog::HIDDEN_SERVICE_STATUS_OK) - { - QMessageBox::critical(NULL,QObject::tr("Cannot start a hidden tor service!"),QObject::tr("It was not possible to start a hidden service.")) ; + QMessageBox::critical(NULL,QObject::tr("Cannot start Tor Manager!"),QObject::tr("Tor cannot be started on your system: \n\n")+torManager->errorMessage()) ; return 1 ; } + + { + TorControlDialog tcd(torManager) ; + QString error_msg ; + tcd.show(); + + while(tcd.checkForTor(error_msg) != TorControlDialog::TOR_STATUS_OK || tcd.checkForHiddenService() != TorControlDialog::HIDDEN_SERVICE_STATUS_OK) // runs until some status is reached: either tor works, or it fails. + { + QCoreApplication::processEvents(); + rstime::rs_usleep(0.2*1000*1000) ; + + if(!error_msg.isNull()) + { + QMessageBox::critical(NULL,QObject::tr("Cannot start Tor"),QObject::tr("Sorry but Tor cannot be started on your system!\n\nThe error reported is:\"")+error_msg+"\"") ; + return 1; + } + } + + tcd.hide(); + + if(tcd.checkForHiddenService() != TorControlDialog::HIDDEN_SERVICE_STATUS_OK) + { + QMessageBox::critical(NULL,QObject::tr("Cannot start a hidden tor service!"),QObject::tr("It was not possible to start a hidden service.")) ; + return 1 ; + } + } } -#endif QSplashScreen splashScreen(QPixmap(":/images/logo/logo_splash.png")/* , Qt::WindowStaysOnTopHint*/); @@ -409,33 +414,35 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO); return 1; } -#ifdef RETROTOR - // Tor works with viable hidden service. Let's use it! + if(is_auto_tor) + { + // Tor works with viable hidden service. Let's use it! - QString service_id ; - QString onion_address ; - uint16_t service_port ; - uint16_t service_target_port ; - uint16_t proxy_server_port ; - QHostAddress service_target_address ; - QHostAddress proxy_server_address ; + QString service_id ; + QString onion_address ; + uint16_t service_port ; + uint16_t service_target_port ; + uint16_t proxy_server_port ; + QHostAddress service_target_address ; + QHostAddress proxy_server_address ; - torManager->getHiddenServiceInfo(service_id,onion_address,service_port,service_target_address,service_target_port); - torManager->getProxyServerInfo(proxy_server_address,proxy_server_port) ; + Tor::TorManager *torManager = Tor::TorManager::instance(); + torManager->getHiddenServiceInfo(service_id,onion_address,service_port,service_target_address,service_target_port); + torManager->getProxyServerInfo(proxy_server_address,proxy_server_port) ; - std::cerr << "Got hidden service info: " << std::endl; - std::cerr << " onion address : " << onion_address.toStdString() << std::endl; - std::cerr << " service_id : " << service_id.toStdString() << std::endl; - std::cerr << " service port : " << service_port << std::endl; - std::cerr << " target port : " << service_target_port << std::endl; - std::cerr << " target address : " << service_target_address.toString().toStdString() << std::endl; + std::cerr << "Got hidden service info: " << std::endl; + std::cerr << " onion address : " << onion_address.toStdString() << std::endl; + std::cerr << " service_id : " << service_id.toStdString() << std::endl; + std::cerr << " service port : " << service_port << std::endl; + std::cerr << " target port : " << service_target_port << std::endl; + std::cerr << " target address : " << service_target_address.toString().toStdString() << std::endl; - std::cerr << "Setting proxy server to " << service_target_address.toString().toStdString() << ":" << service_target_port << std::endl; + std::cerr << "Setting proxy server to " << service_target_address.toString().toStdString() << ":" << service_target_port << std::endl; - rsPeers->setLocalAddress(rsPeers->getOwnId(), service_target_address.toString().toStdString(), service_target_port); - rsPeers->setHiddenNode(rsPeers->getOwnId(), onion_address.toStdString(), service_port); - rsPeers->setProxyServer(RS_HIDDEN_TYPE_TOR, proxy_server_address.toString().toStdString(),proxy_server_port) ; -#endif + rsPeers->setLocalAddress(rsPeers->getOwnId(), service_target_address.toString().toStdString(), service_target_port); + rsPeers->setHiddenNode(rsPeers->getOwnId(), onion_address.toStdString(), service_port); + rsPeers->setProxyServer(RS_HIDDEN_TYPE_TOR, proxy_server_address.toString().toStdString(),proxy_server_port) ; + } Rshare::initPlugins(); diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro index 8899de337..d973e5de8 100644 --- a/retroshare-gui/src/retroshare-gui.pro +++ b/retroshare-gui/src/retroshare-gui.pro @@ -19,11 +19,9 @@ libresapihttpserver { !include("../../libretroshare/src/use_libretroshare.pri"):error("Including") -retrotor { - FORMS += TorControl/TorControlWindow.ui - SOURCES += TorControl/TorControlWindow.cpp - HEADERS += TorControl/TorControlWindow.h -} +FORMS += TorControl/TorControlWindow.ui +SOURCES += TorControl/TorControlWindow.cpp +HEADERS += TorControl/TorControlWindow.h #QMAKE_CFLAGS += -fmudflap #LIBS *= /usr/lib/gcc/x86_64-linux-gnu/4.4/libmudflap.a /usr/lib/gcc/x86_64-linux-gnu/4.4/libmudflapth.a @@ -285,7 +283,8 @@ wikipoos { LIBS *= $$OUT_PWD/../../supportlibs/pegmarkdown/lib/libpegmarkdown.a } -retrotor { +# Tor controller + HEADERS += TorControl/AddOnionCommand.h \ TorControl/AuthenticateCommand.h \ TorControl/GetConfCommand.h \ @@ -324,7 +323,6 @@ SOURCES += TorControl/AddOnionCommand.cpp \ TorControl/SecureRNG.cpp \ TorControl/Settings.cpp \ TorControl/StrUtil.cpp -} # Input HEADERS += rshare.h \ diff --git a/retroshare-gui/src/rshare.cpp b/retroshare-gui/src/rshare.cpp index e83d9eeb7..f1b08396a 100644 --- a/retroshare-gui/src/rshare.cpp +++ b/retroshare-gui/src/rshare.cpp @@ -748,7 +748,7 @@ void Rshare::loadStyleSheet(const QString &sheetName) /* external stylesheet */ file.setFileName(QString("%1/qss/%2%3.qss").arg(QString::fromUtf8(RsAccounts::ConfigDirectory().c_str()), name, sheetName)); if (!file.exists()) { - file.setFileName(QString("%1/qss/%2%3.qss").arg(QString::fromUtf8(RsAccounts::DataDirectory().c_str()), name, sheetName)); + file.setFileName(QString("%1/qss/%2%3.qss").arg(QString::fromUtf8(RsAccounts::systemDataDirectory().c_str()), name, sheetName)); } } if (file.open(QFile::ReadOnly)) { @@ -787,7 +787,7 @@ void Rshare::getAvailableStyleSheets(QMap &styleSheets) styleSheets.insert(name, name); } } - fileInfoList = QDir(QString::fromUtf8(RsAccounts::DataDirectory().c_str()) + "/qss/").entryInfoList(QStringList("*.qss")); + fileInfoList = QDir(QString::fromUtf8(RsAccounts::systemDataDirectory().c_str()) + "/qss/").entryInfoList(QStringList("*.qss")); foreach (fileInfo, fileInfoList) { if (fileInfo.isFile()) { QString name = fileInfo.baseName(); diff --git a/retroshare.pri b/retroshare.pri index 79527a7c8..1e237f97c 100644 --- a/retroshare.pri +++ b/retroshare.pri @@ -91,15 +91,6 @@ no_sqlcipher:CONFIG -= sqlcipher CONFIG *= no_rs_autologin rs_autologin:CONFIG -= no_rs_autologin -# To build RetroShare Tor only version with automatic hidden node setup append -# the following assignation to qmake command line "CONFIG+=retrotor" -CONFIG *= no_retrotor -retrotor { - CONFIG -= no_retrotor - CONFIG *= rs_onlyhiddennode - DEFINES *= RETROTOR -} - # To have only hidden node generation append the following assignation # to qmake command line "CONFIG+=rs_onlyhiddennode" CONFIG *= no_rs_onlyhiddennode @@ -144,7 +135,7 @@ rs_macos10.10:CONFIG -= rs_macos10.11 rs_macos10.12:CONFIG -= rs_macos10.11 # To disable deep search append the following assignation to qmake command line -# "CONFIG+=no_rs_deep_search" +CONFIG+=no_rs_deep_search CONFIG *= rs_deep_search no_rs_deep_search:CONFIG -= rs_deep_search