Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-19 11:54:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Started implementation of ban list. For now, just gathers the list of banned IPs from

Browse source 
the DHT and is not used to reject IPs yet (the DHT list is, even if DHT is desactivated).
Next steps: GUI with switch controls, exchange of IP ban lists between friends, handling IP ranges.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8297 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2015-05-26 21:17:09 +00:00
parent 5200f30a32
commit 047977b645
13 changed files with 337 additions and 204 deletions
Download patch file Download diff file Expand all files Collapse all files

62
libretroshare/src/services/p3banlist.cc
View file

@ -30,12 +30,14 @@
#include "services/p3banlist.h"
#include "serialiser/rsbanlistitems.h"
#include "retroshare/rsdht.h"
#include <sys/time.h>
/****
* #define DEBUG_BANLIST 1
****/
#define DEBUG_BANLIST 1
/* DEFINE INTERFACE POINTER! */
@ -48,6 +50,8 @@
#define RSBANLIST_SOURCE_FRIEND 1
#define RSBANLIST_SOURCE_FOF 2
#define RSBANLIST_DELAY_BETWEEN_TALK_TO_DHT 60 // should be more: e.g. 600 secs.
/************ IMPLEMENTATION NOTES *********************************
*
@ -55,14 +59,15 @@
* we distribute and track the network list of bad peers.
*
*/
RsBanList *rsBanList = NULL ;
p3BanList::p3BanList(p3ServiceControl *sc, p3NetMgr *nm)
:p3Service(), mBanMtx("p3BanList"), mServiceCtrl(sc), mNetMgr(nm)
{
addSerialType(new RsBanListSerialiser());
mSentListTime = 0;
mSentListTime = 0;
mLastDhtInfoRequest = 0 ;
}
@ -79,16 +84,38 @@ RsServiceInfo p3BanList::getServiceInfo()
BANLIST_APP_MAJOR_VERSION,
BANLIST_APP_MINOR_VERSION,
BANLIST_MIN_MAJOR_VERSION,
BANLIST_MIN_MINOR_VERSION);
BANLIST_MIN_MINOR_VERSION);
}
bool p3BanList::isAddressAccepted(const sockaddr_storage &addr)
{
// we should normally work this including entire ranges of IPs. For now, just check the exact IPs.
if(mBanSet.find(addr) != mBanSet.end())
return false ;
return true ;
}
void p3BanList::getListOfBannedIps(std::list<BanListPeer> &lst)
{
for(std::map<sockaddr_storage,BanListPeer>::const_iterator it(mBanSet.begin());it!=mBanSet.end();++it)
lst.push_back(it->second) ;
}
int p3BanList::tick()
{
processIncoming();
sendPackets();
time_t now = time(NULL) ;
if(mLastDhtInfoRequest + RSBANLIST_DELAY_BETWEEN_TALK_TO_DHT < now)
{
getDhtInfo() ;
mLastDhtInfoRequest = now;
}
return 0;
}
@ -97,6 +124,31 @@ int p3BanList::status()
return 1;
}
void p3BanList::getDhtInfo()
{
// Get the list of masquerading peers from the DHT. Add them as potential IPs to be banned.
// Don't make them active. Just insert them in the list.
std::list<RsDhtFilteredPeer> filtered_peers ;
rsDht->getListOfBannedIps(filtered_peers) ;
std::cerr << "p3BanList::getDhtInfo() Got list of banned IPs." << std::endl;
RsPeerId ownId = mServiceCtrl->getOwnId();
for(std::list<RsDhtFilteredPeer>::const_iterator it(filtered_peers.begin());it!=filtered_peers.end();++it)
{
std::cerr << " filtered peer: " << rs_inet_ntoa((*it).mAddr.sin_addr) << std::endl;
int int_reason = 0 ;
int age = 0 ;
sockaddr_storage ad = *(sockaddr_storage*)&(*it).mAddr ;
addBanEntry(ownId, ad, RSBANLIST_SOURCE_SELF, int_reason, age);
}
condenseBanSources_locked() ;
}
/***** Implementation ******/
@ -187,7 +239,7 @@ bool p3BanList::addBanEntry(const RsPeerId &peerId, const struct sockaddr_storag
bool updated = false;
#ifdef DEBUG_BANLIST
std::cerr << "p3BanList::addBanEntry() Addr: " << rs_inet_ntoa(addr.sin_addr) << " Level: " << level;
std::cerr << "p3BanList::addBanEntry() Addr: " << sockaddr_storage_iptostring(addr) << " Level: " << level;
std::cerr << " Reason: " << reason << " Age: " << age;
std::cerr << std::endl;
#endif
@ -418,7 +470,7 @@ void p3BanList::sendBanLists()
for(it = idList.begin(); it != idList.end(); ++it)
{
#ifdef DEBUG_BANLIST
std::cerr << "p3BanList::sendBanList() To: " << *it;
std::cerr << "p3BanList::sendBanList() To: " << *it;
std::cerr << std::endl;
#endif
sendBanSet(*it);