twisterarmy/twister-core
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-core.git synced 2025-01-22 12:34:24 +00:00
Code Issues Projects Releases Wiki Activity

enforce ID x external IP verification

Browse Source
This commit is contained in:
Miguel Freitas 2013-07-29 15:46:59 -03:00
parent a261f05bdf
commit b59f3749a1
2 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libtorrent/src/kademlia/node.cpp
View File

@ -633,8 +633,11 @@ void node_impl::incoming_request(msg const& m, entry& e)
// if this nodes ID doesn't match its IP, tell it what // if this nodes ID doesn't match its IP, tell it what
// its IP is // its IP is
if (!verify_id(id, m.addr.address())) if (!verify_id(id, m.addr.address())) {
reply["ip"] = address_to_bytes(m.addr.address()); reply["ip"] = address_to_bytes(m.addr.address());
//[MF] enforce ID verification.
return;
}
if (strcmp(query, "ping") == 0) if (strcmp(query, "ping") == 0)
{ {

48
libtorrent/src/kademlia/rpc_manager.cpp
View File

@ -312,6 +312,32 @@ bool rpc_manager::incoming(msg const& m, node_id* id)
return false; return false;
} }
lazy_entry const* ext_ip = ret_ent->dict_find_string("ip");
if (ext_ip && ext_ip->string_length() == 4)
{
// this node claims we use the wrong node-ID!
address_v4::bytes_type b;
memcpy(&b[0], ext_ip->string_ptr(), 4);
if (m_observer)
m_observer->set_external_address(address_v4(b)
, m.addr.address());
// [MF] enforced: no valid response is sent along with "ip".
return false;
}
#if TORRENT_USE_IPV6
else if (ext_ip && ext_ip->string_length() == 16)
{
// this node claims we use the wrong node-ID!
address_v6::bytes_type b;
memcpy(&b[0], ext_ip->string_ptr(), 16);
if (m_observer)
m_observer->set_external_address(address_v6(b)
, m.addr.address());
// [MF] enforced: no valid response is sent along with "ip".
return false;
}
#endif
ptime now = time_now_hires(); ptime now = time_now_hires();
#ifdef TORRENT_DHT_VERBOSE_LOGGING #ifdef TORRENT_DHT_VERBOSE_LOGGING
@ -338,28 +364,6 @@ bool rpc_manager::incoming(msg const& m, node_id* id)
return false; return false;
} }
lazy_entry const* ext_ip = ret_ent->dict_find_string("ip");
if (ext_ip && ext_ip->string_length() == 4)
{
// this node claims we use the wrong node-ID!
address_v4::bytes_type b;
memcpy(&b[0], ext_ip->string_ptr(), 4);
if (m_observer)
m_observer->set_external_address(address_v4(b)
, m.addr.address());
}
#if TORRENT_USE_IPV6
else if (ext_ip && ext_ip->string_length() == 16)
{
// this node claims we use the wrong node-ID!
address_v6::bytes_type b;
memcpy(&b[0], ext_ip->string_ptr(), 16);
if (m_observer)
m_observer->set_external_address(address_v6(b)
, m.addr.address());
}
#endif
#ifdef TORRENT_DHT_VERBOSE_LOGGING #ifdef TORRENT_DHT_VERBOSE_LOGGING
TORRENT_LOG(rpc) << "[" << o->m_algorithm.get() << "] Reply with transaction id: " TORRENT_LOG(rpc) << "[" << o->m_algorithm.get() << "] Reply with transaction id: "
<< tid << " from " << m.addr; << tid << " from " << m.addr;