Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-23 05:44:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove malformed IPs from saveList.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8341 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2015-06-01 22:17:14 +00:00
parent 96cccbbc75
commit a8bc2d8d64
1 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -40,8 +40,8 @@
/**** /****
* #define DEBUG_BANLIST 1 * #define DEBUG_BANLIST 1
****/ ****/
#define DEBUG_BANLIST 1 // #define DEBUG_BANLIST 1
#define DEBUG_BANLIST_CONDENSE 1 // #define DEBUG_BANLIST_CONDENSE 1
/* DEFINE INTERFACE POINTER! */ /* DEFINE INTERFACE POINTER! */
@ -247,7 +247,9 @@ bool p3BanList::isAddressAccepted(const sockaddr_storage &addr, uint32_t checkin
if(!mIPFilteringEnabled) if(!mIPFilteringEnabled)
return true ; return true ;
#ifdef DEBUG_BANLIST
std::cerr << "isAddressAccepted(): tested addr=" << sockaddr_storage_iptostring(addr) << ", checking flags=" << checking_flags ; std::cerr << "isAddressAccepted(): tested addr=" << sockaddr_storage_iptostring(addr) << ", checking flags=" << checking_flags ;
#endif
// we should normally work this including entire ranges of IPs. For now, just check the exact IPs. // we should normally work this including entire ranges of IPs. For now, just check the exact IPs.
@ -264,7 +266,9 @@ bool p3BanList::isAddressAccepted(const sockaddr_storage &addr, uint32_t checkin
{ {
if(check_result != NULL) if(check_result != NULL)
*check_result = RSBANLIST_CHECK_RESULT_ACCEPTED ; *check_result = RSBANLIST_CHECK_RESULT_ACCEPTED ;
#ifdef DEBUG_BANLIST
std::cerr << ". Address is in whitelist. Accepting" << std::endl; std::cerr << ". Address is in whitelist. Accepting" << std::endl;
#endif
return true ; return true ;
} }
@ -272,13 +276,17 @@ bool p3BanList::isAddressAccepted(const sockaddr_storage &addr, uint32_t checkin
{ {
if(check_result != NULL) if(check_result != NULL)
*check_result = RSBANLIST_CHECK_RESULT_NOT_WHITELISTED ; *check_result = RSBANLIST_CHECK_RESULT_NOT_WHITELISTED ;
#ifdef DEBUG_BANLIST
std::cerr << ". Address is not whitelist, and whitelist is required. Rejecting" << std::endl; std::cerr << ". Address is not whitelist, and whitelist is required. Rejecting" << std::endl;
#endif
return false ; return false ;
} }
if(!(checking_flags & RSBANLIST_CHECKING_FLAGS_BLACKLIST)) if(!(checking_flags & RSBANLIST_CHECKING_FLAGS_BLACKLIST))
{ {
#ifdef DEBUG_BANLIST
std::cerr << ". No blacklisting required. Accepting." << std::endl; std::cerr << ". No blacklisting required. Accepting." << std::endl;
#endif
if(check_result != NULL) if(check_result != NULL)
*check_result = RSBANLIST_CHECK_RESULT_ACCEPTED ; *check_result = RSBANLIST_CHECK_RESULT_ACCEPTED ;
return true; return true;
@ -677,7 +685,10 @@ bool p3BanList::loadList(std::list<RsItem*>& load)
BanListPeer blp ; BanListPeer blp ;
blp.fromRsTlvBanListEntry(*it2) ; blp.fromRsTlvBanListEntry(*it2) ;
if(sockaddr_storage_isValidNet(blp.addr))
bl.mBanPeers[blp.addr] = blp ; bl.mBanPeers[blp.addr] = blp ;
else
std::cerr << "(WW) removed wrong address " << sockaddr_storage_iptostring(blp.addr) << std::endl;
} }
} }
else if(citem->type == RSBANLIST_TYPE_BLACKLIST) else if(citem->type == RSBANLIST_TYPE_BLACKLIST)
@ -689,7 +700,10 @@ bool p3BanList::loadList(std::list<RsItem*>& load)
BanListPeer blp ; BanListPeer blp ;
blp.fromRsTlvBanListEntry(*it2) ; blp.fromRsTlvBanListEntry(*it2) ;
if(sockaddr_storage_isValidNet(blp.addr))
mBanRanges[blp.addr] = blp ; mBanRanges[blp.addr] = blp ;
else
std::cerr << "(WW) removed wrong address " << sockaddr_storage_iptostring(blp.addr) << std::endl;
} }
} }
else if(citem->type == RSBANLIST_TYPE_WHITELIST) else if(citem->type == RSBANLIST_TYPE_WHITELIST)
@ -701,7 +715,10 @@ bool p3BanList::loadList(std::list<RsItem*>& load)
BanListPeer blp ; BanListPeer blp ;
blp.fromRsTlvBanListEntry(*it2) ; blp.fromRsTlvBanListEntry(*it2) ;
if(sockaddr_storage_isValidNet(blp.addr))
mWhiteListedRanges[blp.addr] = blp ; mWhiteListedRanges[blp.addr] = blp ;
else
std::cerr << "(WW) removed wrong address " << sockaddr_storage_iptostring(blp.addr) << std::endl;
std::cerr << "Read whitelisted range " << sockaddr_storage_iptostring(blp.addr) << "/" << blp.masked_bytes << std::endl; std::cerr << "Read whitelisted range " << sockaddr_storage_iptostring(blp.addr) << "/" << blp.masked_bytes << std::endl;
} }