The_Great_Archive/RSNewWebUI
1
0
Fork 0
mirror of https://github.com/RetroShare/RSNewWebUI.git synced 2026-09-14 11:05:47 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22 from jolavillette/fix/peer-address-fallback-for-121

Browse Source 
Peer addresses: read the core's loc/ext marker, and handle IPv6
This commit is contained in:
defnax 2026-08-25 17:10:56 +02:00 committed by GitHub
commit 3c7bc4bfb7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webui-src/app/main.js
View File

@ -116,7 +116,7 @@ const navbar = () => {
? 'Connected to RetroShare Core'
: 'Connection Lost',
}),
m('span.webui-version', { style: { fontSize: '0.7em' } }, 'v152'),
m('span.webui-version', { style: { fontSize: '0.7em' } }, 'v153'),
m('i.fas.fa-sync-alt.refresh-icon', {
style: { cursor: 'pointer', fontSize: '0.8em' },
onclick: () => window.location.reload(true),
@ -239,7 +239,7 @@ const MobileStatus = () => {
m('small', statusbar.formatBytes(state.totalOut)),
]),
]),
m('.mobile-status-sheet__version', 'WebUI v152'),
m('.mobile-status-sheet__version', 'WebUI v153'),
])),
];
},

45
webui-src/app/network/network_details_tab.js
View File

@ -17,27 +17,38 @@ function isUsableAddress(address) {
return value !== '' && !value.toUpperCase().includes('INVALID') && value !== '0.0.0.0';
}
function parseIpv4Locator(value) {
const match = String(value || '').match(/ipv4:\/\/([^:\s]+):(\d+)/i);
// An entry of RsPeerDetails::ipAddressList is what sockaddr_storage_tostring()
// produced -- ipv4://1.2.3.4:1234, or ipv6://[fe80::1]:1234 since RsUrl wraps
// IPv6 hosts in brackets -- followed by the core's own marker, " 123 sec
// loc" or " 123 sec ext" (p3peers.cc, getPeerDetails).
//
// That marker is the answer to "local or external", and it is worth more than
// deducing it from the address range: a peer behind CGNAT (100.64/10) or a
// double NAT has a private looking external address, and a loopback entry is
// not external at all.
//
// One entry carries no marker: GetRetroshareInvite() clears extAddr and pushes
// the address here with a trailing space when it is IPv6, because the
// certificate format only carries IPv4 numbers. It is external by construction
// -- and it is exactly the one a peer added by short invite arrives with.
function parseLocator(entry) {
const text = String(entry || '');
const match = text.match(/^\s*(?:ipv4|ipv6):\/\/(\[[^\]]+\]|[^:/\s]+):(\d+)/i);
if (!match) return null;
return { address: match[1], port: Number(match[2]) };
}
function isPrivateIpv4(address) {
const octets = address.split('.').map(Number);
if (octets.length !== 4 || octets.some((value) => !Number.isInteger(value) || value < 0 || value > 255)) {
return false;
}
return octets[0] === 10 ||
(octets[0] === 172 && octets[1] >= 16 && octets[1] <= 31) ||
(octets[0] === 192 && octets[1] === 168) ||
(octets[0] === 169 && octets[1] === 254);
// RsUrl escapes the % of a link-local scope id as %25, as the RFC asks; put
// it back rather than showing fe80::1%25eth0 to a human.
const host = (match[1].startsWith('[') ? match[1].slice(1, -1) : match[1]).replace(/%25/gi, '%');
return {
address: host,
port: Number(match[2]),
scope: /\bsec\s+loc\b/i.test(text) ? 'local' : 'external',
};
}
function displayedAddresses(detail, knownAddresses) {
const locators = knownAddresses.map(parseIpv4Locator).filter(Boolean);
const localLocator = locators.find((locator) => isPrivateIpv4(locator.address));
const externalLocator = locators.find((locator) => !isPrivateIpv4(locator.address));
const locators = knownAddresses.map(parseLocator).filter(Boolean);
const localLocator = locators.find((locator) => locator.scope === 'local');
const externalLocator = locators.find((locator) => locator.scope === 'external');
return {
localAddress: isUsableAddress(detail.localAddr) ? detail.localAddr : localLocator && localLocator.address,