Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-13 08:29:32 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed parsing and exporting of local+ext IPs in short invites (not compatible with IPv6)

Browse Source
This commit is contained in:
csoler 2021-02-05 23:25:55 +01:00
parent 251d022ae1
commit 37dc37ce4a
2 changed files with 85 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
libretroshare/src/rsserver/p3peers.cc
View File

@ -1165,7 +1165,8 @@ enum class RsShortInviteFieldType : uint8_t
* trasport layer will be implemented */ * trasport layer will be implemented */
HIDDEN_LOCATOR = 0x90, HIDDEN_LOCATOR = 0x90,
DNS_LOCATOR = 0x91, DNS_LOCATOR = 0x91,
EXT4_LOCATOR = 0x92 EXT4_LOCATOR = 0x92, // external IPv4 address
LOC4_LOCATOR = 0x93 // local IPv4 address
}; };
static void addPacketHeader(RsShortInviteFieldType ptag, size_t size, unsigned char *& buf, uint32_t& offset, uint32_t& buf_size) static void addPacketHeader(RsShortInviteFieldType ptag, size_t size, unsigned char *& buf, uint32_t& offset, uint32_t& buf_size)
@ -1213,7 +1214,7 @@ bool p3Peers::getShortInvite(std::string& invite, const RsPeerId& _sslId, Retros
offset += tDetails.name.size(); offset += tDetails.name.size();
/* If it is a hidden node, always use hidden address and port as locator */ /* If it is a hidden node, always use hidden address and port as locator */
sockaddr_storage tExt;
if(tDetails.isHiddenNode) if(tDetails.isHiddenNode)
{ {
addPacketHeader(RsShortInviteFieldType::HIDDEN_LOCATOR,4 + 2 + tDetails.hiddenNodeAddress.size(),buf,offset,buf_size); addPacketHeader(RsShortInviteFieldType::HIDDEN_LOCATOR,4 + 2 + tDetails.hiddenNodeAddress.size(),buf,offset,buf_size);
@ -1243,24 +1244,6 @@ bool p3Peers::getShortInvite(std::string& invite, const RsPeerId& _sslId, Retros
offset += 2 + tDetails.dyndns.size(); offset += 2 + tDetails.dyndns.size();
} }
if( !!(invite_flags & RetroshareInviteFlags::CURRENT_IP) && sockaddr_storage_inet_pton(tExt, tDetails.extAddr)
&& sockaddr_storage_isValidNet(tExt) && sockaddr_storage_ipv6_to_ipv4(tExt) && tDetails.extPort )
{
uint32_t t4Addr = reinterpret_cast<sockaddr_in&>(tExt).sin_addr.s_addr;
addPacketHeader(RsShortInviteFieldType::EXT4_LOCATOR, 4 + 2,buf,offset,buf_size);
buf[offset+0] = (uint8_t)((t4Addr >> 24) & 0xff);
buf[offset+1] = (uint8_t)((t4Addr >> 16) & 0xff);
buf[offset+2] = (uint8_t)((t4Addr >> 8) & 0xff);
buf[offset+3] = (uint8_t)((t4Addr ) & 0xff);
buf[offset+4] = (uint8_t)((tDetails.extPort >> 8) & 0xff);
buf[offset+5] = (uint8_t)((tDetails.extPort ) & 0xff);
offset += 4+2;
}
if( !!(invite_flags & RetroshareInviteFlags::FULL_IP_HISTORY) && (!tDetails.ipAddressList.empty())) if( !!(invite_flags & RetroshareInviteFlags::FULL_IP_HISTORY) && (!tDetails.ipAddressList.empty()))
for(auto& s: tDetails.ipAddressList) for(auto& s: tDetails.ipAddressList)
{ {
@ -1272,6 +1255,69 @@ bool p3Peers::getShortInvite(std::string& invite, const RsPeerId& _sslId, Retros
offset += tLocator.size(); offset += tLocator.size();
} }
else if( !!(invite_flags & RetroshareInviteFlags::CURRENT_IP) ) // only add at least the local and external IPs
{
#ifdef USE_NEW_LOCATOR_SYSTEM
// This new locator system as some advantages, but here it also has major drawbacks: (1) it cannot differentiate local and external addresses,
// and (2) it's quite larger than the old system, which tends to make certificates more than 1 line long.
sockaddr_storage tLocal;
if(sockaddr_storage_inet_pton(tLocal, tDetails.localAddr) && sockaddr_storage_isValidNet(tLocal) && tDetails.localPort )
{
addPacketHeader(RsShortInviteFieldType::LOCATOR, tDetails.localAddr.size(),buf,offset,buf_size);
memcpy(&buf[offset],tDetails.localAddr.c_str(),tDetails.localAddr.size());
offset += tDetails.localAddr.size();
}
sockaddr_storage tExt;
if(sockaddr_storage_inet_pton(tExt, tDetails.extAddr) && sockaddr_storage_isValidNet(tExt) && tDetails.extPort )
{
addPacketHeader(RsShortInviteFieldType::LOCATOR, tDetails.extAddr.size(),buf,offset,buf_size);
memcpy(&buf[offset],tDetails.extAddr.c_str(),tDetails.extAddr.size());
offset += tDetails.extAddr.size();
}
#else
sockaddr_storage tLocal;
if(sockaddr_storage_inet_pton(tLocal, tDetails.localAddr) && sockaddr_storage_isValidNet(tLocal) && sockaddr_storage_ipv6_to_ipv4(tLocal) && tDetails.localPort )
{
uint32_t t4Addr = reinterpret_cast<sockaddr_in&>(tLocal).sin_addr.s_addr;
addPacketHeader(RsShortInviteFieldType::LOC4_LOCATOR, 4 + 2,buf,offset,buf_size);
buf[offset+0] = (uint8_t)((t4Addr >> 24) & 0xff);
buf[offset+1] = (uint8_t)((t4Addr >> 16) & 0xff);
buf[offset+2] = (uint8_t)((t4Addr >> 8) & 0xff);
buf[offset+3] = (uint8_t)((t4Addr ) & 0xff);
buf[offset+4] = (uint8_t)((tDetails.localPort >> 8) & 0xff);
buf[offset+5] = (uint8_t)((tDetails.localPort ) & 0xff);
offset += 4+2;
}
sockaddr_storage tExt;
if(sockaddr_storage_inet_pton(tExt, tDetails.extAddr) && sockaddr_storage_isValidNet(tExt) && sockaddr_storage_ipv6_to_ipv4(tExt) && tDetails.extPort )
{
uint32_t t4Addr = reinterpret_cast<sockaddr_in&>(tExt).sin_addr.s_addr;
addPacketHeader(RsShortInviteFieldType::EXT4_LOCATOR, 4 + 2,buf,offset,buf_size);
buf[offset+0] = (uint8_t)((t4Addr >> 24) & 0xff);
buf[offset+1] = (uint8_t)((t4Addr >> 16) & 0xff);
buf[offset+2] = (uint8_t)((t4Addr >> 8) & 0xff);
buf[offset+3] = (uint8_t)((t4Addr ) & 0xff);
buf[offset+4] = (uint8_t)((tDetails.extPort >> 8) & 0xff);
buf[offset+5] = (uint8_t)((tDetails.extPort ) & 0xff);
offset += 4+2;
}
#endif
}
uint32_t computed_crc = PGPKeyManagement::compute24bitsCRC(buf,offset) ; uint32_t computed_crc = PGPKeyManagement::compute24bitsCRC(buf,offset) ;
@ -1374,6 +1420,17 @@ bool p3Peers::parseShortInvite(const std::string& inviteStrUrl, RsPeerDetails& d
details.dyndns = std::string((char*)&buf[2],s-2); details.dyndns = std::string((char*)&buf[2],s-2);
break; break;
case RsShortInviteFieldType::LOC4_LOCATOR:
{
uint32_t t4Addr = (((uint32_t)buf[0]) << 24)+(((uint32_t)buf[1])<<16)+(((uint32_t)buf[2])<<8) + (uint32_t)buf[3];
sockaddr_in tLocalAddr;
tLocalAddr.sin_addr.s_addr = t4Addr;
details.localAddr = rs_inet_ntoa(tLocalAddr.sin_addr);
details.localPort = (((uint32_t)buf[4])<<8) + (uint32_t)buf[5];
}
break;
case RsShortInviteFieldType::EXT4_LOCATOR: case RsShortInviteFieldType::EXT4_LOCATOR:
{ {
uint32_t t4Addr = (((uint32_t)buf[0]) << 24)+(((uint32_t)buf[1])<<16)+(((uint32_t)buf[2])<<8) + (uint32_t)buf[3]; uint32_t t4Addr = (((uint32_t)buf[0]) << 24)+(((uint32_t)buf[1])<<16)+(((uint32_t)buf[2])<<8) + (uint32_t)buf[3];

15
retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
View File

@ -551,24 +551,25 @@ void ConnectFriendWizard::initializePage(int id)
ui->nodeEdit->setText(loc); ui->nodeEdit->setText(loc);
std::string s; QString s;
if(peerDetails.isHiddenNode) if(peerDetails.isHiddenNode)
s += peerDetails.hiddenNodeAddress; s += QString::fromStdString(peerDetails.hiddenNodeAddress);
else else
{ {
if(peerDetails.localAddr!="0.0.0.0")// This is not so nice, but because we deal we string there's no way if(peerDetails.localAddr!="0.0.0.0")// This is not so nice, but because we deal we string there's no way
s += peerDetails.localAddr; // to ask about if the ip is null. We really need a proper IP class. s += QString::fromStdString(peerDetails.localAddr)+":"+QString::number(peerDetails.localPort); // to ask about if the ip is null. We really need a proper IP class.
if(peerDetails.extAddr!="0.0.0.0") if(peerDetails.extAddr!="0.0.0.0")
{ {
if(!s.empty()) s += " / " ; if(!s.isNull()) s += " / " ;
s += peerDetails.extAddr; s += QString::fromStdString(peerDetails.extAddr) + ":"+QString::number(peerDetails.extPort);
} }
if(!peerDetails.dyndns.empty()) if(!peerDetails.dyndns.empty())
s += "(" + peerDetails.dyndns + ")" ; s += " (" + QString::fromStdString(peerDetails.dyndns) + ")" ;
} }
ui->ipEdit->setText(QString::fromStdString(s)); ui->ipEdit->setText(s);
ui->signersEdit->setPlainText(ts); ui->signersEdit->setPlainText(ts);
fillGroups(this, ui->groupComboBox, groupId); fillGroups(this, ui->groupComboBox, groupId);